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

[Mathieu Stumpf]

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.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Hello,

The management of the project has moved to Github: https://github.com/OCA/product-variant

Please migrate your merge proposal to Github. You may want to check https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub for an explanation on how to proceed.

Thanks for contributing to the project

review: Needs Resubmitting

Unmerged revisions

195. By Mathieu Stumpf on 2014-03-31

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

=== 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"/>