[FIX]multi_company,purchase:created a sequence for purchase order and demo data for company shop1 and shop2
lp bug: https://launchpad.net/bugs/787052 fixed bzr revid: mma@tinyerp.com-20110617131808-dx8387t60fzebzv2
This commit is contained in:
parent
20c49ad274
commit
0890da7353
|
@ -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'
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue