Merge lp:~therp-nl/magentoerpconnect/6.1-stable-lp1190184_import_special_price into lp:magentoerpconnect/oerp6.1-stable

[Stefan Rijnhart (Opener)]

Unmerged revisions

694. By Stefan Rijnhart (Opener) on 2013-06-12

[FIX] Import special prices

=== modified file 'magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv	2013-06-09 02:11:27 +0000
+++ magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv	2013-06-12 10:18:26 +0000
@@ -55,7 +55,7 @@
     main_categ_id = self.pool.get('external.referential').browse(cr, uid, referential_id).default_pro_cat.id
 result = [('categ_id', main_categ_id), ('categ_ids',[(6, 0, categ_ids)])]","if 'categ_id' in resource or 'categ_ids' in resource:
     result=[('categories', self._get_or_create_ext_category_ids_for_shop(cr, uid, external_session, resource['id'], context=context))]",,
-"mag1500_product_product_special_price",,"in_out","function","special_price",,"float","False","magentoerpconnect.mag1500_product_product","special_price","if 'x_magerp_special_price' in resource: result = [('x_magerp_special_price', ifield)]","if 'x_magerp_special_price' in resource:
+"mag1500_product_product_special_price",,"in_out","function","special_price",,"float","False","magentoerpconnect.mag1500_product_product","special_price","if 'special_price' in resource: result = [('x_magerp_special_price', ifield)]","if 'x_magerp_special_price' in resource:
     if resource['x_magerp_special_price']:
         result = [('special_price', resource['x_magerp_special_price'])]
     else: