Merge lp:~openerp-dev/openobject-addons/trunk-bug-1089376-nco into lp:openobject-addons

[Nimesh Contractor(Open ERP)]

Hello,

     I have grouped the lines in journal entries, if group by invoice button is checked on journal.

Thanks,
 NCO.

[Atul Patel(OpenERP) (atp-openerp)]

hello,

It seems ok to me.

thanks for fix.

review: Approve

Unmerged revisions

8491. By Nimesh Contractor(Open ERP) on 2013-01-04

[IMP] for same product, shows product name one time.

8490. By Nimesh Contractor(Open ERP) on 2013-01-03

[FIX] grouped lines in journal entries if group by invoice button is checked on journal

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-12-21 16:48:08 +0000
+++ account/account_invoice.py	2013-01-04 06:00:32 +0000
@@ -829,10 +829,9 @@
         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."""
-        return "%s-%s-%s-%s-%s"%(
+        return "%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"))
 
@@ -849,6 +848,7 @@
                     line2[tmp]['credit'] = (am < 0) and -am or 0.0
                     line2[tmp]['tax_amount'] += l['tax_amount']
                     line2[tmp]['analytic_lines'] += l['analytic_lines']
+                    if l['name'] not in line2[tmp]['name']: line2[tmp]['name'] +=  " - "+l['name']
                 else:
                     line2[tmp] = l
             line = []