diff --git a/addons/account/models/res_config.py b/addons/account/models/res_config.py index cde64b03a52..2b1a91e773c 100644 --- a/addons/account/models/res_config.py +++ b/addons/account/models/res_config.py @@ -85,6 +85,10 @@ class AccountConfigSettings(models.TransientModel): group_analytic_accounting = fields.Boolean(string='Analytic accounting', implied_group='analytic.group_analytic_accounting', help="Allows you to use the analytic accounting.") + group_warning = fields.Selection([ + (0, 'All the partners can be used in invoices'), + (1, 'An informative or blocking warning can be set on a partner') + ], "Warning", implied_group='account.group_warning') currency_exchange_journal_id = fields.Many2one('account.journal', related='company_id.currency_exchange_journal_id', string="Rate Difference Journal",) diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 1bd9765d455..cd6369c2207 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -30,6 +30,10 @@ + + An informative or blocking warning can be set on a partner + + diff --git a/addons/account/views/partner_view.xml b/addons/account/views/partner_view.xml index 748994dac60..20253d0a7d2 100644 --- a/addons/account/views/partner_view.xml +++ b/addons/account/views/partner_view.xml @@ -120,7 +120,7 @@ - + More Info + diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 6d79308833d..87153c22252 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -49,6 +49,10 @@ class sale_configuration(osv.TransientModel): (0, 'Do not personalize sale orders and invoice reports'), (1, 'Personalize the sale orders and invoice report with categories, subtotals and page-breaks') ], "Sale Reports Layout", implied_group='sale.group_sale_layout'), + 'group_warning': fields.selection([ + (0, 'All the products and the customers can be used in sale orders'), + (1, 'An informative or blocking warning can be set on a product or a customer') + ], "Warning", implied_group='sale.group_warning'), 'module_website_quote': fields.selection([ (0, 'Print quotes or send by email'), (1, 'Send online quotations based on templates (advanced)') diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index c19acf8ce67..e2552348f9d 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -20,6 +20,7 @@ +