Merge lp:~openerp-dev/openobject-addons/6.1-opw-584326-han into lp:openobject-addons/6.1

[Xavier ALT]

Hi,

When a product has multiple default taxes (for different companies) when computing taxes for point-of-sale we should only consider taxes belonging to the company of the current POS Order - not child companies.

Example:
- You Company (EUR)
  - Your Company - Shop0 (EUR)

- Product CPU1:
  - Tax 5% (company: Your Company)
  - Tax 7% (company: Your Company - Shop0)

When creating a POS Order with a session configure on company "Your Company", a line for "CPU1" should only get "Tax 5%", not "Tax 7%" which belongs to another company.

Regards,
Xavier

[Xavier ALT (dex-phx)]

review: Approve

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2012-11-16 15:15:09 +0000
+++ point_of_sale/point_of_sale.py	2013-02-27 14:30:34 +0000
@@ -653,9 +653,9 @@
         account_tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids, context=context):
-            taxes = line.product_id.taxes_id
+            taxes_ids = [ tax for tax in line.product_id.taxes_id if tax.company_id.id == line.order_id.company_id.id ]
             price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
-            taxes = account_tax_obj.compute_all(cr, uid, line.product_id.taxes_id, price, line.qty, product=line.product_id, partner=line.order_id.partner_id or False)
+            taxes = account_tax_obj.compute_all(cr, uid, taxes_ids, price, line.qty, product=line.product_id, partner=line.order_id.partner_id or False)
 
             cur = line.order_id.pricelist_id.currency_id
             res[line.id]['price_subtotal'] = cur_obj.round(cr, uid, cur, taxes['total'])

=== modified file 'point_of_sale/test/01_order_to_payment.yml'
--- point_of_sale/test/01_order_to_payment.yml	2011-11-17 10:05:44 +0000
+++ point_of_sale/test/01_order_to_payment.yml	2013-02-27 14:30:34 +0000
@@ -27,10 +27,23 @@
     account_collected_id: account.iva
     price_include: 0
 -
-  I assign this 5 percent tax on the PC2 product as a sale tax
+  I will create a second VAT tax of 5% but this time for a child company, to
+  ensure that only product taxes of the current session's company are considered
+  (this tax should be ignore when computing order's taxes in following tests)
+-
+  !record {model: account.tax, id: account_tax_05_incl_shop0}:
+    name: VAT 05 perc Excl (Shop0)
+    type: percent
+    amount: 0.05
+    account_paid_id: account.iva
+    account_collected_id: account.iva
+    price_include: 0
+    company_id: stock.res_company_shop0
+-
+  I assign those 5 percent taxes on the PC2 product as a sale taxes
 -
   !record {model: product.product, id: product.product_product_pc2}:
-    taxes_id: [account_tax_05_incl]
+    taxes_id: [account_tax_05_incl, account_tax_05_incl_shop0]
 -
   I create a PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PC2 at 300 EUR. (Tax Excl)
 -