From 05477792a40a0e51382a5ebe81ed893aa40bddb0 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Mon, 5 Mar 2012 10:41:33 +0530 Subject: [PATCH] [IMP]: Improved code to use new object res.config.settings for application settings. bzr revid: uco@tinyerp.com-20120305051133-rj71925yxncp432a --- addons/account/res_config.py | 6 ++++-- .../account_analytic_analysis_view.xml | 2 +- addons/crm/res_config.py | 17 +---------------- addons/crm/res_config_view.xml | 4 ++-- addons/mail/res_config.py | 2 +- addons/mail/res_config_view.xml | 6 +++--- addons/plugin_outlook/plugin_outlook.xml | 2 +- .../plugin_thunderbird/plugin_thunderbird.xml | 2 +- addons/product/res_config.py | 2 +- addons/sale/res_config.py | 17 +---------------- addons/sale/res_config_view.xml | 4 ++-- addons/sale/test/manual_order_policy.yml | 4 ++-- 12 files changed, 20 insertions(+), 48 deletions(-) diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 484bd7f520a..9c0ac9af167 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -23,7 +23,7 @@ from osv import fields, osv from tools.translate import _ class account_configuration(osv.osv_memory): - _inherit = 'res.config' + _inherit = 'res.config.settings' _columns = { 'tax_policy': fields.selection([ @@ -108,4 +108,6 @@ class account_configuration(osv.osv_memory): users_obj.write(cr, uid, [uid], {'groups_id': [(3,group_id)]}) ir_values_obj.set(cr, uid, 'default', False, 'groups_id', ['res.users'], [(3,group_id)]) -account_configuration() \ No newline at end of file +account_configuration() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 347c6c0c0c9..3a4a58285d0 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -113,7 +113,7 @@ Sales Application - res.config + res.config.settings form diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py index ea376bb4edd..aaaa96a4bb1 100644 --- a/addons/crm/res_config.py +++ b/addons/crm/res_config.py @@ -22,7 +22,7 @@ from osv import fields, osv class crm_configuration(osv.osv_memory): - _inherit = 'res.config' + _inherit = 'res.config.settings' _columns = { 'module_crm_caldav' : fields.boolean("Caldav Synchronization", @@ -72,21 +72,6 @@ class crm_configuration(osv.osv_memory): 'type': 'pop', } - def create(self, cr, uid, vals, context=None): - ids = super(crm_configuration, self).create(cr, uid, vals, context=context) - self.execute(cr, uid, [ids], vals, context) - return ids - - def write(self, cr, uid, ids, vals, context=None): - self.execute(cr, uid, ids, vals, context) - return super(crm_configuration, self).write(cr, uid, ids, vals, context=context) - - def execute(self, cr, uid, ids, vals, context=None): - for method in dir(self): - if method.startswith('set_'): - getattr(self, method)(cr, uid, ids, vals, context) - return True - def get_default_email_configurations(self, cr, uid, ids, context=None): ir_values_obj = self.pool.get('ir.values') fetchmail_obj = self.pool.get('fetchmail.server') diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml index aeb1e9a5892..b5231b9cbcc 100644 --- a/addons/crm/res_config_view.xml +++ b/addons/crm/res_config_view.xml @@ -3,9 +3,9 @@ Sales Application - res.config + res.config.settings form - + diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py index 0be109d8f1b..aa6b345fc8a 100644 --- a/addons/mail/res_config.py +++ b/addons/mail/res_config.py @@ -22,7 +22,7 @@ from osv import fields, osv class plugin_configuration(osv.osv_memory): - _inherit = 'res.config' + _inherit = 'res.config.settings' _columns = { 'module_plugin_thunderbird': fields.boolean('Thunderbird plugin', diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml index bee56b4509b..78a5d7c5e59 100644 --- a/addons/mail/res_config_view.xml +++ b/addons/mail/res_config_view.xml @@ -3,9 +3,9 @@ Sales Application - res.config + res.config.settings form - + @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml index ef1797b19b2..5effe8324ac 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -51,7 +51,7 @@ Sales Application - res.config + res.config.settings form diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index b83eb50417a..6ccfdf70af0 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -58,7 +58,7 @@ Sales Application - res.config + res.config.settings form diff --git a/addons/product/res_config.py b/addons/product/res_config.py index 654d31d9d8c..efd6960174e 100644 --- a/addons/product/res_config.py +++ b/addons/product/res_config.py @@ -22,7 +22,7 @@ from osv import fields, osv class product_groups_configuration(osv.osv_memory): - _inherit = 'res.config' + _inherit = 'res.config.settings' _columns = { 'group_sale_pricelist_per_customer':fields.boolean("Pricelist per customer", diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 050495c3e70..3e74b735bcc 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -24,7 +24,7 @@ import pooler from tools.translate import _ class sale_configuration(osv.osv_memory): - _inherit = 'res.config' + _inherit = 'res.config.settings' _columns = { 'sale_orders': fields.boolean('Based on Sales Orders', @@ -110,21 +110,6 @@ class sale_configuration(osv.osv_memory): 'time_unit': lambda self, cr, uid, c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c) and self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c)[0] or False, } - def create(self, cr, uid, vals, context=None): - ids = super(sale_configuration, self).create(cr, uid, vals, context=context) - self.execute(cr, uid, [ids], vals, context) - return ids - - def write(self, cr, uid, ids, vals, context=None): - self.execute(cr, uid, ids, vals, context) - return super(sale_configuration, self).write(cr, uid, ids, vals, context=context) - - def execute(self, cr, uid, ids, vals, context=None): - for method in dir(self): - if method.startswith('set_'): - getattr(self, method)(cr, uid, ids, vals, context) - return True - def set_installed_modules(self, cr, uid, ids, vals, context=None): if vals.get('task_work'): vals.update({'module_project_timesheet': True, 'module_project_mrp': True}) diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index 04cf914feca..5fd5d340730 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -3,9 +3,9 @@ Sales Application - res.config + res.config.settings form - + diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml index de93b76795b..e88896ec339 100644 --- a/addons/sale/test/manual_order_policy.yml +++ b/addons/sale/test/manual_order_policy.yml @@ -82,8 +82,8 @@ - I set order policy "Deliver & invoice on demand" as default policy. - - !record {model: res.config, id: sale_configuration_0}: + !record {model: res.config.settings, id: sale_configuration_0}: order_policy: 'manual' - - !python {model: res.config}: | + !python {model: res.config.settings}: | self.execute(cr, uid, [ref("sale_configuration_0")], {})