Magento OpenERP Connector

Merge lp:~midwest/magentoerpconnect/product_type_service into lp:magentoerpconnect/oerp6.1-stable

  1. product_type_service
  2. Merge into oerp6.1-stable
Proposed by Kyle Waid
Status: Merged
Merged at revision: 693
Proposed branch: lp:~midwest/magentoerpconnect/product_type_service
Merge into: lp:magentoerpconnect/oerp6.1-stable
Diff against target: 14 lines (+3/-1)
1 file modified
magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv (+3/-1)
To merge this branch: bzr merge lp:~midwest/magentoerpconnect/product_type_service
Reviewer Review Type Date Requested Status
Sébastien BEAU - http://www.akretion.com Pending
Review via email: mp+108002@code.launchpad.net

Description of the change

All other product type besides simple should be service type

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv'
2--- magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv 2012-05-28 19:38:37 +0000
3+++ magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv 2012-05-30 16:06:19 +0000
4@@ -12,7 +12,9 @@
5 if product_type_ids:
6 result = [('product_type',ifield)]
7 if ifield == 'simple':
8- result.append(('type', 'product'))","if 'product_type' in resource and resource['product_type']:
9+ result.append(('type', 'product'))
10+else:
11+ result.append(('type', 'service'))","if 'product_type' in resource and resource['product_type']:
12 result = [('type_id', resource['product_type'])]
13 else:
14 result = [('type_id','simple')]",,