Merge lp:~openerp-canada/openobject-addons/lp667920 into lp:openobject-addons

[Maxime Chambreuil (http://www.savoirfairelinux.com)]

Fix bug lp667920

[Fabien (Open ERP) (fp-tinyerp)]

See how to do in the related bug.

No need to patch openerp for this.

review: Disapprove

=== modified file 'account/account.py'
--- account/account.py	2010-11-26 16:13:59 +0000
+++ account/account.py	2010-11-29 15:31:35 +0000
@@ -1848,7 +1848,10 @@
             if tax.child_ids:
                 if tax.child_depend:
                     latest = res.pop()
-                amount = amount2
+                if tax.include_base_amount:
+                    amount = cur_price_unit + amount2
+                else:
+                    amount = amount2
                 child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, address_id, product, partner, quantity)
                 res.extend(child_tax)
                 if tax.child_depend:
@@ -1865,8 +1868,6 @@
                                 r[name+'_sign'] = latest[name+'_sign']
                                 r['amount'] = data['amount']
                                 latest[name+'_code_id'] = False
-            if tax.include_base_amount:
-                cur_price_unit+=amount2
         return res
 
     def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):

=== modified file 'account/installer.py'