diff options
| author | Yannick Tivisse <yti@odoo.com> | 2016-03-03 13:34:38 +0100 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2016-06-17 12:14:57 +0200 |
| commit | 717f9217bb323fa03c03bfc188a7f2cdb797eaa6 (patch) | |
| tree | fa93065def62217b4bf28ebf7e4a6f6f750f210f /addons/hr_expense/data | |
| parent | 5aa9bde34a1fac3e437d92e6daaf72029730a2f1 (diff) | |
[IMP] hr_expense: bring back the sheets + other new features
NB:
- The option no_delete is not working, a fix will come from chm
- The many2many widget on a sheet creation is not working correctly as
the called command is a (1, id, values) without a (4, id, _) before.
A fix will also come from chm, but a disgusting hack has been
provided for this particular case (to remove after chm fix)
Diffstat (limited to 'addons/hr_expense/data')
| -rw-r--r-- | addons/hr_expense/data/hr_expense_data.xml | 13 | ||||
| -rw-r--r-- | addons/hr_expense/data/hr_expense_demo.xml | 16 | ||||
| -rw-r--r-- | addons/hr_expense/data/web_tip_data.xml | 37 |
3 files changed, 58 insertions, 8 deletions
diff --git a/addons/hr_expense/data/hr_expense_data.xml b/addons/hr_expense/data/hr_expense_data.xml index 8af41a40832..808f1d98d9d 100644 --- a/addons/hr_expense/data/hr_expense_data.xml +++ b/addons/hr_expense/data/hr_expense_data.xml @@ -21,31 +21,30 @@ <!-- Expense-related subtypes for messaging / Chatter --> <record id="mt_expense_approved" model="mail.message.subtype"> <field name="name">Approved</field> - <field name="res_model">hr.expense</field> - <field name="default" eval="False"/> + <field name="res_model">hr.expense.sheet</field> + <field name="default" eval="True"/> <field name="description">Expense approved</field> </record> <record id="mt_expense_refused" model="mail.message.subtype"> <field name="name">Refused</field> - <field name="res_model">hr.expense</field> + <field name="res_model">hr.expense.sheet</field> <field name="default" eval="True"/> <field name="description">Expense refused</field> </record> <record id="mt_expense_confirmed" model="mail.message.subtype"> <field name="name">To Approve</field> - <field name="res_model">hr.expense</field> + <field name="res_model">hr.expense.sheet</field> <field name="description">Expense confirmed, waiting confirmation</field> - <field name="default" eval="True"/> + <field name="default" eval="False"/> </record> <!-- Department (Parent) related subtypes for messaging / Chatter --> <record id="mt_department_expense_confirmed" model="mail.message.subtype"> <field name="name">Expenses To Approve</field> <field name="res_model">hr.department</field> - <field name="default" eval="True"/> + <field name="default" eval="False"/> <field name="parent_id" eval="ref('mt_expense_confirmed')"/> <field name="relation_field">department_id</field> <field name="sequence" eval="10"/> </record> - </data> </odoo> diff --git a/addons/hr_expense/data/hr_expense_demo.xml b/addons/hr_expense/data/hr_expense_demo.xml index 229653b1808..bea4c5b26db 100644 --- a/addons/hr_expense/data/hr_expense_demo.xml +++ b/addons/hr_expense/data/hr_expense_demo.xml @@ -3,7 +3,21 @@ <data noupdate="1"> <record id="hr.employee_mit" model="hr.employee"> - <field name="address_home_id" ref="base.res_partner_address_5"/> + <field name="address_home_id" ref="base.res_partner_address_3"/> + </record> + + <record id="base.res_partner_address_fp" model="res.partner"> + <field name="name">Pieter Parter's Farm</field> + <field name="parent_id" eval="ref('base.partner_root')"/> + <field name="supplier">1</field> + <field name="street">Chaussée de Namur, 40</field> + <field name="zip">1367</field> + <field name="city">Grand-Rosière-Hottomont</field> + <field name="country_id" ref="base.be"/> + </record> + + <record id="hr.employee_fp" model="hr.employee"> + <field name="address_home_id" ref="base.res_partner_address_fp"/> </record> <record id="car_travel" model="product.product"> diff --git a/addons/hr_expense/data/web_tip_data.xml b/addons/hr_expense/data/web_tip_data.xml new file mode 100644 index 00000000000..e45b329cd89 --- /dev/null +++ b/addons/hr_expense/data/web_tip_data.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<odoo> + + <record id="expense_tip_1" model="web.tip"> + <field name="title"></field> + <field name="description">Select the lines you want to submit to be reimbursed.</field> + <field name="action_id" ref="hr_expense.hr_expense_actions_all"/> + <field name="model">hr.expense</field> + <field name="mode">list</field> + <field name="trigger_selector">input.oe_list_record_selector:visible</field> + <field name="highlight_selector">input.oe_list_record_selector:visible</field> + <field name="placement">bottom</field> + </record> + + <record id="expense_tip_2" model="web.tip"> + <field name="title"></field> + <field name="description">Click on Action to submit multiple expenses to your manager.</field> + <field name="action_id" ref="hr_expense.hr_expense_actions_all"/> + <field name="model">hr.expense</field> + <field name="mode">list</field> + <field name="trigger_selector">div.oe_sidebar.btn-group:visible</field> + <field name="highlight_selector">div.oe_sidebar.btn-group:visible</field> + <field name="placement">bottom</field> + </record> + + <record id="expense_tip_3" model="web.tip"> + <field name="title"></field> + <field name="description">Use the messaging tool to log a note and attach a document to the expense. (e.g. scan of the bill)</field> + <field name="action_id" ref="hr_expense.hr_expense_actions_all"/> + <field name="model">hr.expense</field> + <field name="mode">form</field> + <field name="trigger_selector">div.btn-group.btn-group-sm:visible > button</field> + <field name="highlight_selector">.o_timeline_compose_post.btn.btn-primary:visible</field> + <field name="placement">bottom</field> + </record> + +</odoo> |
