diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py index baf3a88c32e..beeffc75358 100644 --- a/addons/multi_company/__openerp__.py +++ b/addons/multi_company/__openerp__.py @@ -39,7 +39,8 @@ This module is the base module for other multi-company modules. ], 'init_xml': [], 'update_xml': [ - 'res_company_view.xml' + 'res_company_view.xml', + 'multi_company_purchase_sequence.xml', ], 'demo_xml': [ 'multi_company_demo.xml' diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index d3b46e6d112..583f83d252d 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -267,6 +267,32 @@ + + + Expenses Journal - (Shop 1) + EXJ-Shop 1 + purchase + + + + + + + + + + + Expenses Journal - (Shop 2) + EXJ-Shop 2 + purchase + + + + + + + + Expenses Credit Notes Journal - (OpenERP IN) diff --git a/addons/multi_company/multi_company_purchase_sequence.xml b/addons/multi_company/multi_company_purchase_sequence.xml new file mode 100644 index 00000000000..8205866e573 --- /dev/null +++ b/addons/multi_company/multi_company_purchase_sequence.xml @@ -0,0 +1,31 @@ + + + + + + + + Purchase Order + purchase.order + + + + + + Purchase Order + purchase.order + PO + 5 + + + + + Purchase Order + purchase.order + PO + 5 + + + + + diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 6f6ab0c1b44..436ec0b021b 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -228,7 +228,7 @@ class purchase_order(osv.osv): 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c), } _sql_constraints = [ - ('name_uniq', 'unique(name)', 'Order Reference must be unique !'), + ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique !'), ] _name = "purchase.order" _description = "Purchase Order"