Merge lp:~9-pierre-6/prestashoperpconnect/prestashoperpconnect-inculde-shipping-cost into lp:prestashoperpconnect

[Pierre Monod]

This new version allow an automatic creation of a sale.order.line when we have a shipping cost on prestashop.
include new field in sale.order and an update of direct mapping

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

The project has moved to Github https://github.com/OCA/connector-prestashop.
Please resubmit your MP on github using following procedure https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub.

I put this MP in rejected in the meanwhile.

Regards

review: Disapprove

Unmerged revisions

217. By Pierre Monod on 2013-06-26

sale order sync:
add shipping cost of prestashop in sale order line openerp

=== modified file 'prestashoperpconnect/sale.py'
--- prestashoperpconnect/sale.py	2013-05-13 13:28:00 +0000
+++ prestashoperpconnect/sale.py	2013-06-26 09:16:32 +0000
@@ -35,6 +35,9 @@
     _inherit = 'sale.order'
 
     _columns = {
+        'shipping_amount_tax_excluded': fields.char('shipping_amount_tax_excluded', size=64),
+        'shipping_amount_tax_included': fields.char('shipping_amount_tax_included', size=64),
+        'shipping_tax_rate': fields.char('shipping_tax_rate', size=64),
         'prestashop_bind_ids': fields.one2many(
             'prestashop.res.partner',
             'openerp_id',

=== modified file 'prestashoperpconnect/unit/mapper.py'
--- prestashoperpconnect/unit/mapper.py	2013-06-13 15:51:34 +0000
+++ prestashoperpconnect/unit/mapper.py	2013-06-26 09:16:32 +0000
@@ -239,6 +239,9 @@
 
     direct = [
         ('reference', 'name'),
+        ('total_shipping_tax_excl', 'shipping_amount_tax_excluded'),
+        ('total_shipping_tax_incl', 'shipping_amount_tax_included'),
+        ('carrier_tax_rate', 'shipping_tax_rate'),
     ]
 
     def _get_sale_order_lines(self, record):
@@ -294,7 +297,7 @@
         return {'partner_shipping_id': self.get_openerp_id(
             'prestashop.address',
             record['id_address_delivery']
-        )}
+        )}    
 
     @mapping
     def pricelist_id(self, record):