openerp-dev-web team mailing list archive

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

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

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #600547 Invoice totals not updated when a line is moved (store={...} bug?)
  https://bugs.launchpad.net/bugs/600547
  #690895 copy account.move crash 
  https://bugs.launchpad.net/bugs/690895
  #694144 [6.0] sales manager dashboard - sales by month - sql query error, usabiliy
  https://bugs.launchpad.net/bugs/694144
  #695632 [RC1]Two same fields creating problem in web-client
  https://bugs.launchpad.net/bugs/695632
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #702805 an employee shouldn't be able to see expenses and holidays of others employee
  https://bugs.launchpad.net/bugs/702805
  #703836 [Trunk] hr_expense: Invoice button not working
  https://bugs.launchpad.net/bugs/703836
  #705766 Wrong Picked Widget in Sale Order in OpenERP v6.0.1
  https://bugs.launchpad.net/bugs/705766
  #707144 [6.0] hr_payroll 'C/D' versus 'D/C' 
  https://bugs.launchpad.net/bugs/707144
  #708603 Traceback occurs at the time of "Account" duplication.
  https://bugs.launchpad.net/bugs/708603

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/47794

[FIX] account: allows duplication of account" --fixes lp:708603
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/47794
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'account/account.py'
--- account/account.py	2011-01-25 07:27:43 +0000
+++ account/account.py	2011-01-28 11:52:40 +0000
@@ -300,11 +300,13 @@
                 brs.pop(0)
                 for fn in field_names:
                     sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
-                    for child in current.child_id:
-                        if child.company_id.currency_id.id == current.company_id.currency_id.id:
-                            sums[current.id][fn] += sums[child.id][fn]
-                        else:
-                            sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
+                    if current.child_id:
+                        for child in current.child_id:
+                            if child.company_id.currency_id.id == current.company_id.currency_id.id:
+                                if sums.get(child.id):
+                                    sums[current.id][fn] += sums[child.id][fn]
+                            else:
+                                sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
             res = {}
             null_result = dict((fn, 0.0) for fn in field_names)
             for id in ids: