Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-1089376-nco into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #1089376 in OpenERP Addons: "[Trunk] useless option group invoice lines
on journal"
https://bugs.launchpad.net/openobject-addons/+bug/1089376
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1089376-nco/+merge/141855
Hello,
I have grouped the lines in journal entries, if group by invoice button is
checked on journal.
Thanks,
NCO.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1089376-nco/+merge/141855
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-1089376-nco.
=== 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 = []
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
