From 55c4d298efca670d78e6e1b9a9f1a85d1b274e3c Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 5 Mar 2012 16:22:43 +0530 Subject: [PATCH 1/8] [ADD] added configuration view for mrp bzr revid: tpa@tinyerp.com-20120305105243-owrr6ks1326t1hi2 --- addons/mrp/__init__.py | 5 +- addons/mrp/__openerp__.py | 3 +- addons/mrp/mrp_view.xml | 26 ++++---- addons/mrp/res_config.py | 91 ++++++++++++++++++++++++++++ addons/mrp/res_config_view.xml | 60 ++++++++++++++++++ addons/mrp/security/mrp_security.xml | 10 +++ 6 files changed, 180 insertions(+), 15 deletions(-) create mode 100644 addons/mrp/res_config.py create mode 100644 addons/mrp/res_config_view.xml diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py index 52a5bdda77b..e0bdc06d3e3 100644 --- a/addons/mrp/__init__.py +++ b/addons/mrp/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -26,5 +26,6 @@ import wizard import report import company import procurement +import res_config # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index c205b58b547..6a6d677520d 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -86,6 +86,7 @@ Dashboard provided by this module: 'report/mrp_report_view.xml', 'report/mrp_production_order_view.xml', 'board_manufacturing_view.xml', + 'res_config_view.xml', ], @@ -94,7 +95,7 @@ Dashboard provided by this module: ], 'test': [ 'test/order_demo.yml', - 'test/order_process.yml', + 'test/order_process.yml', 'test/cancel_order.yml', ], 'installable': True, diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 9c3fd6eb335..3aaefd0c4ec 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -105,15 +105,17 @@ From 886edaa994be8de4c0eda02edacd9c26bce2e50d Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 5 Mar 2012 16:55:08 +0530 Subject: [PATCH 2/8] [IMP] improved code bzr revid: tpa@tinyerp.com-20120305112508-81zie1lcu2y9pgo7 --- addons/mrp/res_config.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index f0d28c9cae2..3f054224a45 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -82,10 +82,6 @@ class mrp_configuration(osv.osv_memory): It assigns the "Properties of Product" group to employee."""), } - _defaults = { - 'default_method': lambda s,c,u,ctx: s.pool.get('purchase.order').default_get(c,u,['invoice_method'],context=ctx)['invoice_method'], - } - mrp_configuration() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file From e685ba3d15e6d0a761860c6f73e34d108f9661f2 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 5 Mar 2012 17:01:19 +0530 Subject: [PATCH 3/8] [IMP] improved code bzr revid: tpa@tinyerp.com-20120305113119-cukzkalfoi34lduc --- addons/mrp/res_config_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml index 59aa2c135b5..ef3e4f6f960 100644 --- a/addons/mrp/res_config_view.xml +++ b/addons/mrp/res_config_view.xml @@ -10,7 +10,7 @@
- + From 1f5ef15e5e943a2b7cfb84d1f97b6031c12ab5d5 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 5 Mar 2012 17:04:03 +0530 Subject: [PATCH 4/8] [IMP] improved code bzr revid: tpa@tinyerp.com-20120305113403-uqfp2v4ldl8jva1w --- addons/mrp/res_config.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index 3f054224a45..04f574b4d4c 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -27,11 +27,6 @@ class mrp_configuration(osv.osv_memory): _inherit = 'res.config.settings' _columns = { - 'default_method' : fields.selection( - [('manual', 'Based on Purchase Order Lines'), - ('picking', 'Based on Receptions'), - ('order', 'Pre-Generate Draft Invoices based on Purchase Orders'), - ], 'Invoicing Control Method', required=True , help="You can set Invoicing Control Method."), 'module_stock_planning': fields.boolean('Track work order planning', help =""" This allows to create a manual procurement plan apart of the normal MRP scheduling, which works automatically based on minimum stock rules. From 7aae1867ec433fe3a63781fe950c264c1cb3bec1 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 5 Mar 2012 17:14:21 +0530 Subject: [PATCH 5/8] [IMP] improved code bzr revid: tpa@tinyerp.com-20120305114421-2f00mo3w8t6wp5oy --- addons/mrp/res_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index 04f574b4d4c..5d54ecd04ce 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -50,7 +50,7 @@ class mrp_configuration(osv.osv_memory): A + B + C -> D With this module: A + B + C -> D + E. - It installs the purchase_double_validation module."""), + It installs the mrp_subproduct module."""), 'module_stock_location' : fields.boolean("Allow push/pull flows by product", help="""This module supplements the Warehouse application by effectively implementing Push and Pull inventory flows. Typically this could be used to: From 3bc835563762adf6955a758b54b19101a71f71ea Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 6 Mar 2012 12:03:22 +0530 Subject: [PATCH 6/8] [IMP] create new view instead of inheriting bzr revid: tpa@tinyerp.com-20120306063322-fvvsd4odsh4v3ulh --- addons/mrp/res_config.py | 4 ++-- addons/mrp/res_config_view.xml | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index 5d54ecd04ce..127ee447ddc 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -69,10 +69,10 @@ class mrp_configuration(osv.osv_memory): 'module_mrp_operations': fields.boolean("Track dates in work order operations", help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). It installs the mrp_operations module."""), - 'group_mrp_routings':fields.boolean("Manage manufacturing operations ", + 'group_mrp_routings':fields.boolean("Manage manufacturing operations ",group='base.group_user', xml_id='base.group_mrp_routings', help="""Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.. It assigns the "Routings" group to employee."""), - 'group_mrp_properties':fields.boolean("Allow different properties per product in your order", + 'group_mrp_properties':fields.boolean("Allow different properties per product in your order",group='base.group_user', xml_id='base.group_mrp_routings', help="""Allows to Define specific property groups that can be assigned to the properties of your bill of materials. It assigns the "Properties of Product" group to employee."""), } diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml index ef3e4f6f960..a9e77d02047 100644 --- a/addons/mrp/res_config_view.xml +++ b/addons/mrp/res_config_view.xml @@ -5,10 +5,8 @@ Manufacturing Application res.config.settings form - - - + @@ -40,8 +38,7 @@ - - +
@@ -54,7 +51,7 @@ form - + From 4fceaf43e041e5f1508b0920e58972b3a02a0f50 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 13 Mar 2012 14:34:12 +0530 Subject: [PATCH 7/8] [IMP] improved code bzr revid: tpa@tinyerp.com-20120313090412-5p6skrd0xkkkj4kl --- addons/mrp/res_config.py | 11 ++++++----- addons/mrp/res_config_view.xml | 6 +++--- addons/mrp/security/mrp_security.xml | 7 +++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index 127ee447ddc..1a5ccb20bcd 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -24,6 +24,7 @@ import pooler from tools.translate import _ class mrp_configuration(osv.osv_memory): + _name = 'mrp.configuration' _inherit = 'res.config.settings' _columns = { @@ -33,13 +34,13 @@ class mrp_configuration(osv.osv_memory): It installs the stock_planning module. """), 'module_mrp_repair': fields.boolean("Track products repair", - help="""The aim is to have a complete module to manage all products repairs. + help="""Allows to manage all products repairs. * Add/remove products in the reparation * Impact for stocks * Invoicing (products and/or services) * Warranty concept * Repair quotation report - * Notes for the technician and for the final customer + * Notes for the technician and for the final customer. It installs the mrp_repair module."""), 'module_mrp_operations': fields.boolean("Track dates in work order operations", help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). @@ -52,7 +53,7 @@ class mrp_configuration(osv.osv_memory): A + B + C -> D + E. It installs the mrp_subproduct module."""), 'module_stock_location' : fields.boolean("Allow push/pull flows by product", - help="""This module supplements the Warehouse application by effectively implementing Push and Pull inventory flows. + help="""Allows to implement Push and Pull inventory flows. Typically this could be used to: * Manage product manufacturing chains * Manage default locations per product @@ -69,10 +70,10 @@ class mrp_configuration(osv.osv_memory): 'module_mrp_operations': fields.boolean("Track dates in work order operations", help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). It installs the mrp_operations module."""), - 'group_mrp_routings':fields.boolean("Manage manufacturing operations ",group='base.group_user', xml_id='base.group_mrp_routings', + 'group_mrp_routings':fields.boolean("Manage manufacturing operations ",group='base.group_user', implied_group='base.group_mrp_routings', help="""Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.. It assigns the "Routings" group to employee."""), - 'group_mrp_properties':fields.boolean("Allow different properties per product in your order",group='base.group_user', xml_id='base.group_mrp_routings', + 'group_mrp_properties':fields.boolean("Allow different properties per product in your order",group='base.group_user', implied_group='base.group_mrp_properties', help="""Allows to Define specific property groups that can be assigned to the properties of your bill of materials. It assigns the "Properties of Product" group to employee."""), } diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml index a9e77d02047..d495402b638 100644 --- a/addons/mrp/res_config_view.xml +++ b/addons/mrp/res_config_view.xml @@ -3,7 +3,7 @@ Manufacturing Application - res.config.settings + mrp.configuration form
@@ -45,13 +45,13 @@ Configure Manufacturing Application ir.actions.act_window - res.config.settings + mrp.configuration form form - + diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml index 8054e22b2ff..bb307938be2 100644 --- a/addons/mrp/security/mrp_security.xml +++ b/addons/mrp/security/mrp_security.xml @@ -22,6 +22,13 @@ + + + + From b3c045ebf4f9526e7019b83f8ca1d7d57bd110a0 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 13 Mar 2012 15:59:27 +0530 Subject: [PATCH 8/8] [IMP] improved tooltip bzr revid: tpa@tinyerp.com-20120313102927-minoi1h2qprfj6r2 --- addons/mrp/res_config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index 1a5ccb20bcd..3b8d76b8db1 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -61,7 +61,7 @@ class mrp_configuration(osv.osv_memory): - Quality Control - After Sales Services - Supplier Returns. - It Installs stock_location module."""), + It installs stock_location module."""), 'module_mrp_jit': fields.boolean("Allow the just in time scheduling", help="""This allows Just In Time computation of procurement orders. All procurement orders will be processed immediately, which could in some @@ -71,10 +71,10 @@ class mrp_configuration(osv.osv_memory): help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). It installs the mrp_operations module."""), 'group_mrp_routings':fields.boolean("Manage manufacturing operations ",group='base.group_user', implied_group='base.group_mrp_routings', - help="""Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.. + help="""Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials. It assigns the "Routings" group to employee."""), 'group_mrp_properties':fields.boolean("Allow different properties per product in your order",group='base.group_user', implied_group='base.group_mrp_properties', - help="""Allows to Define specific property groups that can be assigned to the properties of your bill of materials. + help="""Allows to define specific property that can be assigned to your bill of materials. It assigns the "Properties of Product" group to employee."""), }