From f672183ff142178f78df8ec70686bb9ff43057c3 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 1 Mar 2011 12:51:34 +0530 Subject: [PATCH 1/7] [IMP] Rework-Addons :Improvement Config wiz , ON Addonse Side bzr revid: aag@tinyerp.co.in-20110301072134-3rrx10e53csav102 --- addons/account/account_installer.xml | 4 +-- .../account_sequence_installer_view.xml | 2 +- addons/base_setup/base_setup_todo.xml | 2 +- addons/base_setup/installer.py | 33 +++++++++++++++++++ addons/crm/crm_installer_view.xml | 2 +- .../wizard/document_configuration_view.xml | 2 +- addons/hr/hr_installer.xml | 2 +- addons/knowledge/knowledge_installer.xml | 2 +- addons/l10n_be/l10n_be_wizard.xml | 2 +- .../data/l10n_br_account_chart_template.xml | 2 +- addons/l10n_cr/l10n_wizard.xml | 2 +- addons/l10n_es/l10n_es_wizard.xml | 2 +- addons/l10n_fr/l10n_fr_wizard.xml | 2 +- addons/l10n_lu/l10n_lu_wizard.xml | 2 +- addons/l10n_ma/l10n_ma_wizard.xml | 2 +- addons/l10n_uk/l10n_uk_wizard.xml | 2 +- addons/mrp/mrp_installer.xml | 2 +- addons/profile_tools/misc_tools_installer.xml | 2 +- addons/project/project_installer.xml | 2 +- .../purchase_double_validation_installer.xml | 2 +- .../report_designer_installer.xml | 2 +- addons/sale/sale_installer.xml | 2 +- 22 files changed, 55 insertions(+), 22 deletions(-) diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 6ebdf74b977..7e3836340b9 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -116,13 +116,13 @@ 3 - onskip + on_trigger 5 - always + on_trigger diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml index 1051b133045..3a812a187c4 100644 --- a/addons/account_sequence/account_sequence_installer_view.xml +++ b/addons/account_sequence/account_sequence_installer_view.xml @@ -50,7 +50,7 @@ 3 - onskip + on_trigger diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index 7cd0563aafe..c3a1bc24a8b 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -67,7 +67,7 @@ 1 - onskip + on_trigger diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index e23f1171752..bb2626a59ae 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -19,6 +19,7 @@ # ############################################################################## from osv import fields, osv +import re class base_setup_installer(osv.osv_memory): _name = 'base.setup.installer' @@ -101,5 +102,37 @@ class base_setup_installer(osv.osv_memory): value.update({'progress':progress}) if progress < 10.: progress = 10. + return {'value':value} + + def execute(self, cr, uid, ids, context=None): + if context is None: + context = {} + modules = self.pool.get('ir.module.module') + modules_selected = [] + datas = self.read(cr, uid, ids, context=context)[0] + key = datas.keys() + key.remove("id") + key.remove("progress") + name_list = [] + for mod in key: + if datas[mod] == 1: + modules_selected.append(mod) + inst = modules.browse( + cr, uid, + modules.search(cr, uid, + [('name','in',modules_selected) + ], + context=context), + context=context) + for i in inst: + if i.state == 'uninstalled': + sect_mod_id = i.id + modules.button_install(cr, uid, [sect_mod_id], context=context) + elif i.state == 'installed': + if modules_selected: + for instl in modules_selected: + cr.execute("update ir_actions_todo set restart='on_trigger' , state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model = 'ir.actions.todo' and data.module like '%"+instl+"%'") + + return base_setup_installer() diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index 35ff5a0a7cc..778ebd5646a 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -61,7 +61,7 @@ 3 - always + on_trigger diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml index 156af432b0e..8aa874782b9 100644 --- a/addons/document/wizard/document_configuration_view.xml +++ b/addons/document/wizard/document_configuration_view.xml @@ -46,7 +46,7 @@ - + diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml index 5ccbaefa3f5..3d04abf00e3 100644 --- a/addons/hr/hr_installer.xml +++ b/addons/hr/hr_installer.xml @@ -52,7 +52,7 @@ 3 - always + on_trigger diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml index 068fa9b413b..79f6cfb178e 100644 --- a/addons/knowledge/knowledge_installer.xml +++ b/addons/knowledge/knowledge_installer.xml @@ -53,7 +53,7 @@ 3 - always + on_trigger diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml index 0e691260425..5b3c42b22fa 100644 --- a/addons/l10n_be/l10n_be_wizard.xml +++ b/addons/l10n_be/l10n_be_wizard.xml @@ -4,7 +4,7 @@ - onskip + on_trigger diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml index dd714bacab8..4b548f65c8c 100644 --- a/addons/l10n_br/data/l10n_br_account_chart_template.xml +++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml @@ -19,7 +19,7 @@ This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. open - onskip + on_trigger diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml index 0e691260425..5b3c42b22fa 100644 --- a/addons/l10n_cr/l10n_wizard.xml +++ b/addons/l10n_cr/l10n_wizard.xml @@ -4,7 +4,7 @@ - onskip + on_trigger diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml index 294f0a5e668..3bbda51e00c 100644 --- a/addons/l10n_es/l10n_es_wizard.xml +++ b/addons/l10n_es/l10n_es_wizard.xml @@ -4,7 +4,7 @@ - onskip + on_trigger diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml index 985c3b81195..48147ac172d 100644 --- a/addons/l10n_fr/l10n_fr_wizard.xml +++ b/addons/l10n_fr/l10n_fr_wizard.xml @@ -4,7 +4,7 @@ - onskip + on_trigger diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml index f0655f3dc99..5942e7800d0 100644 --- a/addons/l10n_lu/l10n_lu_wizard.xml +++ b/addons/l10n_lu/l10n_lu_wizard.xml @@ -4,7 +4,7 @@ - onskip + on_trigger diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml index 4524c36fb10..4768ed60dee 100644 --- a/addons/l10n_ma/l10n_ma_wizard.xml +++ b/addons/l10n_ma/l10n_ma_wizard.xml @@ -4,7 +4,7 @@ - onskip + on_trigger diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml index 63a56521bd8..62fe38a1642 100644 --- a/addons/l10n_uk/l10n_uk_wizard.xml +++ b/addons/l10n_uk/l10n_uk_wizard.xml @@ -8,7 +8,7 @@ This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. open - onskip + on_trigger diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml index ff0c01f8e18..4008385ff32 100644 --- a/addons/mrp/mrp_installer.xml +++ b/addons/mrp/mrp_installer.xml @@ -48,7 +48,7 @@ 3 - always + on_trigger diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml index 235d2d6e392..c21f703b291 100644 --- a/addons/profile_tools/misc_tools_installer.xml +++ b/addons/profile_tools/misc_tools_installer.xml @@ -48,7 +48,7 @@ - always + on_trigger 3 diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml index 32b235e4691..7200986beb2 100644 --- a/addons/project/project_installer.xml +++ b/addons/project/project_installer.xml @@ -50,7 +50,7 @@ - always + on_trigger 3 diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml index c3369f68554..2cafbd7cd9a 100644 --- a/addons/purchase_double_validation/purchase_double_validation_installer.xml +++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml @@ -44,7 +44,7 @@ - onskip + on_trigger diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml index 2f838c0b74c..31f6d16ae22 100644 --- a/addons/report_designer/report_designer_installer.xml +++ b/addons/report_designer/report_designer_installer.xml @@ -45,7 +45,7 @@ - always + on_trigger 3 diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml index 4149871ad36..ad707a1abec 100644 --- a/addons/sale/sale_installer.xml +++ b/addons/sale/sale_installer.xml @@ -47,7 +47,7 @@ - always + on_trigger 3 From 165ac138532350c8e4ab064e7d618d7d7d88136f Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 1 Mar 2011 14:11:36 +0530 Subject: [PATCH 2/7] [IMP] Rework-Addons :Remove import file bzr revid: aag@tinyerp.co.in-20110301084136-s42s9y4zyk6c9u6g --- addons/base_setup/installer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index bb2626a59ae..a1605fa55bb 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -19,7 +19,6 @@ # ############################################################################## from osv import fields, osv -import re class base_setup_installer(osv.osv_memory): _name = 'base.setup.installer' From 1a809c2f4893d5381fb47326ea122a3f0bd42810 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Wed, 16 Mar 2011 17:33:38 +0530 Subject: [PATCH 3/7] [IMP]: base_setup: Improvement for the main application: like HR, we want them to be able to re-thick an installed application but in HRs configuration, if hr_holidays is already installed, the boolean "holidays management" should be thick and readonly bzr revid: rpa@tinyerp.com-20110316120338-zbdm1a6zo0rw76to --- addons/base_setup/installer.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index a1605fa55bb..50653e20be7 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -104,6 +104,17 @@ class base_setup_installer(osv.osv_memory): return {'value':value} + + def default_get(self, cr, uid, fields_list, context=None): + #Skipping default value as checked for main application, if already installed + return super(osv.osv_memory, self).default_get( + cr, uid, fields_list, context=context) + + def fields_get(self, cr, uid, fields=None, context=None, write_access=True): + #Skipping readonly value for main application, if already installed + return super(osv.osv_memory, self).fields_get( + cr, uid, fields, context, write_access) + def execute(self, cr, uid, ids, context=None): if context is None: context = {} From c05a79ed07027874dd71573d937dd1a6f359d1a9 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 29 Mar 2011 13:54:14 +0530 Subject: [PATCH 4/7] [IMP]: TASK of REWORK- UPdate Account chart view bzr revid: aag@tinyerp.co.in-20110329082414-6deyci0icaqfw78w --- addons/account/configurable_account_chart.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml index 1a0a21d3971..c4b3899b772 100644 --- a/addons/account/configurable_account_chart.xml +++ b/addons/account/configurable_account_chart.xml @@ -617,7 +617,7 @@ Generate Chart of Accounts from a Chart Template open - onskip + on_trigger From 8a4485f2f62164031d376e151bfa8c8e8b629a3c Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 29 Mar 2011 16:02:07 +0530 Subject: [PATCH 5/7] [IMP]BASE_SETUP: TASK of REWORK-Remove call of Install btn bzr revid: aag@tinyerp.co.in-20110329103207-o872ckzew5j7ja8g --- addons/base_setup/installer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 50653e20be7..6c0367816b8 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -119,6 +119,7 @@ class base_setup_installer(osv.osv_memory): if context is None: context = {} modules = self.pool.get('ir.module.module') + upgrade_obj = self.pool.get('base.module.upgrade') modules_selected = [] datas = self.read(cr, uid, ids, context=context)[0] key = datas.keys() @@ -138,7 +139,8 @@ class base_setup_installer(osv.osv_memory): for i in inst: if i.state == 'uninstalled': sect_mod_id = i.id - modules.button_install(cr, uid, [sect_mod_id], context=context) + modules.state_update(cr, uid, [sect_mod_id], 'to install', ['uninstalled'], context) + upgrade_obj.upgrade_module(cr, uid, [sect_mod_id], context=context) elif i.state == 'installed': if modules_selected: for instl in modules_selected: From 527ba1280951490884f453d1de53df015063327e Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Thu, 31 Mar 2011 12:22:42 +0530 Subject: [PATCH 6/7] [IMP]base_setup:Optimize Code bzr revid: aag@tinyerp.co.in-20110331065242-hlr92ir0emadiyad --- addons/base_setup/installer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index d324cba2e3f..34c68fcf9f9 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -120,7 +120,6 @@ class base_setup_installer(osv.osv_memory): if context is None: context = {} modules = self.pool.get('ir.module.module') - upgrade_obj = self.pool.get('base.module.upgrade') modules_selected = [] datas = self.read(cr, uid, ids, context=context)[0] key = datas.keys() From 233084fdc645d939282abef9e452b4c1daa83dea Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 31 Mar 2011 10:39:19 +0200 Subject: [PATCH 7/7] [IMP] base_setup: set restart=never and state=skip on the 'configure your company' wizard bzr revid: qdp-launchpad@openerp.com-20110331083919-01lwi0uxtbra167f --- addons/base_setup/base_setup_todo.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index c3a1bc24a8b..234571b458e 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -67,7 +67,8 @@ 1 - on_trigger + never + skip