ACCOUNT: add partner to tax compute context

bzr revid: ced-f5da95580fa8035c10c37adf68f5b8a69ce02737

8 files changed, 21 insertions, 21 deletions

diff --git a/addons/account/account.py b/addons/account/account.py
index 98f4e74ae78..a7cbe3840fd 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -790,7 +790,7 @@ class account_tax(osv.osv):
 		'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"),
 	}
 	_defaults = {
-		'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n\nresult = price_unit * 0.10''',
+		'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''',
 		'applicable_type': lambda *a: 'true',
 		'type': lambda *a: 'percent',
 		'amount': lambda *a: 0.196,
@@ -805,11 +805,11 @@ class account_tax(osv.osv):
 	}
 	_order = 'sequence'
 	
-	def _applicable(self, cr, uid, taxes, price_unit, address_id=None):
+	def _applicable(self, cr, uid, taxes, price_unit, address_id=None, product=None, address=None):
 		res = []
 		for tax in taxes:
 			if tax.applicable_type=='code':
-				localdict = {'price_unit':price_unit, 'address':self.pool.get('res.partner.address').browse(cr, uid, address_id)}
+				localdict = {'price_unit':price_unit, 'address':self.pool.get('res.partner.address').browse(cr, uid, address_id), 'product':product, 'partner':partner}
 				exec tax.python_applicable in localdict
 				if localdict.get('result', False):
 					res.append(tax)
@@ -817,8 +817,8 @@ class account_tax(osv.osv):
 				res.append(tax)
 		return res
 
-	def _unit_compute(self, cr, uid, taxes, price_unit, address_id=None):
-		taxes = self._applicable(cr, uid, taxes, price_unit, address_id)
+	def _unit_compute(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
+		taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
 
 		res = []
 		cur_price_unit=price_unit
@@ -831,7 +831,7 @@ class account_tax(osv.osv):
 				res.append({'id':tax.id, 'name':tax.name, 'amount':tax.amount, 'account_collected_id':tax.account_collected_id.id, 'account_paid_id':tax.account_paid_id.id, 'base_code_id': tax.base_code_id.id, 'ref_base_code_id': tax.ref_base_code_id.id, 'sequence': tax.sequence, 'base_sign': tax.base_sign, 'tax_sign': tax.tax_sign, 'ref_base_sign': tax.ref_base_sign, 'ref_tax_sign': tax.ref_tax_sign, 'price_unit': 1, 'tax_code_id': tax.tax_code_id.id, 'ref_tax_code_id': tax.ref_tax_code_id.id,})
 			elif tax.type=='code':
 				address = address_id and self.pool.get('res.partner.address').browse(cr, uid, address_id) or None
-				localdict = {'price_unit':cur_price_unit, 'address':address}
+				localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
 				exec tax.python_compute in localdict
 				amount = localdict['result']
 				res.append({
@@ -866,7 +866,7 @@ class account_tax(osv.osv):
 		return res
 
 
-	def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product_id=None):
+	def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
 
 		"""
 		Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
@@ -876,7 +876,7 @@ class account_tax(osv.osv):
 			tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
 			one tax for each tax id in IDS and their childs
 		"""
-		res = self._unit_compute(cr, uid, taxes, price_unit, address_id)
+		res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner)
 		for r in res:
 			r['amount'] *= quantity
 		return res
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 46df66f7591..d0c2f44064d 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -592,7 +592,7 @@ class account_invoice_line(osv.osv):
 				'price':cur_obj.round(cr, uid, cur, line.quantity*line.price_unit * (1.0- (line.discount or 0.0)/100.0)),
 				'account_id':line.account_id.id
 			})
-			for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit *(1.0-(line['discount'] or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id):
+			for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit *(1.0-(line['discount'] or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
 				val={}
 				val['invoice_id'] = inv.id
 				val['name'] = tax['name']
diff --git a/addons/account_tax_include/account.py b/addons/account_tax_include/account.py
index ec98504cd7b..a0a15590f57 100644
--- a/addons/account_tax_include/account.py
+++ b/addons/account_tax_include/account.py
@@ -40,8 +40,8 @@ class account_tax(osv.osv):
 	_defaults = {
 		'python_compute_inv': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''',
 	}
-	def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None):
-		taxes = self._applicable(cr, uid, taxes, price_unit, address_id)
+	def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
+		taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
 
 		res = []
 		taxes.reverse()
@@ -55,7 +55,7 @@ class account_tax(osv.osv):
 				res.append({'id':tax.id, 'name':tax.name, 'amount':tax.amount, 'account_collected_id':tax.account_collected_id.id, 'account_paid_id':tax.account_paid_id.id, 'base_code_id': tax.base_code_id.id, 'ref_base_code_id': tax.ref_base_code_id.id, 'sequence': tax.sequence, 'base_sign': tax.base_sign, 'tax_sign': tax.tax_sign, 'ref_base_sign': tax.ref_base_sign, 'ref_tax_sign': tax.ref_tax_sign, 'price_unit': 1, 'tax_code_id': tax.tax_code_id.id, 'ref_tax_code_id': tax.ref_tax_code_id.id,})
 			elif tax.type=='code':
 				address = address_id and self.pool.get('res.partner.address').browse(cr, uid, address_id) or None
-				localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product,}
+				localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
 				exec tax.python_compute_inv in localdict
 				amount = localdict['result']
 				res.append({
@@ -90,7 +90,7 @@ class account_tax(osv.osv):
 		taxes.reverse()
 		return res
 
-	def compute_inv(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None):
+	def compute_inv(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
 		"""
 		Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 		Price Unit is a VAT included price
@@ -100,7 +100,7 @@ class account_tax(osv.osv):
 			tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
 			one tax for each tax id in IDS and their childs
 		"""
-		res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product)
+		res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
 		for r in res:
 			r['amount'] *= quantity
 		return res
diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py
index 8d1bf2cc171..5c2cadb3733 100644
--- a/addons/account_tax_include/invoice_tax_incl.py
+++ b/addons/account_tax_include/invoice_tax_incl.py
@@ -103,7 +103,7 @@ class account_invoice_line(osv.osv):
 				'price':cur_obj.round(cr, uid, cur, line.quantity*line.price_unit * (1.0- (line.discount or 0.0)/100.0)),
 				'account_id':line.account_id.id,
 			})
-			for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, (line.price_unit *(1.0-(line['discount'] or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id):
+			for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, (line.price_unit *(1.0-(line['discount'] or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
 				val={}
 				val['invoice_id'] = inv.id
 				val['name'] = tax['name']
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index a034460088c..55b35084f1d 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -65,7 +65,7 @@ class purchase_order(osv.osv):
 			val = 0.0
 			cur=order.pricelist_id.currency_id
 			for line in order.order_line:
-				for c in self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id):
+				for c in self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id):
 					val+= cur_obj.round(cr, uid, cur, c['amount'])
 			res[order.id]=cur_obj.round(cr, uid, cur, val)
 		return res
diff --git a/addons/purchase_tax_include/purchase_tax_incl.py b/addons/purchase_tax_include/purchase_tax_incl.py
index 246ef65175f..718718e8c57 100644
--- a/addons/purchase_tax_include/purchase_tax_incl.py
+++ b/addons/purchase_tax_include/purchase_tax_incl.py
@@ -56,9 +56,9 @@ class purchase_order(osv.osv):
 			cur=order.pricelist_id.currency_id
 			for line in order.order_line:
 				if order.price_type=='tax_included':
-					ttt = self.pool.get('account.tax').compute_inv(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id)
+					ttt = self.pool.get('account.tax').compute_inv(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id)
 				else:
-					ttt = self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id)
+					ttt = self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id)
 				for c in ttt:
 					val += cur_obj.round(cr, uid, cur, c['amount'])
 			res[order.id]=cur_obj.round(cr, uid, cur, val)
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 97f8c0e60b5..7cc5ec16b1b 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -85,7 +85,7 @@ class sale_order(osv.osv):
 			val = 0.0
 			cur=order.pricelist_id.currency_id
 			for line in order.order_line:
-				for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, order.partner_invoice_id.id, line.product_id):
+				for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, order.partner_invoice_id.id, line.product_id, order.partner_id):
 					val+= cur_obj.round(cr, uid, cur, c['amount'])
 			res[order.id]=cur_obj.round(cr, uid, cur, val)
 		return res
diff --git a/addons/sale_tax_include/sale_tax_incl.py b/addons/sale_tax_include/sale_tax_incl.py
index 164a996e42a..b6a7d3fe19b 100644
--- a/addons/sale_tax_include/sale_tax_incl.py
+++ b/addons/sale_tax_include/sale_tax_incl.py
@@ -56,9 +56,9 @@ class sale_order(osv.osv):
 			cur=order.pricelist_id.currency_id
 			for line in order.order_line:
 				if order.price_type=='tax_included':
-					ttt = self.pool.get('account.tax').compute_inv(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0)/100.0), line.product_uom_qty, order.partner_invoice_id.id, line.product_id)
+					ttt = self.pool.get('account.tax').compute_inv(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0)/100.0), line.product_uom_qty, order.partner_invoice_id.id, line.product_id, order.partner_id)
 				else:
-					ttt = self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0)/100.0), line.product_uom_qty, order.partner_invoice_id.id, line.product_id)
+					ttt = self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0)/100.0), line.product_uom_qty, order.partner_invoice_id.id, line.product_id, order.partner_id)
 				for c in ttt:
 					val += cur_obj.round(cr, uid, cur, c['amount'])
 			res[order.id]=cur_obj.round(cr, uid, cur, val)