summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorJigar Amin - OpenERP <jam@tinyerp.com>2012-09-13 12:10:14 +0530
committerJigar Amin - OpenERP <jam@tinyerp.com>2012-09-13 12:10:14 +0530
commitea569b409139ed06bba4db724924c8e854c567c2 (patch)
treef5b045b2a977ba569db7e050b5a4dc867e642908 /addons
parent0e0d66adaf81340f22878e524cd9176eabc89871 (diff)
parent7a95639544c8a2f698e73289cab2ec86e12d5824 (diff)
merge lp:~openerp-dev/openobject-addons/trunk-addons9-apa-product-fka
bzr revid: jam@tinyerp.com-20120913064014-3wvawqvqg5mpaned
Diffstat (limited to 'addons')
-rw-r--r--addons/mrp/mrp_view.xml2
-rw-r--r--addons/project_mrp/project_mrp_view.xml10
2 files changed, 6 insertions, 6 deletions
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8121f6e84d1..34f3bd3909e 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -978,7 +978,7 @@
</data>
</field>
</record>
- <record id="product_normal_form_supply_view" model="ir.ui.view">
+ <record id="product.product_normal_form_supply_view" model="ir.ui.view">
<field name="name">product.normal.form.mrp.inherit</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index fdfefd10e30..ca1e1f893e7 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -31,14 +31,14 @@
</field>
</field>
</record>
- <record id="view_product_form" model="ir.ui.view">
- <field name="name">product.form.view</field>
+ <record id="product.product_normal_form_supply_view" model="ir.ui.view">
+ <field name="name">product.normal.form.project_mrp.inherit</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
- <field name="uom_po_id" position="before">
- <field name="supply_method" />
- </field>
+ <xpath expr="//field[@name='procure_method']" position="after">
+ <field name="supply_method" groups="base.group_user"/>
+ </xpath>
</field>
</record>
</data>