Merge lp:~mathieu-julius/prestashoperpconnect/prestashoperpconnect_add_code into lp:prestashoperpconnect/6.1

Proposed by Mathieu Vatel - Julius Network Solutions on 2012-04-27
Status: Merged
Merge reported by: Guewen Baconnier @ Camptocamp
Merged at revision: not available
Proposed branch: lp:~mathieu-julius/prestashoperpconnect/prestashoperpconnect_add_code
Merge into: lp:prestashoperpconnect/6.1
Diff against target: 34 lines (+7/-7)
4 files modified
prestashoperpconnect/settings/1.4.0.0/external.referential.version.csv (+2/-2)
prestashoperpconnect/settings/1.5.0.0/external.referential.version.csv (+2/-2)
prestashoperpconnect/settings/external.referential.category.csv (+1/-1)
prestashoperpconnect/settings/external.referential.type.csv (+2/-2)
To merge this branch: bzr merge lp:~mathieu-julius/prestashoperpconnect/prestashoperpconnect_add_code
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp 2012-04-27 Approve on 2012-05-24
Review via email: mp+103836@code.launchpad.net

Description of the change

[FIX] - add some new required fields (code) in external.referential.type and external.referential.version needed by the last version of base_external_referentials

To post a comment you must log in.

Hi Mathieu,

Thanks for the fix, I merged it with some modifications :
 - base_sale_multichannels.ecommerce does not exist, replaced by base_sale_multichannels.multichannels
 - removed external.referential.category.csv (useless)
 - modified the sort of the columns in external.referential.version.csv in order to have "id" in first column

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'prestashoperpconnect/settings/1.4.0.0/external.referential.version.csv'
2--- prestashoperpconnect/settings/1.4.0.0/external.referential.version.csv 2012-04-04 17:24:41 +0000
3+++ prestashoperpconnect/settings/1.4.0.0/external.referential.version.csv 2012-04-27 09:18:22 +0000
4@@ -1,2 +1,2 @@
5-"type_id:id","id","name"
6-"prestashop","prestashop1400","Version 1.4.0.0+"
7+type_id:id,id,name,code
8+prestashop,prestashop1400,Version 1.4.0.0+,prestashop1400
9
10=== modified file 'prestashoperpconnect/settings/1.5.0.0/external.referential.version.csv'
11--- prestashoperpconnect/settings/1.5.0.0/external.referential.version.csv 2012-02-07 18:28:59 +0000
12+++ prestashoperpconnect/settings/1.5.0.0/external.referential.version.csv 2012-04-27 09:18:22 +0000
13@@ -1,2 +1,2 @@
14-"type_id:id","id","name"
15-"prestashop","prestashop1500","Version 1.5.0.0+"
16+type_id:id,id,name,code
17+prestashop,prestashop1500,Version 1.5.0.0+,prestashop1500
18
19=== modified file 'prestashoperpconnect/settings/external.referential.category.csv'
20--- prestashoperpconnect/settings/external.referential.category.csv 2012-04-25 14:09:40 +0000
21+++ prestashoperpconnect/settings/external.referential.category.csv 2012-04-27 09:18:22 +0000
22@@ -1,2 +1,2 @@
23 id,name
24-base_sale_multichannels.ecommerce,E-commerce
25+base_sale_multichannels.ecommerce,e-commerce
26
27=== modified file 'prestashoperpconnect/settings/external.referential.type.csv'
28--- prestashoperpconnect/settings/external.referential.type.csv 2012-02-07 18:28:59 +0000
29+++ prestashoperpconnect/settings/external.referential.type.csv 2012-04-27 09:18:22 +0000
30@@ -1,2 +1,2 @@
31-"id","name","categ_id:id"
32-"prestashop","Prestashop","base_sale_multichannels.ecommerce"
33+id,name,categ_id:id,code
34+prestashop,Prestashop,base_sale_multichannels.ecommerce,prestashop