Merge lp:~arthru/prestashoperpconnect/tax-included-in-prices into lp:prestashoperpconnect

[arthru]

This propose to either use tax included prices or tax excluded prices for order imports.

[Romain Deheele - Camptocamp (romaindeheele)]

Hi,

It works on classic sale order lines.
But price unit on shipping line is still tax excluded.

Romain

review: Needs Fixing (code review and test)

[arthru (arthru)]

I've merged the patch from Romain Deheele (Thanks !).

review: Needs Resubmitting

[Romain Deheele - Camptocamp (romaindeheele)]

Hi,

Thanks for the merge.
I've manually tested it again, it's ok.

Romain

review: Approve (code review and test)

=== modified file 'prestashoperpconnect/prestashop_model.py'
--- prestashoperpconnect/prestashop_model.py	2013-10-13 20:52:13 +0000
+++ prestashoperpconnect/prestashop_model.py	2013-10-29 09:36:51 +0000
@@ -75,7 +75,7 @@
             required=True,
             help='Warehouse used to compute the stock quantities.'
         ),
-        # add a field `auto_activate` -> activate a cron
+        'taxes_included': fields.boolean("Use tax included prices"),
         'import_partners_since': fields.datetime('Import partners since'),
         'import_orders_since': fields.datetime('Import Orders since'),
         'language_ids': fields.one2many(

=== modified file 'prestashoperpconnect/prestashop_model_view.xml'
--- prestashoperpconnect/prestashop_model_view.xml	2013-08-14 16:42:54 +0000
+++ prestashoperpconnect/prestashop_model_view.xml	2013-10-29 09:36:51 +0000
@@ -41,6 +41,7 @@
                 </group>
                 <group name="main_configuration" string="Main Configuration">
                     <field name="warehouse_id"/>
+                    <field name="taxes_included"/>
                 </group>
                 <notebook>
                     <page name="import" string="Imports">

=== modified file 'prestashoperpconnect/unit/direct_binder.py'
--- prestashoperpconnect/unit/direct_binder.py	2013-05-13 09:51:15 +0000
+++ prestashoperpconnect/unit/direct_binder.py	2013-10-29 09:36:51 +0000
@@ -200,6 +200,8 @@
     _ps_field = 'rate'
 
     def _compare_function(self, ps_val, erp_val, ps_dict, erp_dict):
-        if erp_dict['type_tax_use'] == 'sale' and \
+        taxes_inclusion_test = self.backend_record.taxes_included and \
+            erp_dict['price_include'] or not erp_dict['price_include']
+        if taxes_inclusion_test and erp_dict['type_tax_use'] == 'sale' and \
                 abs(erp_val*100 - float(ps_val)) < 0.01:
             return True

=== modified file 'prestashoperpconnect/unit/mapper.py'
--- prestashoperpconnect/unit/mapper.py	2013-10-25 12:41:52 +0000
+++ prestashoperpconnect/unit/mapper.py	2013-10-29 09:36:51 +0000
@@ -22,6 +22,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from decimal import Decimal
 
 from openerp.tools.translate import _
 from openerp.addons.connector.unit.mapper import (
@@ -388,16 +389,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:
@@ -412,12 +416,25 @@
     direct = [
         ('product_name', 'name'),
         ('id', 'sequence'),
-        ('product_price', 'price_unit'),
         ('product_quantity', 'product_uom_qty'),
         ('reduction_percent', 'discount'),
     ]
 
     @mapping
+    def price_unit(self, record):
+        if self.backend_record.taxes_included:
+            key = 'unit_price_tax_incl'
+        else:
+            key = 'unit_price_tax_excl'
+        if record['reduction_percent']:
+            reduction = Decimal(record['reduction_percent'])
+            price = Decimal(record[key])
+            price_unit = price / ((100 - reduction) / 100) 
+        else:
+            price_unit = record[key]
+        return {'price_unit': price_unit}
+
+    @mapping
     def product_id(self, record):
         return {'product_id': self.get_openerp_id(
             'prestashop.product.product',