Merge lp:~0s/openerp-product-variant/openerp-product-variant into lp:openerp-product-variant/trunk

Proposed by Mathieu Stumpf
Status: Needs review
Proposed branch: lp:~0s/openerp-product-variant/openerp-product-variant
Merge into: lp:openerp-product-variant/trunk
Diff against target: 20 lines (+3/-6)
1 file modified
product_variant_multi_advanced/product.xml (+3/-6)
To merge this branch: bzr merge lp:~0s/openerp-product-variant/openerp-product-variant
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp Needs Resubmitting
Review via email:

Description of the change

Adapts the multi-advanced product.xml to product_variant_form_view changes made to the product_variant_multi module with the OpenERP v.7 compatibility.

Note that it make the advanced module run again, however one may want to change the layout.

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :


The management of the project has moved to Github:

Please migrate your merge proposal to Github. You may want to check for an explanation on how to proceed.

Thanks for contributing to the project

review: Needs Resubmitting

Unmerged revisions

195. By Mathieu Stumpf

[FIX] Adapts the multi-advanced product.xml to product_variant_form_view changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product_variant_multi_advanced/product.xml'
2--- product_variant_multi_advanced/product.xml 2012-03-30 12:50:17 +0000
3+++ product_variant_multi_advanced/product.xml 2014-03-31 09:22:25 +0000
4@@ -15,13 +15,10 @@
5 <field name="inherit_id" ref="product_variant_multi.product_variant_form_view" />
6 <field name="arch" type="xml">
7 <data>
8- <page string="Lots" position="after">
9- <page string="Descriptions">
10- <separator string="Sale description" colspan="4"/>
11+ <field name="active" position="after">
12+ <label for="description_sale" string="description sale:" />
13 <field name="description_sale" nolabel="1" attrs="{'readonly':[('is_multi_variants','=',True)]}"/>
14- </page>
15- </page>
17+ </field>
18 <field name="name" position="replace">
19 <field name="name" select="1" attrs="{'required':[('is_multi_variants','=',False)], 'readonly':[('is_multi_variants','=',True)]}"/>
20 <field name="is_multi_variants" invisible="True"/>


People subscribed via source and target branches