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

[Romain Deheele - Camptocamp]

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

=== 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 @@
 
     def _after_mapping(self, result):
         sess = self.session
+        backend = self.backend_record
         order_line_ids = []
         if 'prestashop_order_line_ids' in result:
             order_line_ids = result['prestashop_order_line_ids']
-        result = sess.pool['sale.order']._convert_special_fields(
-            sess.cr,
-            sess.uid,
-            result,
-            order_line_ids,
-            sess.context
-        )
+        taxes_included = backend.taxes_included
+        with self.session.change_context({'is_tax_included': taxes_included}):
+            result = sess.pool['sale.order']._convert_special_fields(
+                sess.cr,
+                sess.uid,
+                result,
+                order_line_ids,
+                sess.context
+            )
         onchange = self.get_connector_unit_for_model(SaleOrderOnChange)
         order_line_ids = []
         if 'prestashop_order_line_ids' in result: