Merge lp:~camptocamp/openerp-connector-magento/7.0-cod-1271537 into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0

[Guewen Baconnier @ Camptocamp]

Fixes lp:1271537

[Jan-Philipp Fischer (jan-philipp-fischer)]

Tested and seems to be working. Approved.

review: Approve (tested)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for your review!

=== modified file 'magentoerpconnect/sale.py'
--- magentoerpconnect/sale.py	2014-01-14 11:00:20 +0000
+++ magentoerpconnect/sale.py	2014-01-22 14:37:42 +0000
@@ -686,13 +686,13 @@
 
     def _add_shipping_line(self, map_record, values):
         record = map_record.source
-        amount_incl = float(record.get('base_shipping_incl_tax', 0.0))
-        amount_excl = float(record.get('shipping_amount', 0.0))
+        amount_incl = float(record.get('base_shipping_incl_tax') or 0.0)
+        amount_excl = float(record.get('shipping_amount') or 0.0)
         if not (amount_incl or amount_excl):
             return values
         line_builder = self.get_connector_unit_for_model(MagentoShippingLineBuilder)
         if self.options.tax_include:
-            discount = float(record.get('shipping_discount_amount', 0.0))
+            discount = float(record.get('shipping_discount_amount') or 0.0)
             line_builder.price_unit = (amount_incl - discount)
         else:
             line_builder.price_unit = amount_excl
@@ -708,8 +708,8 @@
 
     def _add_cash_on_delivery_line(self, map_record, values):
         record = map_record.source
-        amount_excl = float(record.get('cod_fee', 0.0))
-        amount_incl = float(record.get('cod_tax_amount', 0.0))
+        amount_excl = float(record.get('cod_fee') or 0.0)
+        amount_incl = float(record.get('cod_tax_amount') or 0.0)
         if not (amount_excl or amount_incl):
             return values
         line_builder = self.get_connector_unit_for_model(MagentoCashOnDeliveryLineBuilder)
@@ -778,27 +778,6 @@
         return {'payment_method_id': method_id}
 
     @mapping
-    def cod_fee(self, record): # cash on delivery
-        # TODO Map Me (sic)
-        pass
-
-    @mapping
-    def gift_cert_amount(self, record):
-        if 'gift_cert_amount' in record:
-            result = {'gift_certificates_amount': record['gift_cert_amount']}
-        else:
-            result = {}
-        return result
-
-    @mapping
-    def gift_cert_code(self, record):
-        if 'gift_cert_code' in record:
-            result = {'gift_certificates_code': record['gift_cert_code']}
-        else:
-            result = {}
-        return result
-
-    @mapping
     def shipping_method(self, record):
         session = self.session
         ifield = record.get('shipping_method')