From 16e0db32bc50cdef03e303e1e063a16c3b2655b0 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Wed, 27 Apr 2011 16:21:35 +0530 Subject: [PATCH 1/3] [IMP]: base_setup: Improved query to set the state of config wizard of selected module, before if I select "account" (for example) from the application list, it was setting config wizard of account* as todo bzr revid: rpa@tinyerp.com-20110427105135-98bdd0zcy1jjii5m --- addons/base_setup/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 4de276fdce2..911e587d432 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -146,7 +146,7 @@ class base_setup_installer(osv.osv_memory): elif i.state == 'installed': if modules_selected: for instl in modules_selected: - cr.execute("update ir_actions_todo set 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+"%'") + cr.execute("update ir_actions_todo set 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=%s", (instl, )) return From bb72a48bb9437ec36188c9b48e2c68301adda4e4 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Wed, 27 Apr 2011 18:59:22 +0530 Subject: [PATCH 2/3] [IMP, REF]: Improved code to install module/update state of its config wizard * Added condition so only special config wizards are called on selection of a module bzr revid: rpa@tinyerp.com-20110427132922-wuzn8f2ilvfah1gr --- addons/base_setup/installer.py | 38 ++++++++++++++-------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 911e587d432..0309318aea0 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -120,35 +120,27 @@ class base_setup_installer(osv.osv_memory): def execute(self, cr, uid, ids, context=None): if context is None: context = {} - modules = self.pool.get('ir.module.module') + module_pool = 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: + for mod in datas.keys(): + if mod in ('id', 'progress'): + continue 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.state_update(cr, uid, [sect_mod_id], 'to install', ['uninstalled'], context) + + module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context) + for module in module_pool.browse(cr, uid, module_ids, context=context): + if module.state == 'uninstalled': + module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context) cr.commit() new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True) - elif i.state == 'installed': - if modules_selected: - for instl in modules_selected: - cr.execute("update ir_actions_todo set 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=%s", (instl, )) - - return + elif module.state == 'installed': + cr.execute("update ir_actions_todo set state='open' \ + from ir_model_data as data where data.res_id = ir_actions_todo.id \ + and ir_actions_todo.type='special'\ + and data.model = 'ir.actions.todo' and data.module=%s", (module.name, )) + return base_setup_installer() From 1d5fa6ca4c7c547a8cf88ea6b52be28d63e85726 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Wed, 27 Apr 2011 19:05:18 +0530 Subject: [PATCH 3/3] [IMP]: *: Reviewed config wizards of all modules and changed type + state in order to follow the behaviour described below: * After a fresh installation of a DB if we dont select and application to install nothing will come * If I select HR module first time, this module will be installed and all special wizards of this module should be appeared * If I select HR module(its installed) again from application list, all special wizards of this module should be set as todo in order to display when clicking next * For any other wizards we have to go to list of config wizards and run them manually (for web client these are supposed to be there in config panel) bzr revid: rpa@tinyerp.com-20110427133518-52mawayc3rgoyx9h --- addons/account/configurable_account_chart.xml | 1 - .../account_analytic_plans_installer_view.xml | 3 ++- addons/account_sequence/account_sequence_installer_view.xml | 1 + addons/association/profile_association.xml | 2 +- addons/base_contact/base_contact_installer_view.xml | 1 + .../base_report_designer/base_report_designer_installer.xml | 2 +- addons/base_setup/base_setup_installer.xml | 4 +++- addons/crm/crm_installer_view.xml | 4 ++-- addons/document/wizard/document_configuration_view.xml | 3 +-- addons/document_ics/document_ics_config_wizard.xml | 1 + addons/fetchmail/fetchmail_installer_view.xml | 3 ++- addons/hr/hr_installer.xml | 5 +++-- addons/hr_evaluation/hr_evaluation_installer_view.xml | 3 ++- addons/hr_expense/hr_expense_installer_view.xml | 3 ++- addons/hr_recruitment/hr_recruitment_installer_view.xml | 3 ++- .../hr_timesheet_invoice_installer_view.xml | 1 + addons/knowledge/knowledge_installer.xml | 2 +- addons/lunch/lunch_installer_view.xml | 3 ++- addons/marketing/marketing_view.xml | 2 +- addons/outlook/outlook_installer.xml | 1 + addons/product/wizard/product_installer.xml | 2 +- addons/purchase/wizard/purchase_installer.xml | 1 + .../purchase_double_validation_installer.xml | 3 ++- addons/report_designer/report_designer_installer.xml | 3 ++- addons/sale/sale_view.xml | 2 +- addons/thunderbird/thunderbird_installer.xml | 1 + 26 files changed, 38 insertions(+), 22 deletions(-) diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml index 6ec78163d92..12814561d95 100644 --- a/addons/account/configurable_account_chart.xml +++ b/addons/account/configurable_account_chart.xml @@ -616,7 +616,6 @@ Generate Chart of Accounts from a Chart Template - open special diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml index 6a07ae8c9e7..0c90b8597c9 100644 --- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml +++ b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml @@ -13,7 +13,8 @@ 15 - normal_recurring + normal + skip diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml index a1fce67e4b1..c494f9c3168 100644 --- a/addons/account_sequence/account_sequence_installer_view.xml +++ b/addons/account_sequence/account_sequence_installer_view.xml @@ -51,6 +51,7 @@ 3 special + skip diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 3181ac32a78..bc155733595 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -50,7 +50,7 @@ id="config_install_module"> 3 - normal_recurring + special 3 skip + special diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml index 3299e49a6c1..dc472e8b3b9 100644 --- a/addons/base_report_designer/base_report_designer_installer.xml +++ b/addons/base_report_designer/base_report_designer_installer.xml @@ -57,7 +57,7 @@ 3 - normal_recurring + special diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index 65665af9a52..d5e9b94c8b6 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -112,6 +112,7 @@ normal + skip @@ -160,7 +161,7 @@ - normal_recurring + normal skip @@ -214,6 +215,7 @@ normal + skip diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index db6930b8259..7b7717a1fe1 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -77,7 +77,7 @@ 10 - normal_recurring + special @@ -92,7 +92,7 @@ 10 - normal_recurring + special diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml index bdbaf410499..21855b21ede 100644 --- a/addons/document/wizard/document_configuration_view.xml +++ b/addons/document/wizard/document_configuration_view.xml @@ -45,8 +45,7 @@ - - + special diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml index 5767e4ee74d..3fa239654be 100644 --- a/addons/document_ics/document_ics_config_wizard.xml +++ b/addons/document_ics/document_ics_config_wizard.xml @@ -56,6 +56,7 @@ special + skip diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml index 28c266dbc5e..f478a481cdf 100644 --- a/addons/fetchmail/fetchmail_installer_view.xml +++ b/addons/fetchmail/fetchmail_installer_view.xml @@ -13,7 +13,8 @@ 4 - normal_recurring + normal + skip \ No newline at end of file diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml index f68b13ed54e..60bf243300a 100644 --- a/addons/hr/hr_installer.xml +++ b/addons/hr/hr_installer.xml @@ -52,7 +52,7 @@ 3 - special + special @@ -67,7 +67,8 @@ 3 - normal_recurring + normal + skip diff --git a/addons/hr_evaluation/hr_evaluation_installer_view.xml b/addons/hr_evaluation/hr_evaluation_installer_view.xml index f7e8ecd45bd..5b2e149b8d2 100644 --- a/addons/hr_evaluation/hr_evaluation_installer_view.xml +++ b/addons/hr_evaluation/hr_evaluation_installer_view.xml @@ -13,7 +13,8 @@ 3 - normal_recurring + normal + skip diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml index 2cbdb5d9bf2..5db69bc0a98 100644 --- a/addons/hr_expense/hr_expense_installer_view.xml +++ b/addons/hr_expense/hr_expense_installer_view.xml @@ -14,7 +14,8 @@ 3 - normal_recurring + normal + skip diff --git a/addons/hr_recruitment/hr_recruitment_installer_view.xml b/addons/hr_recruitment/hr_recruitment_installer_view.xml index ca09ad8abe4..f3367c5de8f 100644 --- a/addons/hr_recruitment/hr_recruitment_installer_view.xml +++ b/addons/hr_recruitment/hr_recruitment_installer_view.xml @@ -13,7 +13,8 @@ 3 - normal_recurring + normal + skip diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml index f09344dec37..cd2bb285f03 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml @@ -41,6 +41,7 @@ 3 normal + skip diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml index a8c458a1fe1..1366a211e92 100644 --- a/addons/knowledge/knowledge_installer.xml +++ b/addons/knowledge/knowledge_installer.xml @@ -53,7 +53,7 @@ 3 - special + special diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml index d6bce31e80c..03f6492e732 100644 --- a/addons/lunch/lunch_installer_view.xml +++ b/addons/lunch/lunch_installer_view.xml @@ -13,7 +13,8 @@ 50 - normal_recurring + normal + skip diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index 4b6b282527e..7acc9806a63 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -58,7 +58,7 @@ 3 - normal_recurring + special diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml index 07df3a1cd0e..e4d120e9c37 100644 --- a/addons/outlook/outlook_installer.xml +++ b/addons/outlook/outlook_installer.xml @@ -61,6 +61,7 @@ normal + skip 4 diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml index 67c52780bae..7f3ed52a384 100644 --- a/addons/product/wizard/product_installer.xml +++ b/addons/product/wizard/product_installer.xml @@ -15,7 +15,7 @@ current - normal_recurring + normal 20 skip diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml index 93dadad007f..7c6864a8d5b 100644 --- a/addons/purchase/wizard/purchase_installer.xml +++ b/addons/purchase/wizard/purchase_installer.xml @@ -46,6 +46,7 @@ 3 + special diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml index b3eb4f84574..65a93a4a658 100644 --- a/addons/purchase_double_validation/purchase_double_validation_installer.xml +++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml @@ -44,7 +44,8 @@ - special + normal + skip diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml index d3416162ab8..fc720c8d466 100644 --- a/addons/report_designer/report_designer_installer.xml +++ b/addons/report_designer/report_designer_installer.xml @@ -45,7 +45,8 @@ - special + normal + skip 3 diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index c6917b1583a..2024bac8dda 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -574,7 +574,7 @@ - normal + special diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml index 3997b95f486..2b1fc095f5e 100644 --- a/addons/thunderbird/thunderbird_installer.xml +++ b/addons/thunderbird/thunderbird_installer.xml @@ -62,6 +62,7 @@ normal + skip 3