Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-787052-mma into
lp:openobject-addons.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
Related bugs:
Bug #787052 in OpenERP Addons: "OpenERP 6.0.2 - Multicompany - Cannot assign
secuence purchase / sale order on company 2"
https://bugs.launchpad.net/openobject-addons/+bug/787052
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-787052-mma/+merge/64990
Hello
multi_company : Adding a file for a purchase order sequence and add a Demo
Data for company
shop1 and shop2
purchase : modified sql constraint
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-787052-mma/+merge/64990
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-787052-mma.
=== modified file 'multi_company/__openerp__.py'
--- multi_company/__openerp__.py 2011-03-18 14:06:18 +0000
+++ multi_company/__openerp__.py 2011-06-17 13:30:24 +0000
@@ -39,7 +39,8 @@
],
'init_xml': [],
'update_xml': [
- 'res_company_view.xml'
+ 'res_company_view.xml',
+ 'multi_company_purchase_sequence.xml',
],
'demo_xml': [
'multi_company_demo.xml'
=== modified file 'multi_company/multi_company_demo.xml'
--- multi_company/multi_company_demo.xml 2011-03-03 14:59:00 +0000
+++ multi_company/multi_company_demo.xml 2011-06-17 13:30:24 +0000
@@ -267,6 +267,32 @@
<field name="user_id" ref="base.user_root"/>
<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>
=== added file 'multi_company/multi_company_purchase_sequence.xml'
--- multi_company/multi_company_purchase_sequence.xml 1970-01-01 00:00:00 +0000
+++ multi_company/multi_company_purchase_sequence.xml 2011-06-17 13:30:24 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data noupdate="1">
+
+ <!-- Sequence types purchase-->
+
+ <record id="seq_type_purchase_order_multi_company" model="ir.sequence.type">
+ <field name="name">Purchase Order</field>
+ <field name="code">purchase.order</field>
+ </record>
+
+ <!-- Sequences for Purchase-->
+
+ <record id="seq_purchase_order_shop1" model="ir.sequence">
+ <field name="name">Purchase Order</field>
+ <field name="code">purchase.order</field>
+ <field name="prefix">PO</field>
+ <field name="padding">5</field>
+ <field name="company_id" ref="stock.res_company_shop0"/>
+ </record>
+
+ <record id="seq_purchase_order_shop2" model="ir.sequence">
+ <field name="name">Purchase Order</field>
+ <field name="code">purchase.order</field>
+ <field name="prefix">PO</field>
+ <field name="padding">5</field>
+ <field name="company_id" ref="stock.res_company_tinyshop0"/>
+ </record>
+
+ </data>
+</openerp>
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2011-04-26 07:39:18 +0000
+++ purchase/purchase.py 2011-06-17 13:30:24 +0000
@@ -228,7 +228,7 @@
'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"
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
