[MERGE] forward port branch 10.0 up to 5b69f1a3

addons/account_tax_python/models/account_tax.py

@@ -37,7 +37,7 @@ class AccountTaxPython(models.Model):
 
     @api.multi
     def compute_all(self, price_unit, currency=None, quantity=1.0, product=None, partner=None):
-        taxes = self.env['account.tax']
+        taxes = self.filtered(lambda r: r.amount_type != 'code')
         company = self.env.user.company_id
         for tax in self.filtered(lambda r: r.amount_type == 'code'):
             localdict = {'price_unit': price_unit, 'quantity': quantity, 'product': product, 'partner': partner, 'company': company}