diff options
| author | Olivier Dony <odo@openerp.com> | 2012-08-29 17:54:00 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-08-29 17:54:00 +0200 |
| commit | bc74fc920cd159ebcbcee62d0b3e99eaac15641e (patch) | |
| tree | c4c1d4633be52a442420d27251035321eb5ab801 /addons/procurement/procurement_view.xml | |
| parent | ba7aee832d999b940c1139218d6966db660510fe (diff) | |
| parent | 6e80e425d1626d46c0f48054a5beb339fa1cd557 (diff) | |
[MERGE] Rebase incorrect top-level merge of `pad/wiki` refactoring + extra merge of product form simplification
To be completed by an extra merge containing the remaining
work-in-progress stuff of pad/wiki refactoring.
bzr revid: odo@openerp.com-20120829155400-memirrjghutw5pl7
Diffstat (limited to 'addons/procurement/procurement_view.xml')
| -rw-r--r-- | addons/procurement/procurement_view.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index dbdc65c6763..f2a8dc98cb0 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -286,7 +286,7 @@ <record id="product_normal_form_view" model="ir.ui.view"> <field name="name">product.normal.form.orderpoint.inherit</field> <field name="model">product.product</field> - <field name="inherit_id" ref="product.product_normal_form_view"/> + <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/> <field name="arch" type="xml"> <page string="Procurement & Locations" position="inside"> <separator string="Minimum Stock Rules"/> |