From a759f6e7387391e19dfab504aedb0ab4f6f3082e Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Wed, 29 Feb 2012 17:51:36 +0530 Subject: [PATCH] [FIX]: Fixed problem of global variable. Removed unnecessary file. bzr revid: uco@tinyerp.com-20120229122136-f8iqsyvpe07ls1k9 --- addons/account_chart/res_config.py | 8 -------- addons/sale/res_config.py | 12 ++++++------ 2 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 addons/account_chart/res_config.py diff --git a/addons/account_chart/res_config.py b/addons/account_chart/res_config.py deleted file mode 100644 index 5bd2b98ca66..00000000000 --- a/addons/account_chart/res_config.py +++ /dev/null @@ -1,8 +0,0 @@ -class account_configuration(osv.osv_memory): - _inherit = 'res.config' - - _columns = { - 'tax_value' : fields.many2one('account.tax', 'Value'), - } - -account_configuration() \ No newline at end of file diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 6ab0203e55a..29f2c432c5e 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -143,17 +143,17 @@ class sale_configuration(osv.osv_memory): def execute(self, cr, uid, ids, vals, context=None): #TODO: TO BE IMPLEMENTED for method in dir(self): - if method.startswith('_set'): + if method.startswith('set_'): + vals['modules'] = MODULE_LIST getattr(self, method)(cr, uid, ids, vals, context) return True - def _set_modules(self, cr, uid, ids, vals, context=None): + def set_modules(self, cr, uid, ids, vals, context=None): module_obj = self.pool.get('ir.module.module') + MODULE_LIST = vals.get('modules') for k, v in vals.items(): if k == 'task_work': MODULE_LIST += ['project_timesheet','project_mrp'] - if k == 'timesheet': - MODULE_LIST += ['account_analytic_analysis'] if k in MODULE_LIST: installed = self.get_default_installed_modules(cr, uid, [k], context) if v == True and not installed.get(k): @@ -164,7 +164,7 @@ class sale_configuration(osv.osv_memory): module_obj.button_uninstall(self, cr, uid, [module_id], context=None) module_obj.button_upgrade(self, cr, uid, [module_id], context=None) - def _set_sale_defaults(self, cr, uid, ids, vals, context=None): + def set_sale_defaults(self, cr, uid, ids, vals, context=None): ir_values_obj = self.pool.get('ir.values') data_obj = self.pool.get('ir.model.data') menu_obj = self.pool.get('ir.ui.menu') @@ -198,7 +198,7 @@ class sale_configuration(osv.osv_memory): return res - def _set_groups(self, cr, uid, ids, vals, context=None): + def set_groups(self, cr, uid, ids, vals, context=None): data_obj = self.pool.get('ir.model.data') users_obj = self.pool.get('res.users') groups_obj = self.pool.get('res.groups')