From f0687186fd812a9a8a7dff68284ca3e0453decec Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Tue, 6 Nov 2012 13:04:38 +0530 Subject: [PATCH 01/11] [FIX] Document: directory configuration wizard form view bzr revid: rgaopenerp-20121106073438-ycf0kcit1i4iasy5 --- addons/document/wizard/document_configuration_view.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml index 48b41f94500..3f07a990dd4 100644 --- a/addons/document/wizard/document_configuration_view.xml +++ b/addons/document/wizard/document_configuration_view.xml @@ -12,8 +12,10 @@ - From 6e24341726def3fefa801b75d80625cbe9d22902 Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Tue, 6 Nov 2012 15:15:42 +0530 Subject: [PATCH 02/11] [IMP] Could not get field with name 'parent.partner_id' bzr revid: hip@tinyerp.com-20121106094542-s7a2ardfdk698d4n --- addons/stock/stock_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index c63c385967e..4a3dfe9413a 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1288,7 +1288,7 @@ - + From cb849b0876771c2390a0ef69aef6dfc03d028712 Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Tue, 6 Nov 2012 18:30:05 +0530 Subject: [PATCH 04/11] [IMP] Rverte the changes bzr revid: hip@tinyerp.com-20121106130005-qt5s9epb1rnbkody --- addons/mrp/res_config.py | 4 ++++ addons/mrp/res_config_view.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index ec3deb524a3..c1712b81a26 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -28,6 +28,10 @@ class mrp_config_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { + 'module_stock_planning': fields.boolean('Manage master production shedule', + help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling, + which works automatically based on minimum stock rules. + This installs the module stock_planning."""), 'module_mrp_repair': fields.boolean("Manage repairs of products ", help="""Allows to manage all product repairs. * Add/remove products in the reparation diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml index 2c7047380a8..6b4058fb7b4 100644 --- a/addons/mrp/res_config_view.xml +++ b/addons/mrp/res_config_view.xml @@ -56,6 +56,10 @@ From 8d62e341686315db81403df44c87ec819e200c3d Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Tue, 6 Nov 2012 18:31:32 +0530 Subject: [PATCH 05/11] [IMP] Remove error on opening Manufacturing in Serttings bzr revid: hip@tinyerp.com-20121106130132-szc4pzy3teaprnqf --- addons/mrp/res_config.py | 4 ---- addons/mrp/res_config_view.xml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index c1712b81a26..ec3deb524a3 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -28,10 +28,6 @@ class mrp_config_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { - 'module_stock_planning': fields.boolean('Manage master production shedule', - help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling, - which works automatically based on minimum stock rules. - This installs the module stock_planning."""), 'module_mrp_repair': fields.boolean("Manage repairs of products ", help="""Allows to manage all product repairs. * Add/remove products in the reparation diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml index 6b4058fb7b4..2c7047380a8 100644 --- a/addons/mrp/res_config_view.xml +++ b/addons/mrp/res_config_view.xml @@ -56,10 +56,6 @@ diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 4a3dfe9413a..c63c385967e 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1288,7 +1288,7 @@ - + From 43b8d0dff4e807a9ad7c2477de1445c30d70f985 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 12 Nov 2012 16:03:29 +0530 Subject: [PATCH 08/11] [FIX] mrp: fix issue of parent.partner_id bzr revid: tpa@tinyerp.com-20121112103329-lvj3dxg4cmc0j78u --- addons/mrp/mrp_view.xml | 48 ++++------------------------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 8f181e285e5..52e503fe0f5 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -668,7 +668,7 @@ - + @@ -693,7 +693,7 @@ - + @@ -714,7 +714,7 @@ - + @@ -729,50 +729,10 @@ icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned"/> -
-
-
- - - - - - - - - - - - - - - - -
- + From cb568aaff304ae6706f7944458ed65be7ad596fc Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 12 Nov 2012 18:28:24 +0530 Subject: [PATCH 09/11] [IMP] improved code. bzr revid: tpa@tinyerp.com-20121112125824-zy67rmrbyeph809g --- addons/mrp/mrp_view.xml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 52e503fe0f5..fbb31337e4c 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -677,17 +677,18 @@