openerp-community-reviewer team mailing list archive

[Romain Deheele - Camptocamp <romain.deheele@xxxxxxxxxxxxxx>]

Romain Deheele - Camptocamp has proposed merging lp:~camptocamp/carriers-deliveries/6.1-fix-base_delivery_carrier_files-rde into lp:carriers-deliveries/6.1.

Requested reviews:
  Stock and Logistic Core Editors (stock-logistic-core-editors)
Related bugs:
  Bug #1291916 in Carriers And Deliveries Management: "[6.1]some fields are not correctly filled on The Poste file generated"
  https://bugs.launchpad.net/carriers-deliveries/+bug/1291916

For more details, see:
https://code.launchpad.net/~camptocamp/carriers-deliveries/6.1-fix-base_delivery_carrier_files-rde/+merge/210772

Hi,

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

Regards,

Romain
-- 
https://code.launchpad.net/~camptocamp/carriers-deliveries/6.1-fix-base_delivery_carrier_files-rde/+merge/210772
Your team Stock and Logistic Core Editors is requested to review the proposed merge of lp:~camptocamp/carriers-deliveries/6.1-fix-base_delivery_carrier_files-rde into lp:carriers-deliveries/6.1.

=== 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