Merge lp:~anybox/prestashoperpconnect/prestashoperpconnect into lp:prestashoperpconnect/6.1

Proposed by Simon ANDRÉ
Status: Merged
Merged at revision: 101
Proposed branch: lp:~anybox/prestashoperpconnect/prestashoperpconnect
Merge into: lp:prestashoperpconnect/6.1
Diff against target: 15 lines (+4/-1)
1 file modified
prestashoperpconnect/settings/1.5.0.0/product.product/external.mappinglines.template.csv (+4/-1)
To merge this branch: bzr merge lp:~anybox/prestashoperpconnect/prestashoperpconnect
Reviewer Review Type Date Requested Status
Sébastien BEAU - http://www.akretion.com Pending
Review via email: mp+121722@code.launchpad.net

Description of the change

Maybe, this problem is for all null value ?

To post a comment you must log in.
78. By Simon ANDRÉ

merge with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'prestashoperpconnect/settings/1.5.0.0/product.product/external.mappinglines.template.csv'
2--- prestashoperpconnect/settings/1.5.0.0/product.product/external.mappinglines.template.csv 2012-08-13 10:56:26 +0000
3+++ prestashoperpconnect/settings/1.5.0.0/product.product/external.mappinglines.template.csv 2012-09-02 22:52:19 +0000
4@@ -5,7 +5,10 @@
5 prestashop1500_erp_weight,prestashop_1500_product,10,in_out,direct,product.field_product_template_weight,weight,float,,,,,,
6 prestashop1500_erp_price,prestashop_1500_product,10,in_out,direct,product.field_product_template_list_price,price,float,,,,,,
7 prestashop1500_erp_name,prestashop_1500_product,10,in_out,direct,product.field_product_template_name,name,unicode,,,,,,
8-prestashop1500_product_product_ean13,prestashop_1500_product,10,in_out,direct,product.field_product_product_ean13,ean13,unicode,,,,,,
9+prestashop1500_product_product_ean13,prestashop_1500_product,10,in_out,function,product.field_product_product_ean13,ean13,unicode,,,"if int(ifield) == 0:
10+ result = False
11+else:
12+ result = [('ean13',ifield)]","result = ifield",,
13 prestashop1500_product_product_price_in,prestashop_1500_product,10,in,direct,product.field_product_template_list_price,price,float,,,,,,
14 prestashop1500_product_product_price_out,prestashop_1500_product,10,out,direct,product.field_product_product_lst_price,price,float,,,,,,
15 prestashop1500_product_product_reference,prestashop_1500_product,10,in_out,direct,product.field_product_product_default_code,reference,unicode,,,,,,