diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-08-04 16:15:45 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-08-04 16:15:45 +0530 |
| commit | ac146ff53ea3bb4c4ba0fbbc735c7463f6474cb0 (patch) | |
| tree | 77a53c494418a7207c9798d4097b7783194461ec | |
| parent | 75bf01252ed7b208e4a1c93da828125565c0037b (diff) | |
| parent | 916f440f4a541d9c692b1717c37bb17fa6460539 (diff) | |
[MERGE]: hr_expense, hr_recruitment: Merged remaining improvements
bzr revid: rpa@tinyerp.com-20110804104545-z5ruo8hpdwqjwmeu
| -rw-r--r-- | addons/hr_expense/hr_expense_data.xml | 12 | ||||
| -rw-r--r-- | addons/hr_expense/hr_expense_demo.xml | 12 | ||||
| -rw-r--r-- | addons/hr_recruitment/hr_recruitment_view.xml | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml index 33a7ec7604c..9660dbb2543 100644 --- a/addons/hr_expense/hr_expense_data.xml +++ b/addons/hr_expense/hr_expense_data.xml @@ -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>
\ No newline at end of file diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml index ea19a396b3e..80c9cd66694 100644 --- a/addons/hr_expense/hr_expense_demo.xml +++ b/addons/hr_expense/hr_expense_demo.xml @@ -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"/> diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 0e98ea03030..125d61979e9 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -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> |