Merge lp:~rr.clearcorp/openobject-addons/7.0-base_intercompany_sale into lp:~clearcorp-drivers/openobject-addons/elico-7.0-ccorp

Proposed by Ronald Rubi
Status: Merged
Merged at revision: 38
Proposed branch: lp:~rr.clearcorp/openobject-addons/7.0-base_intercompany_sale
Merge into: lp:~clearcorp-drivers/openobject-addons/elico-7.0-ccorp
Diff against target: 27 lines (+4/-2)
2 files modified
base_intercompany_sale/purchase.py (+2/-1)
base_intercompany_sale/sale.py (+2/-1)
To merge this branch: bzr merge lp:~rr.clearcorp/openobject-addons/7.0-base_intercompany_sale
Reviewer Review Type Date Requested Status
ClearCorp drivers Pending
Review via email: mp+229660@code.launchpad.net

Description of the change

Fix tax calculation in base_intercompany_sale

To post a comment you must log in.
38. By Ronald Rubi

[MRG] Fix tax calculation in base_intercompany_sale

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'base_intercompany_sale/purchase.py'
--- base_intercompany_sale/purchase.py 2014-08-01 15:53:18 +0000
+++ base_intercompany_sale/purchase.py 2014-08-05 16:28:52 +0000
@@ -311,7 +311,8 @@
311 taxes_id = []311 taxes_id = []
312 if record.order_id:312 if record.order_id:
313 if record.product_id:313 if record.product_id:
314 for tax in record.product_id.taxes_id:314 product = sess.pool.get('product.product').browse(sess.cr, ic_uid, record.product_id.id)
315 for tax in product.taxes_id:
315 if tax.company_id.id == backend.company_id.id:316 if tax.company_id.id == backend.company_id.id:
316 taxes_id.append(tax)317 taxes_id.append(tax)
317 line_tax_ids = sess.pool.get('account.fiscal.position').map_tax(sess.cr, ic_uid, record.order_id.fiscal_position, taxes_id)318 line_tax_ids = sess.pool.get('account.fiscal.position').map_tax(sess.cr, ic_uid, record.order_id.fiscal_position, taxes_id)
318319
=== modified file 'base_intercompany_sale/sale.py'
--- base_intercompany_sale/sale.py 2014-08-01 15:53:18 +0000
+++ base_intercompany_sale/sale.py 2014-08-05 16:28:52 +0000
@@ -372,7 +372,8 @@
372 taxes_id = []372 taxes_id = []
373 if record.order_id:373 if record.order_id:
374 if record.product_id:374 if record.product_id:
375 for tax in record.product_id.taxes_id:375 product = sess.pool.get('product.product').browse(sess.cr, ic_uid, record.product_id.id)
376 for tax in product.supplier_taxes_id:
376 if tax.company_id.id == backend.company_id.id:377 if tax.company_id.id == backend.company_id.id:
377 taxes_id.append(tax)378 taxes_id.append(tax)
378 line_tax_ids = sess.pool.get('account.fiscal.position').map_tax(sess.cr, ic_uid, record.order_id.fiscal_position, taxes_id)379 line_tax_ids = sess.pool.get('account.fiscal.position').map_tax(sess.cr, ic_uid, record.order_id.fiscal_position, taxes_id)

Subscribers

People subscribed via source and target branches

to all changes: