From 0e526bd3299c105d54e2117d3aaaaa1b07e5752e Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 20 Mar 2012 14:50:02 +0100 Subject: [PATCH] [FIX] sale config: use model sale.config.settings instead of res.config.settings bzr revid: rco@openerp.com-20120320135002-0gsazmlgock4gmnl --- addons/base_setup/base_setup_views.xml | 8 ++++---- addons/crm/res_config.py | 6 ++---- addons/crm/res_config_view.xml | 4 ++-- addons/delivery/test/delivery_cost.yml | 2 +- addons/mail/res_config.py | 4 +--- addons/mail/res_config_view.xml | 4 ++-- addons/plugin_outlook/plugin_outlook.xml | 2 +- addons/plugin_thunderbird/plugin_thunderbird.xml | 2 +- addons/product/res_config.py | 6 ++---- addons/sale/res_config.py | 6 ++---- addons/sale/res_config_view.xml | 4 ++-- addons/sale/test/manual_order_policy.yml | 4 ++-- 12 files changed, 22 insertions(+), 30 deletions(-) diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index 63bf79b37d7..fe3b73193b0 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -142,7 +142,7 @@ 1 - + sale.config.settings sale.config.settings form @@ -151,8 +151,8 @@ - - + + @@ -162,7 +162,7 @@ Configure Sales & CRM ir.actions.act_window sale.config.settings - + form form diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py index 715c27c4597..cccaa0846e1 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.settings' + _inherit = 'sale.config.settings' _columns = { 'module_crm_caldav' : fields.boolean("Caldav Synchronization", @@ -129,6 +129,4 @@ class crm_configuration(osv.osv_memory): server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Leads'),('state','=','done')]) fetchmail_obj.set_draft(cr, uid, server_ids, context=None) -crm_configuration() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml index 735584f7c74..5b349884c34 100644 --- a/addons/crm/res_config_view.xml +++ b/addons/crm/res_config_view.xml @@ -4,7 +4,7 @@ Sales Application - res.config.settings + sale.config.settings form @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/addons/delivery/test/delivery_cost.yml b/addons/delivery/test/delivery_cost.yml index bc9bbe56445..bc6ee19d283 100644 --- a/addons/delivery/test/delivery_cost.yml +++ b/addons/delivery/test/delivery_cost.yml @@ -67,6 +67,6 @@ - I set default delivery policy. - - !record {model: res.config.settings, id: default_delivery_policy}: + !record {model: sale.config.settings, id: default_delivery_policy}: {} diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py index aa6b345fc8a..5538326052f 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.settings' + _inherit = 'sale.config.settings' _columns = { 'module_plugin_thunderbird': fields.boolean('Thunderbird plugin', @@ -44,6 +44,4 @@ class plugin_configuration(osv.osv_memory): """), } -plugin_configuration() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml index 8636df51161..f6a46cce971 100644 --- a/addons/mail/res_config_view.xml +++ b/addons/mail/res_config_view.xml @@ -3,9 +3,9 @@ Sales Application - res.config.settings + sale.config.settings form - + diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml index 5effe8324ac..8bf8993709b 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -51,7 +51,7 @@ Sales Application - res.config.settings + sale.config.settings form diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index 6ccfdf70af0..6349e3b6842 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -58,7 +58,7 @@ Sales Application - res.config.settings + sale.config.settings form diff --git a/addons/product/res_config.py b/addons/product/res_config.py index 4db8af75781..dc9077e421e 100644 --- a/addons/product/res_config.py +++ b/addons/product/res_config.py @@ -21,8 +21,8 @@ from osv import fields, osv -class product_groups_configuration(osv.osv_memory): - _inherit = 'res.config.settings' +class sale_config_settings(osv.osv_memory): + _inherit = 'sale.config.settings' _columns = { 'group_sale_pricelist_per_customer':fields.boolean("Pricelist per Customer", @@ -44,5 +44,3 @@ class product_groups_configuration(osv.osv_memory): help=""" Allows you to create and manage your packaging dimensions and types you want to be maintained in your system. It assigns the "Packaging" group to employee."""), } - -product_groups_configuration() \ No newline at end of file diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 5651c4573ef..ebbe73e35bc 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.settings' + _inherit = 'sale.config.settings' _columns = { 'sale_orders': fields.boolean('Based on Sales Orders', @@ -211,6 +211,4 @@ class sale_configuration(osv.osv_memory): ir_values_obj.set(cr, uid, 'default', False, 'tax_id', ['sale.order.line'], taxes) ir_values_obj.set(cr, uid, 'default', False, 'taxes_id', ['product.product'], taxes) -sale_configuration() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index e279d93c10a..3c8865583f3 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -4,9 +4,9 @@ Sales Application - res.config.settings + sale.config.settings form - + diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml index f5e61bd44a2..bef29f6d6e0 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.settings, id: sale_configuration_0}: + !record {model: sale.config.settings, id: sale_configuration_0}: default_order_policy: 'manual' - - !python {model: res.config.settings}: | + !python {model: sale.config.settings}: | self.execute(cr, uid, [ref("sale_configuration_0")], {})