[MERGE] merge from trunk addons3

[odoo/odoo.git] / addons / project_mrp / project_mrp_view.xml

diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
old mode 100644 (file)
new mode 100755 (executable)
index 726e95d..c8ed6fb
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <field name="company_id" position="after">
+                <field name="active" position="after">
                     <field name="project_id" attrs="{'readonly':[('type','!=','service')]}" />
                 </field>
             </field>