← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-785649-psi into lp:openobject-addons

 

Purnendu Singh (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-785649-psi into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #785649 in OpenERP Addons: "general ledger - do not print lines with all zero"
  https://bugs.launchpad.net/openobject-addons/+bug/785649

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-785649-psi/+merge/62861

Hello,

Fixes:785649
https://bugs.launchpad.net/openobject-addons/+bug/785649

description :
         general ledger - do not print lines with all zero


Thanks,
Purnendu Singh
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-785649-psi/+merge/62861
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-785649-psi.
=== modified file 'account/report/account_general_ledger.py'
--- account/report/account_general_ledger.py	2011-05-06 06:43:56 +0000
+++ account/report/account_general_ledger.py	2011-05-30 11:06:20 +0000
@@ -174,7 +174,7 @@
             LEFT JOIN account_invoice i on (m.id =i.move_id)
             LEFT JOIN account_period per on (per.id=l.period_id)
             JOIN account_journal j on (l.journal_id=j.id)
-            WHERE %s AND m.state IN %s AND l.account_id = %%s ORDER by %s
+            WHERE %s AND (l.debit <> 0 OR l.credit <> 0) AND m.state IN %s AND l.account_id = %%s ORDER by %s
         """ %(self.query, tuple(move_state), sql_sort)
         self.cr.execute(sql, (account.id,))
         res_lines = self.cr.dictfetchall()