openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #04848
lp:~openerp-dev/openobject-addons/trunk-rework-addons-23-march-aag into lp:openobject-addons
Atik Agewan(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-rework-addons-23-march-aag into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-rework-addons-23-march-aag/+merge/55709
Optimization of Code
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-rework-addons-23-march-aag/+merge/55709
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-rework-addons-23-march-aag.
=== modified file 'account/account_installer.xml'
--- account/account_installer.xml 2011-02-10 06:50:57 +0000
+++ account/account_installer.xml 2011-03-31 09:11:54 +0000
@@ -101,13 +101,13 @@
<record id="account_configuration_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_configuration_installer"/>
<field name="sequence">3</field>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
<record id="account_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_installer"/>
<field name="sequence">5</field>
- <field name="restart">always</field>
+ <field name="restart">on_trigger</field>
<field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
</record>
=== modified file 'account/configurable_account_chart.xml'
--- account/configurable_account_chart.xml 2011-02-09 13:28:30 +0000
+++ account/configurable_account_chart.xml 2011-03-31 09:11:54 +0000
@@ -617,7 +617,7 @@
<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="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
=== modified file 'account_sequence/account_sequence_installer_view.xml'
--- account_sequence/account_sequence_installer_view.xml 2011-01-14 00:11:01 +0000
+++ account_sequence/account_sequence_installer_view.xml 2011-03-31 09:11:54 +0000
@@ -50,7 +50,7 @@
<record id="account_seq_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_seq_installer"/>
<field name="sequence">3</field>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'base_setup/base_setup_todo.xml'
--- base_setup/base_setup_todo.xml 2011-01-14 00:11:01 +0000
+++ base_setup/base_setup_todo.xml 2011-03-31 09:11:54 +0000
@@ -67,7 +67,7 @@
<record id="base_setup_company_todo" model="ir.actions.todo">
<field name="action_id" ref="action_base_setup_company"/>
<field name="sequence">1</field>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
</openerp>
=== modified file 'base_setup/installer.py'
--- base_setup/installer.py 2011-01-14 00:11:01 +0000
+++ base_setup/installer.py 2011-03-31 09:11:54 +0000
@@ -19,6 +19,7 @@
#
##############################################################################
from osv import fields, osv
+import pooler
class base_setup_installer(osv.osv_memory):
_name = 'base.setup.installer'
@@ -101,5 +102,50 @@
value.update({'progress':progress})
if progress < 10.:
progress = 10.
+
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 = {}
+ 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.state_update(cr, uid, [sect_mod_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 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()
=== modified file 'crm/crm_installer_view.xml'
--- crm/crm_installer_view.xml 2011-01-14 00:11:01 +0000
+++ crm/crm_installer_view.xml 2011-03-31 09:11:54 +0000
@@ -61,7 +61,7 @@
<record id="crm_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_crm_installer"/>
<field name="sequence">3</field>
- <field name="restart">always</field>
+ <field name="restart">on_trigger</field>
<field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
</record>
</data>
=== modified file 'document/wizard/document_configuration_view.xml'
--- document/wizard/document_configuration_view.xml 2011-01-14 09:34:28 +0000
+++ document/wizard/document_configuration_view.xml 2011-03-31 09:11:54 +0000
@@ -46,7 +46,7 @@
<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="restart" eval="'onskip'" />
+ <field name="restart" eval="'on_trigger'" />
</record>
</data>
</openerp>
=== modified file 'hr/hr_installer.xml'
--- hr/hr_installer.xml 2011-01-14 00:11:01 +0000
+++ hr/hr_installer.xml 2011-03-31 09:11:54 +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="restart">always</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'knowledge/knowledge_installer.xml'
--- knowledge/knowledge_installer.xml 2011-01-14 00:11:01 +0000
+++ knowledge/knowledge_installer.xml 2011-03-31 09:11:54 +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="restart">always</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'l10n_be/l10n_be_wizard.xml'
--- l10n_be/l10n_be_wizard.xml 2011-01-14 00:11:01 +0000
+++ l10n_be/l10n_be_wizard.xml 2011-03-31 09:11:54 +0000
@@ -4,7 +4,7 @@
<record id="config_call_account_template" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'l10n_br/data/l10n_br_account_chart_template.xml'
--- l10n_br/data/l10n_br_account_chart_template.xml 2011-01-14 00:11:01 +0000
+++ l10n_br/data/l10n_br_account_chart_template.xml 2011-03-31 09:11:54 +0000
@@ -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.</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="state">open</field>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'l10n_cr/l10n_wizard.xml'
--- l10n_cr/l10n_wizard.xml 2011-01-14 00:11:01 +0000
+++ l10n_cr/l10n_wizard.xml 2011-03-31 09:11:54 +0000
@@ -4,7 +4,7 @@
<record id="config_call_account_template" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'l10n_es/l10n_es_wizard.xml'
--- l10n_es/l10n_es_wizard.xml 2011-01-14 00:11:01 +0000
+++ l10n_es/l10n_es_wizard.xml 2011-03-31 09:11:54 +0000
@@ -4,7 +4,7 @@
<record id="config_call_account_template" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'l10n_fr/l10n_fr_wizard.xml'
--- l10n_fr/l10n_fr_wizard.xml 2011-01-14 00:11:01 +0000
+++ l10n_fr/l10n_fr_wizard.xml 2011-03-31 09:11:54 +0000
@@ -4,7 +4,7 @@
<record id="config_call_account_template_fr" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'l10n_lu/l10n_lu_wizard.xml'
--- l10n_lu/l10n_lu_wizard.xml 2011-01-14 00:11:01 +0000
+++ l10n_lu/l10n_lu_wizard.xml 2011-03-31 09:11:54 +0000
@@ -4,7 +4,7 @@
<record id="config_call_account_template_lu" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'l10n_ma/l10n_ma_wizard.xml'
--- l10n_ma/l10n_ma_wizard.xml 2011-01-14 00:11:01 +0000
+++ l10n_ma/l10n_ma_wizard.xml 2011-03-31 09:11:54 +0000
@@ -4,7 +4,7 @@
<record id="config_call_account_template_ma" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'l10n_uk/l10n_uk_wizard.xml'
--- l10n_uk/l10n_uk_wizard.xml 2011-01-14 00:11:01 +0000
+++ l10n_uk/l10n_uk_wizard.xml 2011-03-31 09:11:54 +0000
@@ -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.</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="state">open</field>
- <field name="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'mrp/mrp_installer.xml'
--- mrp/mrp_installer.xml 2011-01-14 00:11:01 +0000
+++ mrp/mrp_installer.xml 2011-03-31 09:11:54 +0000
@@ -48,7 +48,7 @@
<record id="mrp_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_mrp_installer"/>
<field name="sequence">3</field>
- <field name="restart">always</field>
+ <field name="restart">on_trigger</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
</record>
=== modified file 'profile_tools/misc_tools_installer.xml'
--- profile_tools/misc_tools_installer.xml 2011-01-14 00:11:01 +0000
+++ profile_tools/misc_tools_installer.xml 2011-03-31 09:11:54 +0000
@@ -48,7 +48,7 @@
<record id="misc_tools_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_misc_tools_installer"/>
- <field name="restart">always</field>
+ <field name="restart">on_trigger</field>
<field name="sequence">3</field>
</record>
</data>
=== modified file 'project/project_installer.xml'
--- project/project_installer.xml 2011-01-14 00:11:01 +0000
+++ project/project_installer.xml 2011-03-31 09:11:54 +0000
@@ -50,7 +50,7 @@
<record id="project_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_project_installer"/>
- <field name="restart">always</field>
+ <field name="restart">on_trigger</field>
<field name="sequence">3</field>
</record>
=== modified file 'purchase_double_validation/purchase_double_validation_installer.xml'
--- purchase_double_validation/purchase_double_validation_installer.xml 2010-12-30 17:23:02 +0000
+++ purchase_double_validation/purchase_double_validation_installer.xml 2011-03-31 09:11:54 +0000
@@ -44,7 +44,7 @@
<!-- 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="restart">onskip</field>
+ <field name="restart">on_trigger</field>
</record>
</data>
=== modified file 'report_designer/report_designer_installer.xml'
--- report_designer/report_designer_installer.xml 2011-01-14 00:11:01 +0000
+++ report_designer/report_designer_installer.xml 2011-03-31 09:11:54 +0000
@@ -45,7 +45,7 @@
<record id="report_designer_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_report_designer_installer"/>
- <field name="restart">always</field>
+ <field name="restart">on_trigger</field>
<field name="sequence">3</field>
</record>
</data>
=== modified file 'sale/sale_installer.xml'
--- sale/sale_installer.xml 2011-01-14 00:11:01 +0000
+++ sale/sale_installer.xml 2011-03-31 09:11:54 +0000
@@ -47,7 +47,7 @@
<record id="sale_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_sale_installer"/>
- <field name="restart">always</field>
+ <field name="restart">on_trigger</field>
<field name="sequence">3</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
</record>
Follow ups
