diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 8f051b33bf9..63a8e6c7add 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -23,7 +23,6 @@
-
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index a785d022b53..52b79e2ade0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -985,42 +985,14 @@
-
+
product.normal.form.mrp.inherit
product.product
-
-
-
-
-
-
-
- product.normal.form.mrp.inherit
- product.product
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -1078,5 +1050,24 @@
id="menu_mrp_production_order_action" name="Orders Planning"
parent="menu_mrp_planning" sequence="1"/>
+
+
+ {'default_product_id': active_id, 'search_default_product_id': active_id}
+ Bill of Materials
+ mrp.bom
+
+
+
+ product.product.procurement
+ product.product
+
+
+
+
+
+
+
+
+
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index c6cd4a7f51c..1fa0f2c8a97 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,7 +26,7 @@ from tools.translate import _
class product_product(osv.osv):
_inherit = "product.product"
_columns = {
- "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', [('bom_id','=',False)]),
+ "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', domain=[('bom_id','=',False)]),
}
def copy(self, cr, uid, id, default=None, context=None):
if not default:
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index f2a8dc98cb0..432ff13aaa5 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -261,12 +261,12 @@
+ context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
+ id="act_stock_warehouse_2_stock_warehouse_orderpoint"
+ name="Reordering Rules"
+ res_model="stock.warehouse.orderpoint"
+ src_model="stock.warehouse"
+ groups="stock.group_stock_user"/>
-
- product.normal.form.orderpoint.inherit
- product.product
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {'default_product_id': active_id, 'search_default_product_id': active_id}
+ Orderpoints
+ stock.warehouse.orderpoint
@@ -307,10 +295,9 @@
product.product
-
-
-
-
+
+
+
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 17b4a7ecc68..d341b5883d6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -72,6 +72,8 @@
+
+