Magento OpenERP Connector

Merge lp:~therp-nl/magentoerpconnect/oerp6.1-stable-lp1183335-update_page_layout_by_code into lp:magentoerpconnect/oerp6.1-stable

  1. oerp6.1-stable-lp1183335-update_page_layout_by_code
  2. Merge into oerp6.1-stable
Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 689
Proposed branch: lp:~therp-nl/magentoerpconnect/oerp6.1-stable-lp1183335-update_page_layout_by_code
Merge into: lp:magentoerpconnect/oerp6.1-stable
Diff against target: 32 lines (+9/-2)
2 files modified
magentoerpconnect/settings/1.5.0.0/product.category/external.mappinglines.template.csv (+8/-1)
magentoerpconnect/settings/magerp.product_category_attribute_options.csv (+1/-1)
To merge this branch: bzr merge lp:~therp-nl/magentoerpconnect/oerp6.1-stable-lp1183335-update_page_layout_by_code
Reviewer Review Type Date Requested Status
MagentoERPConnect core editors Pending
Review via email: mp+165360@code.launchpad.net
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.category/external.mappinglines.template.csv'
2--- magentoerpconnect/settings/1.5.0.0/product.category/external.mappinglines.template.csv 2012-10-08 15:55:39 +0000
3+++ magentoerpconnect/settings/1.5.0.0/product.category/external.mappinglines.template.csv 2013-05-23 12:37:34 +0000
4@@ -19,7 +19,14 @@
5 else:
6 att_id = self.pool.get('magerp.product_category_attribute_options').get_create_option_id(cr, uid, 'None','page_layout', context=context)
7 result=[('page_layout',att_id)]","if 'page_layout' in resource:
8- result=[('page_layout', resource['page_layout'][1] or '')]"
9+ value = ''
10+ if resource['page_layout']:
11+ cat_attr_option = self.pool.get(
12+ 'magerp.product_category_attribute_options').browse(
13+ cr, uid, resource['page_layout'][0], context=context)
14+ if cat_attr_option.value != 'None':
15+ value = cat_attr_option.value
16+ result=[('page_layout', value)]"
17 magentoerpconnect.mag1500_product_category_available_sort_by,magentoerpconnect.mag1500_product_category,available_sort_by,,in_out,function,unicode,,False,"if 'use_default_available_sort_by' in resource:
18 attr_ids = []
19 cat_attr_obj = self.pool.get('magerp.product_category_attribute_options')
20
21=== modified file 'magentoerpconnect/settings/magerp.product_category_attribute_options.csv'
22--- magentoerpconnect/settings/magerp.product_category_attribute_options.csv 2011-10-16 17:14:20 +0000
23+++ magentoerpconnect/settings/magerp.product_category_attribute_options.csv 2013-05-23 12:37:34 +0000
24@@ -2,7 +2,7 @@
25 "mag_product_category_attribute_1","page_layout","No layout updates","None"
26 "mag_product_category_attribute_2","page_layout","Empty","empty"
27 "mag_product_category_attribute_3","page_layout","1 column","one_column"
28-"mag_product_category_attribute_4","page_layout","2 columns with left bar","two_column_left"
29+"mag_product_category_attribute_4","page_layout","2 columns with left bar","two_columns_left"
30 "mag_product_category_attribute_5","page_layout","2 columns with right bar","two_columns_right"
31 "mag_product_category_attribute_6","page_layout","3 columns","three_columns"
32 "mag_product_category_attribute_7","sort_by","Use Config Settings","None"