Merge lp:~os-1/unifield-addons/BKLG-48 into lp:unifield-addons

Proposed by jftempo
Status: Merged
Merged at revision: 4665
Proposed branch: lp:~os-1/unifield-addons/BKLG-48
Merge into: lp:unifield-addons
Diff against target: 27 lines (+9/-1)
1 file modified
account/invoice.py (+9/-1)
To merge this branch: bzr merge lp:~os-1/unifield-addons/BKLG-48
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+260490@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/invoice.py'
--- account/invoice.py 2015-05-22 08:50:18 +0000
+++ account/invoice.py 2015-05-28 14:37:03 +0000
@@ -337,6 +337,14 @@
337 journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)337 journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
338 res['fields'][field]['selection'] = journal_select338 res['fields'][field]['selection'] = journal_select
339339
340 if view_type == 'form' and context.get('type', 'out_invoice') == 'in_refund':
341 doc = etree.XML(res['arch'])
342 doc.attrib['string'] = _('Supplier Refund')
343 nodes = doc.xpath("//field[@name='amount_to_pay']")
344 for node in nodes:
345 node.set('string', _('Amount to be refunded'))
346 res['arch'] = etree.tostring(doc)
347
340 if view_type == 'tree':348 if view_type == 'tree':
341 doc = etree.XML(res['arch'])349 doc = etree.XML(res['arch'])
342 nodes = doc.xpath("//field[@name='partner_id']")350 nodes = doc.xpath("//field[@name='partner_id']")
@@ -862,7 +870,7 @@
862870
863 # one move line per tax line871 # one move line per tax line
864 iml += ait_obj.move_line_get(cr, uid, inv.id)872 iml += ait_obj.move_line_get(cr, uid, inv.id)
865 # UFTP-380: If the name is empty or a space character, by default it is set to '/', otherwise it will cause problem for the sync on destination instance 873 # UFTP-380: If the name is empty or a space character, by default it is set to '/', otherwise it will cause problem for the sync on destination instance
866 for il in iml:874 for il in iml:
867 if not il['name']:875 if not il['name']:
868 il['name'] = '/'876 il['name'] = '/'

Subscribers

People subscribed via source and target branches