← Back to team overview

openerp-community-reviewer team mailing list archive

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

 

Mathieu Stumpf has proposed merging lp:~0s/openerp-product-variant/openerp-product-variant into lp:openerp-product-variant.

Requested reviews:
  Product Core Editors (product-core-editors)

For more details, see:
https://code.launchpad.net/~0s/openerp-product-variant/openerp-product-variant/+merge/213423

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.
-- 
https://code.launchpad.net/~0s/openerp-product-variant/openerp-product-variant/+merge/213423
Your team Product Core Editors is requested to review the proposed merge of lp:~0s/openerp-product-variant/openerp-product-variant into lp:openerp-product-variant.
=== modified file 'product_variant_multi_advanced/product.xml'
--- product_variant_multi_advanced/product.xml	2012-03-30 12:50:17 +0000
+++ product_variant_multi_advanced/product.xml	2014-03-31 09:22:25 +0000
@@ -15,13 +15,10 @@
             <field name="inherit_id" ref="product_variant_multi.product_variant_form_view" />
             <field name="arch" type="xml">
                 <data>
-                    <page string="Lots" position="after">
-                        <page string="Descriptions">
-                            <separator string="Sale description" colspan="4"/>
+                    <field name="active" position="after">
+			    <label for="description_sale" string="description sale:" />
                             <field name="description_sale" nolabel="1" attrs="{'readonly':[('is_multi_variants','=',True)]}"/>
-                        </page>
-                    </page>
-
+		   </field>
                     <field name="name" position="replace">
                         <field name="name" select="1" attrs="{'required':[('is_multi_variants','=',False)], 'readonly':[('is_multi_variants','=',True)]}"/>
                         <field name="is_multi_variants" invisible="True"/>


Follow ups