Merge lp:~openerp-dev/openobject-addons/7.0-opw-595596-han into lp:openobject-addons/7.0

[Hardik Ansodariya (OpenERP)]

Hello,

Relocated the active field into Inventory/ Status from Procurement/ Delay in product form.

With reference of maintenance case: 595596.

Thanks

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Juan Rial (OpenERP) (jri-openerp)]

Rejected: The 7.0 branch is stable, so only bugfixes go in. Please resubmit against trunk.

Note: I don't disagree with the contents of the patch, only with the target branch. The patch itself looks sensible.

Thanks.

review: Disapprove

Unmerged revisions

9329. By Hardik Ansodariya (OpenERP) on 2013-08-05

[IMP] product: changed the position of active field from Procurement/Delay to Inventory/status Tab(Maintenace case: 595596)

=== modified file 'stock/product_view.xml'
--- stock/product_view.xml	2012-11-29 22:26:45 +0000
+++ stock/product_view.xml	2013-08-05 08:53:31 +0000
@@ -74,7 +74,6 @@
                         <div attrs="{'invisible':[('type','=','service')]}">
                             <field name="produce_delay" class="oe_inline"/> days
                         </div>
-                        <field name="active"/>
                     </group>
                 </group>
                 <xpath expr="//group[@string='Sale Conditions']" position="inside">
@@ -83,6 +82,9 @@
                             <field name="sale_delay" class="oe_inline"/> days
                         </div>
                 </xpath>
+                <group name="status" position="inside" version="7.0">
+                    <field name="active"/>
+                </group>
                 <group name="status" position="before" version="7.0">
                     <group string="Stock and Expected Variations" attrs="{'invisible': [('type', '=', 'service')]}" groups="base.group_user">
                         <label for="qty_available"/>