[MERGE]: hr_expense, hr_recruitment: Merged remaining improvements

bzr revid: rpa@tinyerp.com-20110804104545-z5ruo8hpdwqjwmeu
This commit is contained in:
Rucha (Open ERP)
2011-08-04 16:15:45 +05:30
3 changed files with 13 additions and 13 deletions
+12
View File
@@ -8,6 +8,18 @@
<field name="parent_id" ref="product.cat0"/>
<field name="name">Expenses</field>
</record>
<record id="product_product_expense_car" model="product.product">
<field name="list_price">0.32</field>
<field name="standard_price">0.32</field>
<field name="uom_id" ref="product.product_uom_km"/>
<field name="uom_po_id" ref="product.product_uom_km"/>
<field name="type">consu</field>
<field name="name">Travel Expenses</field>
<field name="default_code">TRA</field>
<field name="categ_id" ref="hr_expense.cat_expense"/>
<field name="hr_expense_ok" eval="True" />
</record>
</data>
</openerp>
-12
View File
@@ -26,18 +26,6 @@
<field name="hr_expense_ok" eval="True" />
</record>
<record id="product_product_expense_car" model="product.product">
<field name="list_price">0.32</field>
<field name="standard_price">0.32</field>
<field name="uom_id" ref="product.product_uom_km"/>
<field name="uom_po_id" ref="product.product_uom_km"/>
<field name="type">consu</field>
<field name="name">Travel Expenses</field>
<field name="default_code">TRA</field>
<field name="categ_id" ref="product.cat2"/>
<field name="hr_expense_ok" eval="True" />
</record>
<record id="hr_expense_expense_septemberexpenses0" model="hr.expense.expense">
<field name="currency_id" ref="base.EUR"/>
<field name="employee_id" ref="hr.employee1"/>
@@ -314,7 +314,7 @@
<tree string="Stages">
<field name="sequence" invisible="1"/>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" groups="base.group_extended"/>
</tree>
</field>
</record>