diff options
| author | Tanguy Charlier <tac@odoo.com> | 2016-02-18 01:24:33 +0100 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2016-02-18 01:25:55 +0100 |
| commit | 16bf40f7c4827c933dd3c679022987cdb44330c4 (patch) | |
| tree | 5c2f4f5e5f22be555a032f4ec710ed78bdd9304d /addons/project_issue_sheet/project_issue_sheet_view.xml | |
| parent | f3a9f83ff16024140e4eba64bb2a9499568cc450 (diff) | |
[IMP] hr_timesheet: Timesheet entries are now related to projects
- Hide account_id field and add a required project_id field on timesheet entries
- Remove is_timesheet field: as project_id is only required for timesheet entries and not for other analytic lines, it can be used to determine wether a line is a timeheet entry or not.
- Remove project_timesheet module as all its functionalities are moved to hr_timesheet
- Replace timesheets on contract option on products by timesheets on project
- Small fixes and improvements in timesheets and projects views and groups
Diffstat (limited to 'addons/project_issue_sheet/project_issue_sheet_view.xml')
| -rw-r--r-- | addons/project_issue_sheet/project_issue_sheet_view.xml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml index 8efe6535bbb..a06bfe0cce2 100644 --- a/addons/project_issue_sheet/project_issue_sheet_view.xml +++ b/addons/project_issue_sheet/project_issue_sheet_view.xml @@ -14,19 +14,15 @@ <attribute name="on_change">on_change_project(project_id)</attribute> </field> <xpath expr="//notebook/page[@name='extra_info']" position="before"> - <page string="Timesheets" groups="project.group_tasks_work_on_tasks,project.group_time_work_estimation_tasks"> - <group> - <field name="analytic_account_id" domain="[('account_type', '=', 'normal')]"/> - </group> - <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : uid, 'default_account_id' : analytic_account_id, 'default_is_timesheet':1}" + <page string="Timesheets"> + <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : uid, 'default_project_id': project_id}" groups="base.group_user"> <tree editable="top" string="Timesheet Activities"> <field name="date"/> <field name="user_id" required="1"/> <field name="name"/> - <field name="account_id" invisible="0" domain="[('account_type, '=', 'normal'), ('partner_id', '=', parent.partner_id)]" options="{'no_open': True, 'no_create': True}" groups="analytic.group_analytic_accounting"/> + <field name="project_id" invisible="1" required="1"/> <field name="unit_amount" string="Duration" widget="float_time"/> - <field name="is_timesheet" invisible="1"/> </tree> </field> </page> |