From f32a92bd5b24c5f79b4f1cf847fa3cd88a2317a0 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Thu, 26 Apr 2012 18:55:49 +0530 Subject: [PATCH 01/16] [IMP] MRP: Rename fields in res_config.py bzr revid: jap@tinyerp.com-20120426132549-4cd6lpr1fkv042mz --- addons/mrp/res_config.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index eb06de642ed..c384f5d6ee4 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -44,12 +44,12 @@ class mrp_config_settings(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). This installs the module mrp_operations."""), - 'module_mrp_subproduct': fields.boolean("Produce Different Products from one Production", + 'module_mrp_subproduct': fields.boolean("Produce Several Product from One Production", help="""You can configure sub-products in the bill of material. Without this module: A + B + C -> D. With this module: A + B + C -> D + E. This installs the module mrp_subproduct."""), - 'module_mrp_jit': fields.boolean("Just in Time Scheduling", + 'module_mrp_jit': fields.boolean("Real-Time Scheduling", help="""This allows Just In Time computation of procurement orders. All procurement orders will be processed immediately, which could in some cases entail a small performance impact. @@ -59,9 +59,9 @@ class mrp_config_settings(osv.osv_memory): 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."""), - 'group_mrp_properties': fields.boolean("Manage Properties", + 'group_mrp_properties': fields.boolean("Allow Several BoMs per Product", implied_group='product.group_mrp_properties', - help="""Allows to define specific property that can be assigned to your bill of materials."""), + help="""The selection of the right Bill of Material to use will depend on the properties specified on the sale order and the Bill of Material."""), } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 659a2fa12c85c768109eecd61ac4dbd233baccc6 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 27 Apr 2012 10:36:25 +0530 Subject: [PATCH 02/16] [IMP] MRP: Add new field Manual Picking to Fulfill Manufacturing Orders in config wizard and remove this field from warehouse config wizard bzr revid: jap@tinyerp.com-20120427050625-hpzkn9un5fibzf86 --- addons/mrp/res_config.py | 6 ++++++ addons/mrp/res_config_view.xml | 3 +-- addons/stock/res_config.py | 6 ------ addons/stock/res_config_view.xml | 1 - 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index c384f5d6ee4..ddff6676088 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -54,6 +54,12 @@ class mrp_config_settings(osv.osv_memory): All procurement orders will be processed immediately, which could in some cases entail a small performance impact. This installs the module mrp_jit."""), + 'module_stock_no_autopicking': fields.boolean("Manual Picking to Fulfill Manufacturing Orders", + help="""This module allows an intermediate picking process to provide raw materials to production orders. + For example to manage production made by your suppliers (sub-contracting). + To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking" + and put the location of the supplier in the routing of the assembly operation. + This installs the module stock_no_autopicking."""), 'group_mrp_routings': fields.boolean("Manage Routings and Work Orders", implied_group='mrp.group_mrp_routings', help="""Routings allow you to create and manage the manufacturing operations that should be followed diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml index 66b8e735ed6..c1b0b44d934 100644 --- a/addons/mrp/res_config_view.xml +++ b/addons/mrp/res_config_view.xml @@ -17,10 +17,9 @@ - - + diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py index 6148efc1131..14ba77d6993 100644 --- a/addons/stock/res_config.py +++ b/addons/stock/res_config.py @@ -26,12 +26,6 @@ class stock_config_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { - 'module_stock_no_autopicking': fields.boolean("Force Picking before Manufactoring Orders", - help="""This module allows an intermediate picking process to provide raw materials to production orders. - For example to manage production made by your suppliers (sub-contracting). - To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking" - and put the location of the supplier in the routing of the assembly operation. - This installs the module stock_no_autopicking."""), 'module_claim_from_delivery': fields.boolean("Track Claims from Delivery", help="""Adds a Claim link to the delivery order. This installs the module claim_from_delivery."""), diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml index 06611f4cdb0..eb589563300 100644 --- a/addons/stock/res_config_view.xml +++ b/addons/stock/res_config_view.xml @@ -22,7 +22,6 @@ - From a8c940cdb2262b0b0622059b0c266c180d26603e Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 27 Apr 2012 12:47:01 +0530 Subject: [PATCH 03/16] [IMP] Project: Add new field in configuration wizard, add new group in security xml, and apply group in project_view.xml bzr revid: jap@tinyerp.com-20120427071701-obqjn71vu7dykjki --- addons/project/project_view.xml | 17 +++++++++-------- addons/project/res_config.py | 8 +++++++- addons/project/res_config_view.xml | 2 ++ addons/project/security/project_security.xml | 11 +++++++++++ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 956b159a0bb..7db8d3c3481 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -239,10 +239,10 @@ - + - + @@ -251,18 +251,19 @@ name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" + groups="project.group_time_work_estimation_tasks" on_change="onchange_planned(planned_hours, effective_hours)"/> + widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/> - +