Merge lp:~openerp-dev/openobject-addons/trunk-bug-796570-mtr into lp:openobject-addons

[Meera Trambadia (OpenERP)]

Sale: If Sale tax is not provided on product it will take from property_account_income or property_account_income_categ -- fixes=lp:796570

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

self.pool.get('account.fiscal.position') => define pool object at beginning of the method
No need to create if elif.. you can define one variable for tax_ids.
tax_ids=product_obj.taxes_id or product_obj.property_account_income.tax_ids or product_obj.categ_id.property_account_income_categ.tax_ids

and pass it in map_tax()

Do not forget to pass context in the map_tax method.

Thanks,
mra

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-796570-mtr]

4859. By mtr <mtr@mtr> on 2011-07-13

[IMP] sale: improved code for product taxes in product onchange method

4860. By mtr <mtr@mtr> on 2011-07-13

[IMP] sale: passed context in map_tax method

4861. By mtr <mtr@mtr> on 2011-07-13

[MERGE] branch merged with main-addons

[Meera Trambadia (OpenERP) (mtr-openerp)]

Hello sir,

I have made changes as mentioned above.

Thanks,
mtr

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-bug-796570-mtr]

4862. By mtr <mtr@mtr> on 2011-07-13

[IMP] sale: passed context in browse method

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-796570-mtr]

4863. By Meera Trambadia (OpenERP) on 2011-09-15

[MERGE] branch merged with openobject-addons

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

If there is not tax on the product, it means that there should be no tax in sale or purchase.
This is the current behaviour, so it's not a bug.

But your suggestion is a good idea, but not a bug. As it requires changes in several locations (invoices, so, po, pos, touchscreen pos...) I propose to not change this for now on. I would suggest to create a feedback on feedback.openerp.com

Unmerged revisions

4863. By Meera Trambadia (OpenERP) on 2011-09-15

[MERGE] branch merged with openobject-addons

4862. By mtr <mtr@mtr> on 2011-07-13

[IMP] sale: passed context in browse method

4861. By mtr <mtr@mtr> on 2011-07-13

[MERGE] branch merged with main-addons

4860. By mtr <mtr@mtr> on 2011-07-13

[IMP] sale: passed context in map_tax method

4859. By mtr <mtr@mtr> on 2011-07-13

[IMP] sale: improved code for product taxes in product onchange method

4858. By Eetu Salpaharju,mtr on 2011-07-08

[FIX] sale: If Sale tax is not provided on product it will take from property_account_income or property_account_income_categ

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-09-15 08:54:54 +0000
+++ sale/sale.py	2011-09-15 13:36:01 +0000
@@ -1031,6 +1031,7 @@
         product_uom_obj = self.pool.get('product.uom')
         partner_obj = self.pool.get('res.partner')
         product_obj = self.pool.get('product.product')
+        fiscal_obj = self.pool.get('account.fiscal.position')
         if partner_id:
             lang = partner_obj.browse(cr, uid, partner_id).lang
         context = {'lang': lang, 'partner_id': partner_id}
@@ -1079,10 +1080,11 @@
                 uos = False
         if product_obj.description_sale:
             result['notes'] = product_obj.description_sale
-        fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
+        fpos = fiscal_position and fiscal_obj.browse(cr, uid, fiscal_position, context=context) or False
         if update_tax: #The quantity only have changed
             result['delay'] = (product_obj.sale_delay or 0.0)
-            result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
+            tax_ids = product_obj.taxes_id or product_obj.property_account_income.tax_ids or product_obj.categ_id.property_account_income_categ.tax_ids
+            result['tax_id'] = fiscal_obj.map_tax(cr, uid, fpos, tax_ids, context=context)
             result.update({'type': product_obj.procure_method})
 
         if not flag: