Merge lp:~camptocamp/prestashoperpconnect/tax-included-on-shipping-line into lp:~arthru/prestashoperpconnect/tax-included-in-prices

Proposed by Romain Deheele - Camptocamp
Status: Merged
Merged at revision: 277
Proposed branch: lp:~camptocamp/prestashoperpconnect/tax-included-on-shipping-line
Merge into: lp:~arthru/prestashoperpconnect/tax-included-in-prices
Diff against target: 30 lines (+10/-7)
1 file modified
prestashoperpconnect/unit/mapper.py (+10/-7)
To merge this branch: bzr merge lp:~camptocamp/prestashoperpconnect/tax-included-on-shipping-line
Reviewer Review Type Date Requested Status
arthru Pending
Review via email: mp+193015@code.launchpad.net

Description of the change

Hi Arthur,

This branch manages shipping line price unit in tax included context.
I propose you to merge this branch in yours to manage entirely tax_included topic.

Regards,

Romain

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'prestashoperpconnect/unit/mapper.py'
--- prestashoperpconnect/unit/mapper.py 2013-10-25 13:46:43 +0000
+++ prestashoperpconnect/unit/mapper.py 2013-10-29 08:42:13 +0000
@@ -384,16 +384,19 @@
384384
385 def _after_mapping(self, result):385 def _after_mapping(self, result):
386 sess = self.session386 sess = self.session
387 backend = self.backend_record
387 order_line_ids = []388 order_line_ids = []
388 if 'prestashop_order_line_ids' in result:389 if 'prestashop_order_line_ids' in result:
389 order_line_ids = result['prestashop_order_line_ids']390 order_line_ids = result['prestashop_order_line_ids']
390 result = sess.pool['sale.order']._convert_special_fields(391 taxes_included = backend.taxes_included
391 sess.cr,392 with self.session.change_context({'is_tax_included': taxes_included}):
392 sess.uid,393 result = sess.pool['sale.order']._convert_special_fields(
393 result,394 sess.cr,
394 order_line_ids,395 sess.uid,
395 sess.context396 result,
396 )397 order_line_ids,
398 sess.context
399 )
397 onchange = self.get_connector_unit_for_model(SaleOrderOnChange)400 onchange = self.get_connector_unit_for_model(SaleOrderOnChange)
398 order_line_ids = []401 order_line_ids = []
399 if 'prestashop_order_line_ids' in result:402 if 'prestashop_order_line_ids' in result:

Subscribers

People subscribed via source and target branches

to all changes: