Merge lp:~camptocamp/carriers-deliveries/6.1-fix-base_delivery_carrier_files-rde into lp:~stock-logistic-core-editors/carriers-deliveries/6.1

[Romain Deheele - Camptocamp]

Hi,

It fixes https://bugs.launchpad.net/carriers-deliveries/+bug/1291916
Some changes to have a correct fields mapping.

Regards,

Romain

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

review: Approve

[Leonardo Pistone (lepistone)]

ok

review: Approve (code review)

=== modified file 'base_delivery_carrier_files/generator/generic_generator.py'
--- base_delivery_carrier_files/generator/generic_generator.py	2012-04-02 06:59:30 +0000
+++ base_delivery_carrier_files/generator/generic_generator.py	2014-03-13 11:17:26 +0000
@@ -38,7 +38,7 @@
               'country_code',
               'phone',
               'fax',
-              'mail'
+              'mail',
               'delivery_name',
               'weight')
 
@@ -71,7 +71,7 @@
             line.city = address.city
             line.state = (picking.address_id.state_id and
                          picking.address_id.state_id.name)
-            line.country = address.country_id and address.country_id.code
+            line.country_code = address.country_id and address.country_id.code
             line.phone = address.phone or address.mobile
             line.mail = address.email
             line.fax = address.fax