pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[imp] account: replace string concatenation with string formatting in invoice.inv_line_characteristic_hashcode

Browse Source 
bzr revid: xmo@tinyerp.com-20100224084852-zy1s11micx7w8uo8
This commit is contained in:
Xavier Morel
2010-02-24 09:48:52 +01:00
parent 1a229637b6
commit 0ef6728c20
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/invoice.py
+6 -6
View File
@@ -667,12 +667,12 @@ class account_invoice(osv.osv):
will be grouped together if the journal has the 'group line' option. Of course a module
can add fields to invoice lines that would need to be tested too before merging lines
or not."""
code = str(invoice_line['account_id'])
code += '-'+str(invoice_line.get('tax_code_id',"False"))
code += '-'+str(invoice_line.get('product_id',"False"))
code += '-'+str(invoice_line.get('analytic_account_id',"False"))
code += '-'+str(invoice_line.get('date_maturity',"False"))
return code
return "%s-%s-%s-%s-%s"%(
invoice_line['account_id'],
invoice_line.get('tax_code_id',"False"),
invoice_line.get('product_id',"False"),
invoice_line.get('analytic_account_id',"False"),
invoice_line.get('date_maturity',"False"))
def group_lines(self, cr, uid, iml, line, inv):
"""Merge account move lines (and hence analytic lines) if invoice line hashcodes are equals"""