odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]: resove the conflict 

bzr revid: han@tinyerp.com-20110712064250-r4fqf4t8h9gazm6v
This commit is contained in:
Hardik Ansodariy (OpenERP) 2011-07-12 12:12:50 +05:30
parent 2296b52568
commit 6352507b87
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/hr_timesheet/hr_timesheet_demo.xml
View File

@ -1,7 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<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">
<field name="product_id" ref="product_consultant"/>
<field name="journal_id" ref="analytic_journal"/>