diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 88908884b26..7be84764192 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1120,4 +1120,10 @@ class mrp_production_product_line(osv.osv):
}
mrp_production_product_line()
+class product_product(osv.osv):
+ _inherit = "product.product"
+ _columns = {
+ 'bom_ids': fields.one2many('mrp.bom', 'product_id', 'Bill of Materials'),
+ }
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 121567b3e56..e5e1e4fbc63 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -413,7 +413,6 @@
-
@@ -450,7 +449,7 @@
tree
child_complete_ids
-
+
@@ -975,6 +974,19 @@
+
+ product.normal.form.mrp.inherit
+ product.product
+ form
+
+
+
+
+
+
+
+
+
-
-
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 164314c4573..81bfe58947f 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -571,8 +571,9 @@ stock_warehouse_orderpoint()
class product_product(osv.osv):
_inherit="product.product"
_columns = {
- 'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rule')
+ 'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
}
+
product_product()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index b3e90ab4e6e..37a0b2c48d2 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -251,15 +251,6 @@
src_model="stock.warehouse"
groups="stock.group_stock_user"/>
-
-
-
-
product.normal.form.orderpoint.inherit
product.product
form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 00d33b0f52f..1038297b80d 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -216,6 +216,7 @@
![]()
+ Code:
No Stock
Stock: on hand, available
@@ -275,7 +276,7 @@
-
+
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 3780c68b2b3..a0101c347bf 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -1,6 +1,90 @@
+
+
+ My Quotations
+ sale.order
+ form
+ tree,form
+ [('state','=','draft'),('user_id','=',uid)]
+
+
+
+
+ turnover.by.month.tree
+ account.invoice.report
+ tree
+
+
+
+
+
+
+
+
+
+
+ turnover.by.month.graph
+ account.invoice.report
+
+
+ graph
+
+
+
+
+
+
+
+
+ Monthly Turnover
+ account.invoice.report
+ form
+ graph,tree
+
+ [('year','ilike',time.strftime('%Y')),('user_id','=',uid)]
+ {'group_by_no_leaf':1,'group_by':['month']}
+
+
+
+
+ graph
+
+
+
+
+ tree
+
+
+
+
+ board.sales.form
+ board.board
+ form
+
+
+
+
+
+ Sales
+ board.board
+ form
+ form
+
+
+
+
+
board.sales.manager.form
board.board
@@ -21,112 +105,14 @@
-
- Sales Manager Dashboard
+ Sales Manager
board.board
form
form
-
-
-
-
-
-
- My Quotations
- sale.order
- form
- tree,form
- [('state','=','draft'),('user_id','=',uid)]
-
-
-
-
- turnover.by.month.tree
- account.invoice.report
- tree
-
-
-
-
-
-
-
-
-
-
-
- turnover.by.month.graph
- account.invoice.report
-
-
- graph
-
-
-
-
-
-
-
-
-
- Monthly Turnover
- account.invoice.report
- form
- graph,tree
-
- [('year','ilike',time.strftime('%Y')),('user_id','=',uid)]
- {'group_by_no_leaf':1,'group_by':['month']}
-
-
-
-
-
- graph
-
-
-
-
-
- tree
-
-
-
-
- board.sales.form
- board.board
- form
-
-
-
-
-
-
- Sales Dashboard
- board.board
- form
- form
-
-
-
-
+
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 847e2e8f463..467ccae72a9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,10 +1,6 @@
-
-
-
+
sale.shop
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 3fefc59c20a..8da96384d0a 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -43,7 +43,6 @@ crm modules.
'init_xml': [],
'update_xml': ['wizard/crm_make_sale_view.xml',
'sale_crm_view.xml',
- 'board_sale_crm_view.xml',
'process/sale_crm_process.xml',
'security/sale_crm_security.xml',
'security/ir.model.access.csv'
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
deleted file mode 100644
index a5fa08222e0..00000000000
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
- board.crm.form.inherit.replace1
- board.board
- form
-
-
-
-
-
-
-
-
-
- board.crm.form.inherit.replace1
- board.board
- form
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 32e23a10666..61ced66c4cb 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -8,9 +8,11 @@
form
-
-
-
+
+
+
+
+
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index b99b7e98609..9f15eba5389 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -68,9 +68,8 @@
-
-
-
+
+
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 5af954a023a..65a1a8c2ef3 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -61,7 +61,7 @@
-
+