[IMP]multi_company,purchase:Remove a demo data and sql constraint

bzr revid: mma@tinyerp.com-20110720115235-k3grrx9ast556sj1

diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index 2ae556f..baf3a88 100644 (file)
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -39,7 +39,7 @@ This module is the base module for other multi-company modules.
     ],
     'init_xml': [],
     'update_xml': [
-        'res_company_view.xml',
+        'res_company_view.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 583f83d..5248a26 100644 (file)
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -268,32 +268,6 @@
             <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         
-        <record id="Shop1_journal_multi_in" model="account.journal">
-            <field name="name">Expenses Journal - (Shop 1)</field>
-            <field name="code">EXJ-Shop 1</field>
-            <field name="type">purchase</field>
-            <field name="view_id" ref="account.account_sp_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
-            <field name="analytic_journal_id" ref="account.exp"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="company_id" ref="stock.res_company_shop0"/>
-        </record>
-        
-        <record id="Shop2_journal_multi_in" model="account.journal">
-            <field name="name">Expenses Journal - (Shop 2)</field>
-            <field name="code">EXJ-Shop 2</field>
-            <field name="type">purchase</field>
-            <field name="view_id" ref="account.account_sp_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
-            <field name="analytic_journal_id" ref="account.exp"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="company_id" ref="stock.res_company_tinyshop0"/>
-        </record>
-
         <record id="refund_expenses_journal_multi_in" model="account.journal">
             <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field>
             <field name="code">ECNJ-OpenERP IN</field>

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 436ec0b..6f6ab0c 100644 (file)
--- 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, company_id)', 'Order Reference must be unique !'),
+        ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
     ]
     _name = "purchase.order"
     _description = "Purchase Order"