diff --git a/addons/profile_accounting/profile_accounting.py b/addons/profile_accounting/profile_accounting.py index b067beea049..b8c3cf7b0fe 100644 --- a/addons/profile_accounting/profile_accounting.py +++ b/addons/profile_accounting/profile_accounting.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -24,10 +24,9 @@ import pooler class profile_accounting_config_install_modules_wizard(osv.osv_memory): _name='profile.accounting.config.install_modules_wizard' - _inherit = 'res.config' + _inherit = 'res.config.installer' _columns = { - 'name':fields.char('Name', size=64), 'account_analytic_analysis':fields.boolean('Analytic Accounting'), 'account_analytic_plans':fields.boolean('Multiple Analytic Plans'), 'account_payment':fields.boolean('Suppliers Payment Management'), @@ -36,18 +35,6 @@ class profile_accounting_config_install_modules_wizard(osv.osv_memory): 'account_budget':fields.boolean('Budgets', help="Helps you to manage financial and analytic budgets."), 'board_document':fields.boolean('Document Management',help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."), } - - def execute(self, cr, uid, ids, context=None): - result = self.read(cr, uid, ids) - mod_obj = self.pool.get('ir.module.module') - for res in result: - for r in res: - if r != 'id' and res[r]: - ids += mod_obj.search(cr, uid, [('name', '=', r)]) - mod_obj.button_install(cr, uid, ids, context=context) - cr.commit() - db, pool = pooler.restart_pool(cr.dbname, update_module=True) profile_accounting_config_install_modules_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml index 74ec101d231..6423901941d 100644 --- a/addons/profile_accounting/profile_accounting.xml +++ b/addons/profile_accounting/profile_accounting.xml @@ -5,15 +5,19 @@ Accounting Profile : Install extra modules profile.accounting.config.install_modules_wizard form - +
Install Extra Modules
- -
diff --git a/addons/profile_association/profile_association.py b/addons/profile_association/profile_association.py index 013052222e7..586ed3f8639 100644 --- a/addons/profile_association/profile_association.py +++ b/addons/profile_association/profile_association.py @@ -25,7 +25,7 @@ import pooler class profile_association_config_install_modules_wizard(osv.osv_memory): _name='profile.association.config.install_modules_wizard' - _inherit = 'res.config' + _inherit = 'res.config.installer' _columns = { 'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."), @@ -38,15 +38,5 @@ class profile_association_config_install_modules_wizard(osv.osv_memory): 'wiki': fields.boolean('Wiki', help="An integrated wiki content management system. This is really usefull to manage FAQ, quality manuals, etc.") } - def execute(self, cr, uid, ids, context=None): - result = self.read(cr,uid,ids) - mod_obj = self.pool.get('ir.module.module') - for res in result: - for r in res: - if r != 'id' and res[r]: - ids = mod_obj.search(cr, uid, [('name', '=', r)]) - mod_obj.button_install(cr, uid, ids, context=context) - cr.commit() - db, pool = pooler.restart_pool(cr.dbname, update_module=True) profile_association_config_install_modules_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/profile_association/profile_association.xml b/addons/profile_association/profile_association.xml index 573e6d25450..0f376ea4069 100644 --- a/addons/profile_association/profile_association.xml +++ b/addons/profile_association/profile_association.xml @@ -5,14 +5,18 @@ Association Profile : Install extra modules profile.association.config.install_modules_wizard form - +
Install Extra Modules
- -
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py index 11276af8c96..40bace350a7 100644 --- a/addons/profile_manufacturing/profile_manufacturing.py +++ b/addons/profile_manufacturing/profile_manufacturing.py @@ -25,7 +25,7 @@ import pooler class profile_manufacturing_config_install_modules_wizard(osv.osv_memory): _name='profile.manufacturing.config.install_modules_wizard' - _inherit = 'res.config' + _inherit = 'res.config.installer' _columns = { 'mrp_jit':fields.boolean('Just in Time Scheduling', @@ -78,16 +78,6 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory): help="Allows to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."), } - def execute(self, cr, uid, ids, context=None): - result = self.read(cr,uid,ids) - mod_obj = self.pool.get('ir.module.module') - for res in result: - for r in res: - if r != 'id' and res[r]: - ids = mod_obj.search(cr, uid, [('name', '=', r)]) - mod_obj.button_install(cr, uid, ids, context=context) - cr.commit() - db, pool = pooler.restart_pool(cr.dbname, update_module=True) profile_manufacturing_config_install_modules_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml index 1f944de7fa8..ae659245907 100644 --- a/addons/profile_manufacturing/profile_manufacturing.xml +++ b/addons/profile_manufacturing/profile_manufacturing.xml @@ -5,14 +5,20 @@ Manufacturing Profile: Install Extra Modules profile.manufacturing.config.install_modules_wizard form - +
Manufacturing Profile: Install Extra Modules
- -
@@ -44,7 +49,8 @@ - - + + 3 + diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py index 5aee039bc09..f228656a220 100644 --- a/addons/profile_service/profile_service.py +++ b/addons/profile_service/profile_service.py @@ -24,7 +24,7 @@ import pooler class profile_service_config_install_modules_wizard(osv.osv_memory): _name='profile.service.config.install_modules_wizard' - _inherit = 'res.config' + _inherit = 'res.config.installer' _rec_name = 'crm_configuration' _columns = { 'crm_configuration':fields.boolean('CRM & Calendars', help="This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."), @@ -47,16 +47,6 @@ class profile_service_config_install_modules_wizard(osv.osv_memory): help="An integrated wiki content management system. This is really "\ "useful to manage FAQ, quality manuals, etc.") } - def execute(self, cr, uid, ids, context=None): - result = self.read(cr, uid, ids) - mod_obj = self.pool.get('ir.module.module') - for res in result: - for r in res: - if r != 'id' and res[r]: - ids = mod_obj.search(cr, uid, [('name', '=', r)]) - mod_obj.button_install(cr, uid, ids, context=context) - cr.commit() - db, pool = pooler.restart_pool(cr.dbname, update_module=True) profile_service_config_install_modules_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml index 5521cafa9b6..b8c51325cb3 100644 --- a/addons/profile_service/profile_service.xml +++ b/addons/profile_service/profile_service.xml @@ -5,16 +5,21 @@ Service Profile : Install extra modules profile.service.config.install_modules_wizard form - +
- Install Extra Modules + Install Extra Service Profile Modules
- -