diff --git a/addons/account/account.py b/addons/account/account.py index 92e698448a9..0019c0e7a9f 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1883,7 +1883,7 @@ class account_tax(osv.osv): } _sql_constraints = [ - ('name_company_uniq', 'unique(name, company_id)', 'Tax Name must be unique per company!'), + ('description_company_uniq', 'unique(description, company_id)', 'The description must be unique per company!'), ] def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80): diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index f2e3e35e047..8f7c0fd65b5 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -289,7 +289,7 @@ class account_invoice(osv.osv): 'user_id': lambda s, cr, u, c: u, } _sql_constraints = [ - ('number_uniq', 'unique(number, company_id)', 'Invoice Number must be unique per Company!'), + ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'), ] def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False): diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 12a34975dd6..1b08b081bbe 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -291,7 +291,9 @@ -