openerp-dev-web team mailing list archive

["mtr\(OpenERP\)" <mtr@xxxxxxxxxxx>]

mtr(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #586706 [account_followup]sending date not propogated
  https://bugs.launchpad.net/bugs/586706
  #643552 The titles of the buttons for sales in exception are obscure
  https://bugs.launchpad.net/bugs/643552


Account:-Partner Ledger Report-cummulative balance
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr2/+merge/41423
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'account/report/account_partner_ledger.py'
--- account/report/account_partner_ledger.py	2010-11-12 13:21:27 +0000
+++ account/report/account_partner_ledger.py	2010-11-22 05:54:55 +0000
@@ -152,8 +152,10 @@
                 (partner.id, tuple(self.account_ids), tuple(move_state)))
         res = self.cr.dictfetchall()
         sum = 0.0
+        if self.initial_balance:
+                sum = self.init_bal_sum
         for r in res:
-            sum = r['debit'] - r['credit']
+            sum += r['debit'] - r['credit']
             r['progress'] = sum
             full_account.append(r)
         return full_account
@@ -178,7 +180,9 @@
             " " + RECONCILE_TAG + " "\
             "AND " + self.init_query + "  ",
             (partner.id, tuple(move_state), tuple(self.account_ids)))
-        return self.cr.fetchall()
+        res = self.cr.fetchall()
+        self.init_bal_sum = res[0][2]
+        return res
 
     def _sum_debit_partner(self, partner):
         move_state = ['draft','posted']