# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: maxime.chambreuil@savoirfairelinux.com-20101029195608-\
#   rpjspv5tszi1d2jz
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/openobject-\
#   addons/
# testament_sha1: f37194c94895ccd601e263d440c57c4b14e22167
# timestamp: 2010-10-29 15:56:23 -0400
# base_revision_id: tfr@openerp.com-20101029115618-hrcbznf3sod7y414
# 
# Begin patch
=== modified file 'account/account.py'
--- account/account.py	2010-10-28 08:57:51 +0000
+++ account/account.py	2010-10-29 19:56:08 +0000
@@ -1821,7 +1821,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:
@@ -1838,8 +1841,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'
--- account/installer.py	2010-10-25 15:23:33 +0000
+++ account/installer.py	2010-10-29 19:56:08 +0000
@@ -749,4 +749,4 @@
 
 account_installer_modules()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb8etGMAAi3/gAAUQABYa//3
WyIASr////BQBPl7yOKHatbitI6cJJU001PU9D1TY1RsU08k0bTUNBp6jTTEHMAAAAAAAAAACUTQ
FT2hkjSelGTyTQ0NBoADQJIiap+mpknoxUybZQnmqegIZANDTCSUxEzQEwjQI0ynimI0aABpwytx
up9OH+Hx1csxgprfiwbKibEXubKDNx0AHBL9bz2lRVVFX7fIIPjXcxddJR8IwVVF+tDv8O3kriN/
9umODIvYNVU/VPGYCSsniciBkFFNTZ6SQ3oUptYmUM6l+fxACe2TNBBHsIzjQxy/lw/DztrpH8pk
j37XgbCB0OVJKCE43omuGBaFHYYbcBjRUDKSkR5D0LLJUGa0ORlOoh1OksWQqmNDlz1V8U+FG+2N
FdtkfmQcXBd8YX8LJFMWTlKweXqrxPR6gi87sgJzSMxrYoNYEjPgcMGukcySbDHVEqMOg67FwwxE
extrzJZtL2JnpDy+COATkCrcBPPnLY9iozupTEqTsORXX57FaGJIemqm9IJxxypihyTLAzIjVjBd
jbrBt56XdysjE8doVM3FyD7rGBYbSRakeG2sx5SkjfkBBI1LEIGnk3ZjziO8QMMqVgBWaXSlZMSq
dzzAsKCXKJyyiRKHWXjr9gRHlqjE3Y0FZh60kUM+so/PvbIpAllgDMmBiRLuFJk5o/ENAISLPRsn
xedkq3My5sdHRAoXydnMuOkSYiavVUEVGtMCxQlexEgOwetCxqYjt3PlZ/QmFc3vt3QirQxir0c4
FWTnhdaITwklG09acFidjZmJ+8YNms06CexUIIteUkTMNe4g4ffjvbhCpWwGRXwweD9w4Ww7je8z
4kB7iQ851vNu5S08yuxHLwQbZFKImPopOMMeXGyWnrZaRyCLjhQXUXFVxmPIlXUcW5Hlq9ONgicj
731ryDslErLdB4kpJQdxuOYu4cdvUlJRN3eeN9OyHvQHE2cwiPh2Zyoa8rAYkQ6FUofBP1HaCIxG
uqmdzXWZ7Ub/cMgY2bDTUPHWdp3QGRoy32geWD3lNBMYcdrGCGx5mRK5luyPcXNXC+63Nqfpzgg/
fSnox9UwbVCmOH3Nar6uchRJaTRGq8vMCa2Zdp0nWWoGInNmrFn/D4nFWsX3rScOOvTRKBrm3QL/
OgurjAwUOVGM8gGtyY2z8EN/5b7FbKIzC1WiIijyzogm+NrctiCujFEVI0IK0Dkc/Ztkau0DVTwA
662+hmjMocN4Oix4tJipB7ouKCeg03strnxwQpmj3qJrTGnVSI0CGHSGU7xRUcCJzAy3EriST/Or
YsuCljMdMVMDCdgYS3ZlmCwZ0GKSkilVx6p3RWs3WhdiUZb5oeJj4HhrcMEFAJQI4d0tV4GoOL+e
3EMxYqNaON61oNCThFHHBQQXxvvir5HPRuA7SVTTMupM7Lcgm5aLSLFI1aJCkoW1odk3sBHomxHi
93RaAKa5hNQcpzCsaaB0we4NIJGdul4u8t5yqJilVlJwegG+7dJXZ61F4iFxrp0it52IPPcBIsoo
lDZFB6mTuKB+LCJhVxBjvVJnwOpRFKjsUjmsAyWVg/xdyRThQkL8etGM