openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06048
lp:~openerp-dev/openobject-addons/trunk-configuration-reworknew-changesrpa into lp:~openerp-dev/openobject-addons/trunk-configuration-rework
Rucha (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-configuration-reworknew-changesrpa into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
Requested reviews:
qdp (OpenERP) (qdp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-reworknew-changesrpa/+merge/59222
Reviewed config wizards of all modules and changed type + state in order to follow the behaviour described qdp
Improved code
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-reworknew-changesrpa/+merge/59222
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
=== modified file 'account/configurable_account_chart.xml'
--- account/configurable_account_chart.xml 2011-04-08 12:28:11 +0000
+++ account/configurable_account_chart.xml 2011-04-27 13:41:05 +0000
@@ -616,7 +616,6 @@
<record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
- <field name="state">open</field>
<field name="type">special</field>
</record>
=== modified file 'account_analytic_plans/account_analytic_plans_installer_view.xml'
--- account_analytic_plans/account_analytic_plans_installer_view.xml 2011-04-11 13:17:19 +0000
+++ account_analytic_plans/account_analytic_plans_installer_view.xml 2011-04-27 13:41:05 +0000
@@ -13,7 +13,8 @@
<record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="account_analytic_plan_form_action_installer"/>
<field name="sequence">15</field>
- <field name="type">normal_recurring</field>
+ <field name="type">normal</field>
+ <field name="state">skip</field>
</record>
</data>
=== modified file 'account_sequence/account_sequence_installer_view.xml'
--- account_sequence/account_sequence_installer_view.xml 2011-04-08 12:28:11 +0000
+++ account_sequence/account_sequence_installer_view.xml 2011-04-27 13:41:05 +0000
@@ -51,6 +51,7 @@
<field name="action_id" ref="action_account_seq_installer"/>
<field name="sequence">3</field>
<field name="type">special</field>
+ <field name="state">skip</field>
</record>
</data>
=== modified file 'association/profile_association.xml'
--- association/profile_association.xml 2011-04-08 12:28:11 +0000
+++ association/profile_association.xml 2011-04-27 13:41:05 +0000
@@ -50,7 +50,7 @@
id="config_install_module">
<field name="action_id" ref="action_config_install_module"/>
<field name="sequence">3</field>
- <field name="type">normal_recurring</field>
+ <field name="type">special</field>
</record>
<menuitem
=== modified file 'base_contact/base_contact_installer_view.xml'
--- base_contact/base_contact_installer_view.xml 2011-01-14 00:11:01 +0000
+++ base_contact/base_contact_installer_view.xml 2011-04-27 13:41:05 +0000
@@ -53,6 +53,7 @@
<field name="action_id" ref="action_base_contact_installer"/>
<field name="sequence">3</field>
<field name="state">skip</field>
+ <field name="type">special</field>
</record>
</data>
=== modified file 'base_report_designer/base_report_designer_installer.xml'
--- base_report_designer/base_report_designer_installer.xml 2011-04-08 12:28:11 +0000
+++ base_report_designer/base_report_designer_installer.xml 2011-04-27 13:41:05 +0000
@@ -57,7 +57,7 @@
<record id="report_designer_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_report_designer_installer"/>
<field name="sequence">3</field>
- <field name="type">normal_recurring</field>
+ <field name="type">special</field>
</record>
<record id="action_report_designer_wizard" model="ir.actions.act_window">
=== modified file 'base_setup/base_setup_installer.xml'
--- base_setup/base_setup_installer.xml 2011-04-13 10:50:56 +0000
+++ base_setup/base_setup_installer.xml 2011-04-27 13:41:05 +0000
@@ -112,6 +112,7 @@
<record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
<field name="action_id" ref="action_migrade_application_installer_modules"/>
<field name="type">normal</field>
+ <field name="state">skip</field>
</record>
<!-- Import or create customers configartion view -->
@@ -160,7 +161,7 @@
<!-- register configuration wizard -->
<record id="config_wizard_res_product_installer" model="ir.actions.todo">
<field name="action_id" ref="action_import_create_installer"/>
- <field name="type">normal_recurring</field>
+ <field name="type">normal</field>
<field name="state">skip</field>
</record>
@@ -214,6 +215,7 @@
<record id="config_action_user_preferences_config_form" model="ir.actions.todo">
<field name="action_id" ref="action_user_preferences_config_form"/>
<field name="type">normal</field>
+ <field name="state">skip</field>
</record>
<!-- Config Wiz Give access to others users -->
=== modified file 'base_setup/installer.py'
--- base_setup/installer.py 2011-04-14 11:30:49 +0000
+++ base_setup/installer.py 2011-04-27 13:41:05 +0000
@@ -120,35 +120,27 @@
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 like '%"+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()
=== modified file 'crm/crm_installer_view.xml'
--- crm/crm_installer_view.xml 2011-04-14 11:30:49 +0000
+++ crm/crm_installer_view.xml 2011-04-27 13:41:05 +0000
@@ -77,7 +77,7 @@
<record id="crm_case_section_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="crm_case_section_view_form_installer"/>
<field name="sequence">10</field>
- <field name="type">normal_recurring</field>
+ <field name="type">special</field>
</record>
<record model="ir.actions.act_window" id="crm_case_stage_form_installer">
@@ -92,7 +92,7 @@
<record id="crm_case_stage_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="crm_case_stage_form_installer"/>
<field name="sequence">10</field>
- <field name="type">normal_recurring</field>
+ <field name="type">special</field>
</record>
</data>
=== modified file 'document/wizard/document_configuration_view.xml'
--- document/wizard/document_configuration_view.xml 2011-04-08 12:28:11 +0000
+++ document/wizard/document_configuration_view.xml 2011-04-27 13:41:05 +0000
@@ -45,8 +45,7 @@
<record model="ir.actions.todo" id="config_auto_directory">
<field name="action_id" ref="action_config_auto_directory"/>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
- <field name="state" eval="'skip'" />
- <field name="type" eval="'special'" />
+ <field name="type">special</field>
</record>
</data>
</openerp>
=== modified file 'document_ics/document_ics_config_wizard.xml'
--- document_ics/document_ics_config_wizard.xml 2011-04-08 12:28:11 +0000
+++ document_ics/document_ics_config_wizard.xml 2011-04-27 13:41:05 +0000
@@ -56,6 +56,7 @@
<record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
<field name="action_id" ref="action_view_document_ics_config_directories"/>
<field name="type">special</field>
+ <field name="state">skip</field>
</record>
</data>
</openerp>
=== modified file 'fetchmail/fetchmail_installer_view.xml'
--- fetchmail/fetchmail_installer_view.xml 2011-04-11 13:17:19 +0000
+++ fetchmail/fetchmail_installer_view.xml 2011-04-27 13:41:05 +0000
@@ -13,7 +13,8 @@
<record id="view_email_server_form_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="view_email_server_form_installer"/>
<field name="sequence">4</field>
- <field name="type">normal_recurring</field>
+ <field name="type">normal</field>
+ <field name="state">skip</field>
</record>
</data>
</openerp>
\ No newline at end of file
=== modified file 'hr/hr_installer.xml'
--- hr/hr_installer.xml 2011-04-14 11:30:49 +0000
+++ hr/hr_installer.xml 2011-04-27 13:41:05 +0000
@@ -52,7 +52,7 @@
<record id="hr_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_hr_installer"/>
<field name="sequence">3</field>
- <field name="type">special</field>
+ <field name="type">special</field>
</record>
<record model="ir.actions.act_window" id="view_employee_form_installer">
@@ -67,7 +67,8 @@
<record id="view_employee_form_todo" model="ir.actions.todo">
<field name="action_id" ref="view_employee_form_installer"/>
<field name="sequence">3</field>
- <field name="type">normal_recurring</field>
+ <field name="type">normal</field>
+ <field name="state">skip</field>
</record>
=== modified file 'hr_evaluation/hr_evaluation_installer_view.xml'
--- hr_evaluation/hr_evaluation_installer_view.xml 2011-04-11 13:17:19 +0000
+++ hr_evaluation/hr_evaluation_installer_view.xml 2011-04-27 13:41:05 +0000
@@ -13,7 +13,8 @@
<record id="view_department_form_todo" model="ir.actions.todo">
<field name="action_id" ref="view_department_form_installer"/>
<field name="sequence">3</field>
- <field name="type">normal_recurring</field>
+ <field name="type">normal</field>
+ <field name="state">skip</field>
</record>
</data>
</openerp>
=== modified file 'hr_expense/hr_expense_installer_view.xml'
--- hr_expense/hr_expense_installer_view.xml 2011-04-14 12:25:30 +0000
+++ hr_expense/hr_expense_installer_view.xml 2011-04-27 13:41:05 +0000
@@ -14,7 +14,8 @@
<record id="product_normal_form_view_todo" model="ir.actions.todo">
<field name="action_id" ref="product_normal_form_view_installer"/>
<field name="sequence">3</field>
- <field name="type">normal_recurring</field>
+ <field name="type">normal</field>
+ <field name="state">skip</field>
</record>
</data>
</openerp>
=== modified file 'hr_recruitment/hr_recruitment_installer_view.xml'
--- hr_recruitment/hr_recruitment_installer_view.xml 2011-04-11 13:17:19 +0000
+++ hr_recruitment/hr_recruitment_installer_view.xml 2011-04-27 13:41:05 +0000
@@ -13,7 +13,8 @@
<record id="hr_recruitment_stage_form_todo" model="ir.actions.todo">
<field name="action_id" ref="hr_recruitment_stage_form_installer"/>
<field name="sequence">3</field>
- <field name="type">normal_recurring</field>
+ <field name="type">normal</field>
+ <field name="state">skip</field>
</record>
</data>
</openerp>
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml 2011-04-11 13:17:19 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml 2011-04-27 13:41:05 +0000
@@ -41,6 +41,7 @@
<field name="action_id" ref="action_hr_timesheet_invoice_wizard"/>
<field name="sequence">3</field>
<field name="type">normal</field>
+ <field name="state">skip</field>
</record>
</data>
=== modified file 'knowledge/knowledge_installer.xml'
--- knowledge/knowledge_installer.xml 2011-04-08 12:28:11 +0000
+++ knowledge/knowledge_installer.xml 2011-04-27 13:41:05 +0000
@@ -53,7 +53,7 @@
<field name="action_id" ref="action_knowledge_installer"/>
<field name="sequence">3</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
- <field name="type">special</field>
+ <field name="type">special</field>
</record>
</data>
=== modified file 'lunch/lunch_installer_view.xml'
--- lunch/lunch_installer_view.xml 2011-04-11 13:17:19 +0000
+++ lunch/lunch_installer_view.xml 2011-04-27 13:41:05 +0000
@@ -13,7 +13,8 @@
<record id="view_lunch_product_form_todo" model="ir.actions.todo">
<field name="action_id" ref="view_lunch_product_form_installer"/>
<field name="sequence">50</field>
- <field name="type">normal_recurring</field>
+ <field name="type">normal</field>
+ <field name="state">skip</field>
</record>
</data>
</openerp>
=== modified file 'marketing/marketing_view.xml'
--- marketing/marketing_view.xml 2011-04-08 12:28:11 +0000
+++ marketing/marketing_view.xml 2011-04-27 13:41:05 +0000
@@ -58,7 +58,7 @@
<record id="marketing_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_marketing_installer"/>
<field name="sequence">3</field>
- <field name="type">normal_recurring</field>
+ <field name="type">special</field>
</record>
</data>
=== modified file 'outlook/outlook_installer.xml'
--- outlook/outlook_installer.xml 2011-04-13 13:34:41 +0000
+++ outlook/outlook_installer.xml 2011-04-27 13:41:05 +0000
@@ -61,6 +61,7 @@
<record id="outlook_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_outlook_installer"/>
<field name="type">normal</field>
+ <field name="state">skip</field>
<field name="sequence">4</field>
</record>
=== modified file 'product/wizard/product_installer.xml'
--- product/wizard/product_installer.xml 2011-04-13 05:21:13 +0000
+++ product/wizard/product_installer.xml 2011-04-27 13:41:05 +0000
@@ -15,7 +15,7 @@
<record id="config_wizard_res_product_installer" model="ir.actions.todo">
<field name="action_id" ref="product_form_config_action"/>
<field name="target">current</field>
- <field name="type">normal_recurring</field>
+ <field name="type">normal</field>
<field name="sequence">20</field>
<field name="state">skip</field>
</record>
=== modified file 'purchase/wizard/purchase_installer.xml'
--- purchase/wizard/purchase_installer.xml 2011-01-14 00:11:01 +0000
+++ purchase/wizard/purchase_installer.xml 2011-04-27 13:41:05 +0000
@@ -46,6 +46,7 @@
<record id="purchase_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_purchase_install_module"/>
<field name="sequence">3</field>
+ <field name="type">special</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
</record>
</data>
=== modified file 'purchase_double_validation/purchase_double_validation_installer.xml'
--- purchase_double_validation/purchase_double_validation_installer.xml 2011-04-08 12:28:11 +0000
+++ purchase_double_validation/purchase_double_validation_installer.xml 2011-04-27 13:41:05 +0000
@@ -44,7 +44,8 @@
<!-- register configuration wizard -->
<record id="config_wizard_step_purchase_limit_amount" model="ir.actions.todo">
<field name="action_id" ref="action_config_purchase_limit_amount"/>
- <field name="type">special</field>
+ <field name="type">normal</field>
+ <field name="state">skip</field>
</record>
</data>
=== modified file 'report_designer/report_designer_installer.xml'
--- report_designer/report_designer_installer.xml 2011-04-08 12:28:11 +0000
+++ report_designer/report_designer_installer.xml 2011-04-27 13:41:05 +0000
@@ -45,7 +45,8 @@
<record id="report_designer_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_report_designer_installer"/>
- <field name="type">special</field>
+ <field name="type">normal</field>
+ <field name="state">skip</field>
<field name="sequence">3</field>
</record>
</data>
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2011-04-26 06:41:48 +0000
+++ sale/sale_view.xml 2011-04-27 13:41:05 +0000
@@ -574,7 +574,7 @@
<!-- register configuration wizard -->
<record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
<field name="action_id" ref="action_config_picking_policy"/>
- <field name="type">normal</field>
+ <field name="type">special</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
</record>
=== modified file 'thunderbird/thunderbird_installer.xml'
--- thunderbird/thunderbird_installer.xml 2011-04-14 11:30:49 +0000
+++ thunderbird/thunderbird_installer.xml 2011-04-27 13:41:05 +0000
@@ -62,6 +62,7 @@
<record id="thunderbird_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_thunderbird_installer"/>
<field name="type">normal</field>
+ <field name="state">skip</field>
<field name="sequence">3</field>
</record>
Follow ups
