From 7c6ebb98f5e0cf38521c96a1884c1ab233397aba Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 11 Jun 2012 15:29:14 +0530 Subject: [FIX]stock: added a group , class on button, improve a menu tip,label name,added a tree view on one2many field bzr revid: mma@tinyerp.com-20120611095914-631eo6yw8bz9aknx --- addons/procurement/procurement.py | 4 ++-- addons/procurement/procurement_view.xml | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'addons/procurement') diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index db313e65353..1c83711abf7 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -550,10 +550,10 @@ class stock_warehouse_orderpoint(osv.osv): 'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"), 'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]), 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), - 'product_min_qty': fields.float('Min Quantity', required=True, + 'product_min_qty': fields.float('Minimum Quantity', required=True, help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\ "a procurement to bring the virtual stock to the Max Quantity."), - 'product_max_qty': fields.float('Max Quantity', required=True, + 'product_max_qty': fields.float('Maximum Quantity', required=True, help="When the virtual stock goes below the Min Quantity, OpenERP generates "\ "a procurement to bring the virtual stock to the Quantity specified as Max Quantity."), 'qty_multiple': fields.integer('Qty Multiple', required=True, diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 09bf0c6c24f..1652da39458 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -280,7 +280,15 @@ - + + + + + + + + -- cgit v1.2.3 From f0f18853c2f4995a35b8d0654eb909e01dcb7f8c Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 14 Jun 2012 14:16:17 +0530 Subject: [IMP] procurement: improved color of button based on business flow bzr revid: tpa@tinyerp.com-20120614084617-w15bm7f0xoiknf8c --- addons/procurement/procurement_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/procurement') diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index d94ac882cda..6ea883929a1 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -48,9 +48,9 @@
-
-- cgit v1.2.3 From 07021533c5904e347a6f784387104989cf51fd10 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 15 Jun 2012 14:35:22 +0530 Subject: [IMP]mrp: fix the form tag issue bzr revid: mma@tinyerp.com-20120615090522-8twzo6vov7ew3gfx --- addons/procurement/procurement_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/procurement') diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index ece6c0388f9..3fa58411e6b 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -282,7 +282,7 @@ + mode="tree"> -- cgit v1.2.3 From 06480c93b23dcddc82e22c557a695d1410603476 Mon Sep 17 00:00:00 2001 From: "Twinkle (OpenERP)" Date: Fri, 15 Jun 2012 18:31:17 +0530 Subject: [IMP]Stock:Remove cancel button from wizard and added active class flow on button bzr revid: tch@tinyerp.com-20120615130117-ndd2392k9uc5izi5 --- addons/procurement/wizard/make_procurement_view.xml | 3 +-- addons/procurement/wizard/mrp_procurement_view.xml | 3 +-- addons/procurement/wizard/orderpoint_procurement_view.xml | 3 +-- addons/procurement/wizard/schedulers_all_view.xml | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'addons/procurement') diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml index 74007305ab7..8551673c925 100644 --- a/addons/procurement/wizard/make_procurement_view.xml +++ b/addons/procurement/wizard/make_procurement_view.xml @@ -11,8 +11,7 @@
-
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml index dd75f916f6e..3e205659da2 100644 --- a/addons/procurement/wizard/mrp_procurement_view.xml +++ b/addons/procurement/wizard/mrp_procurement_view.xml @@ -12,8 +12,7 @@