Magento OpenERP Connector

Merge lp:~camptocamp/magentoerpconnect/oerp6.1-oldstable-fix-1100293 into lp:magentoerpconnect/oerp6.1-oldstable

  1. oerp6.1-oldstable-fix-1100293
  2. Merge into trunk_version
Proposed by Alexandre Fayolle - camptocamp
Status: Merged
Merge reported by: Alexandre Fayolle - camptocamp
Merged at revision: not available
Proposed branch: lp:~camptocamp/magentoerpconnect/oerp6.1-oldstable-fix-1100293
Merge into: lp:magentoerpconnect/oerp6.1-oldstable
Diff against target: 103 lines (+30/-18)
5 files modified
magentoerpconnect/__openerp__.py (+1/-1)
magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv (+7/-4)
magentoerpconnect/settings/1.4.0.0/external.mappinglines.template.csv (+7/-4)
magentoerpconnect/settings/1.4.2.0/external.mappinglines.template.csv (+7/-4)
magentoerpconnect/settings/1.5.0.0/external.mappinglines.template.csv (+8/-5)
To merge this branch: bzr merge lp:~camptocamp/magentoerpconnect/oerp6.1-oldstable-fix-1100293
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Alexandre Fayolle - camptocamp test Approve
Review via email: mp+143516@code.launchpad.net

Description of the change

fix mapping.

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

We would miss the 4th and later lines but I don't think that's even possible on Magento, so: LGTM

review: Approve
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

arg... syntax error in the mapping... I hate writing Python code in a CSV file.

(unbalanced parenthesis...)

review: Needs Fixing
lp:~camptocamp/magentoerpconnect/oerp6.1-oldstable-fix-1100293 updated
667. By Alexandre Fayolle - camptocamp

[FIX] fix previous changeset: missing closing parenthesis

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

> arg... syntax error in the mapping... I hate writing Python code in a CSV
> file.
>
> (unbalanced parenthesis...)

branch updated with the fix

review: Approve (test)
lp:~camptocamp/magentoerpconnect/oerp6.1-oldstable-fix-1100293 updated
668. By Alexandre Fayolle - camptocamp

[FIX] index error in prev. commit

669. By Alexandre Fayolle - camptocamp

incr. version number

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

also fixed the > 3 lines of address issue+ incremented version number of the addon

Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

LGTM

review: Approve
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

I goofed the merge by using bzr rebase, but the code is in there.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'magentoerpconnect/__openerp__.py'
--- magentoerpconnect/__openerp__.py 2012-07-25 13:11:43 +0000
+++ magentoerpconnect/__openerp__.py 2013-01-16 18:25:25 +0000
@@ -18,7 +18,7 @@
18#########################################################################18#########################################################################
19{19{
20 "name" : "Magento e-commerce",20 "name" : "Magento e-commerce",
21 "version" : "1.0.1",21 "version" : "1.0.2",
22 "depends" : ["base",22 "depends" : ["base",
23 "product",23 "product",
24 "product_m2mcategories",24 "product_m2mcategories",
2525
=== modified file 'magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv 2012-07-25 13:16:34 +0000
+++ magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv 2013-01-16 18:25:25 +0000
@@ -242,10 +242,13 @@
242 result=[]242 result=[]
243",243",
244magento_1324_prt_adr_8,magento1324,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:244magento_1324_prt_adr_8,magento1324,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:
245 if len(ifield.split('\n')) ==2 :245 lines = [line.strip() for line in ifield.split('\n') if line.strip()]
246 result = [('street', ifield.split('\n')[0]) , ('street2', ifield.split('\n')[1])]246 if len(lines) == 1:
247 else :247 result = [('street', lines[0]), ('street2', False)]
248 result = [('street',ifield.replace('\\n',','))]248 elif len(lines) >= 2:
249 result = [('street', lines[0]), ('street2', u' - '.join(lines[1:]))]
250 else:
251 result = []
249else:252else:
250 result = []",253 result = []",
251magento_1324_prt_adr_9,magento1324,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",254magento_1324_prt_adr_9,magento1324,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",
252255
=== modified file 'magentoerpconnect/settings/1.4.0.0/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.4.0.0/external.mappinglines.template.csv 2012-07-25 13:16:34 +0000
+++ magentoerpconnect/settings/1.4.0.0/external.mappinglines.template.csv 2013-01-16 18:25:25 +0000
@@ -245,10 +245,13 @@
245 result=[]245 result=[]
246",246",
247magento_1400_prt_adr_8,magento1400,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:247magento_1400_prt_adr_8,magento1400,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:
248 if len(ifield.split('\n')) ==2 :248 lines = [line.strip() for line in ifield.split('\n') if line.strip()]
249 result = [('street', ifield.split('\n')[0]) , ('street2', ifield.split('\n')[1])]249 if len(lines) == 1:
250 else :250 result = [('street', lines[0]), ('street2', False)]
251 result = [('street',ifield.replace('\\n',','))]251 elif len(lines) >= 2:
252 result = [('street', lines[0]), ('street2', u' - '.join(lines[1:]))]
253 else:
254 result = []
252else:255else:
253 result = []",256 result = []",
254magento_1400_prt_adr_9,magento1400,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",257magento_1400_prt_adr_9,magento1400,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",
255258
=== modified file 'magentoerpconnect/settings/1.4.2.0/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.4.2.0/external.mappinglines.template.csv 2012-10-24 12:53:08 +0000
+++ magentoerpconnect/settings/1.4.2.0/external.mappinglines.template.csv 2013-01-16 18:25:25 +0000
@@ -242,10 +242,13 @@
242 result=[]242 result=[]
243",243",
244magento_1420_prt_adr_8,magento1420,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:244magento_1420_prt_adr_8,magento1420,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:
245 if len(ifield.split('\n')) ==2 :245 lines = [line.strip() for line in ifield.split('\n') if line.strip()]
246 result = [('street', ifield.split('\n')[0]) , ('street2', ifield.split('\n')[1])]246 if len(lines) == 1:
247 else :247 result = [('street', lines[0]), ('street2', False)]
248 result = [('street',ifield.replace('\\n',','))]248 elif len(lines) >= 2:
249 result = [('street', lines[0]), ('street2', u' - '.join(lines[1:]))]
250 else:
251 result = []
249else:252else:
250 result = []",253 result = []",
251magento_1420_prt_adr_9,magento1420,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",254magento_1420_prt_adr_9,magento1420,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",
252255
=== modified file 'magentoerpconnect/settings/1.5.0.0/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/external.mappinglines.template.csv 2012-12-06 08:06:31 +0000
+++ magentoerpconnect/settings/1.5.0.0/external.mappinglines.template.csv 2013-01-16 18:25:25 +0000
@@ -244,12 +244,15 @@
244 result=[]244 result=[]
245",245",
246magento_1500_prt_adr_8,magento1500,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:246magento_1500_prt_adr_8,magento1500,base.model_res_partner_address,street,,in_out,function,unicode,,"if ifield:
247 if len(ifield.split('\n')) ==2 :247 lines = [line.strip() for line in ifield.split('\n') if line.strip()]
248 result = [('street', ifield.split('\n')[0]) , ('street2', ifield.split('\n')[1])]248 if len(lines) == 1:
249 else :249 result = [('street', lines[0]), ('street2', False)]
250 result = [('street',ifield.replace('\\n',','))]250 elif len(lines) >= 2:
251 result = [('street', lines[0]), ('street2', u' - '.join(lines[1:]))]
252 else:
253 result = []
251else:254else:
252 result = []",255 result = []",
253magento_1500_prt_adr_9,magento1500,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",256magento_1500_prt_adr_9,magento1500,base.model_res_partner_address,postcode,,in_out,function,unicode,,"result=[('zip',ifield)]",
254magento_1500_prt_adr_10,magento1500,base.model_res_partner_address,telephone,,in_out,function,unicode,,"result=[('phone',ifield)]",257magento_1500_prt_adr_10,magento1500,base.model_res_partner_address,telephone,,in_out,function,unicode,,"result=[('phone',ifield)]",
255magento_1500_prt_adr_11,magento1500,base.model_res_partner_address,region,,in_out,function,unicode,,"if ifield:258magento_1500_prt_adr_11,magento1500,base.model_res_partner_address,region,,in_out,function,unicode,,"if ifield: