[IMP]: resove the conflict
bzr revid: han@tinyerp.com-20110712064250-r4fqf4t8h9gazm6v
This commit is contained in:
parent
2296b52568
commit
6352507b87
|
@ -1,7 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<openerp>
|
<openerp>
|
||||||
<data noupdate="1">
|
<data noupdate="1">
|
||||||
|
<record id="product_consultant" model="product.product">
|
||||||
|
<field name="list_price">75.0</field>
|
||||||
|
<field name="standard_price">30.0</field>
|
||||||
|
<field name="uom_id" ref="product.uom_hour"/>
|
||||||
|
<field name="uom_po_id" ref="product.uom_hour"/>
|
||||||
|
<field name="name">Service on Timesheet</field>
|
||||||
|
<field name="categ_id" ref="product.cat0"/>
|
||||||
|
<field name="type">service</field>
|
||||||
|
<field eval="False" name="purchase_ok"/>
|
||||||
|
</record>
|
||||||
|
|
||||||
<record id="hr.employee" model="hr.employee">
|
<record id="hr.employee" model="hr.employee">
|
||||||
<field name="product_id" ref="product_consultant"/>
|
<field name="product_id" ref="product_consultant"/>
|
||||||
<field name="journal_id" ref="analytic_journal"/>
|
<field name="journal_id" ref="analytic_journal"/>
|
||||||
|
|
Loading…
Reference in New Issue