Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/5.0-opw-16036-ado into lp:openobject-addons/5.0

  1. 5.0-opw-16036-ado
  2. Merge into 5.0
Proposed by Amit Dodiya (OpenERP)
Status: Merged
Approved by: Priyesh (OpenERP)
Approved revision: no longer in the source branch.
Merged at revision: 2911
Proposed branch: lp:~openerp-dev/openobject-addons/5.0-opw-16036-ado
Merge into: lp:openobject-addons/5.0
Diff against target: 25 lines (+2/-2)
2 files modified
account/report/partner_balance.py (+1/-1)
account/report/third_party_ledger.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/5.0-opw-16036-ado
Reviewer Review Type Date Requested Status
Priyesh (OpenERP) (community) Approve
Jay Vora (Serpent Consulting Services) (community) Approve
Stephane Wirtel (OpenERP) Approve
Review via email: mp+67329@code.launchpad.net

Description of the change

Hello Sir,

I have done change in the sql query while fetching data into report because the sql query was giving Null value in report's debit & credit columns.

Thanks.
Amit

To post a comment you must log in.
Revision history for this message
Stephane Wirtel (OpenERP) (stephane-openerp) wrote :

You can merge it into stable 5.0

The server will be updated asap

review: Approve
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) :
review: Approve
Revision history for this message
Priyesh (OpenERP) (pso-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/report/partner_balance.py'
2--- account/report/partner_balance.py 2010-08-17 07:00:51 +0000
3+++ account/report/partner_balance.py 2011-07-08 19:14:37 +0000
4@@ -196,7 +196,7 @@
5 result_tmp = 0.0
6 if self.date_lst:
7 self.cr.execute(
8- "SELECT p.ref,l.account_id,ac.name as account_name,ac.code as code ,p.name, sum(debit) as debit, sum(credit) as credit, " \
9+ "SELECT p.ref,l.account_id,ac.name as account_name,ac.code as code ,p.name, COALESCE(sum(debit),0.00) as debit, COALESCE(sum(credit),0.00) as credit, " \
10 "CASE WHEN sum(debit) > sum(credit) " \
11 "THEN sum(debit) - sum(credit) " \
12 "ELSE 0 " \
13
14=== modified file 'account/report/third_party_ledger.py'
15--- account/report/third_party_ledger.py 2010-05-27 10:59:00 +0000
16+++ account/report/third_party_ledger.py 2011-07-08 19:14:37 +0000
17@@ -255,7 +255,7 @@
18 # full_account.append(r)
19 if self.date_lst_string:
20 self.cr.execute(
21- "SELECT l.id,l.date,j.code, l.ref, l.name, l.debit, l.credit " \
22+ "SELECT l.id,l.date,j.code, l.ref, l.name, COALESCE(l.debit,0.00) as debit, COALESCE(l.credit,0.00) as credit " \
23 "FROM account_move_line l " \
24 "LEFT JOIN account_journal j " \
25 "ON (l.journal_id = j.id) " \