diff options
| author | Jérome Maes <jem@openerp.com> | 2017-01-04 15:25:03 +0100 |
|---|---|---|
| committer | Jérome Maes <jem@openerp.com> | 2017-05-11 08:36:11 +0200 |
| commit | cfe1b2e3717c386be2528295010cd630e3ee7541 (patch) | |
| tree | b266d3d5fd4b45f4ae8905cd876fd09a72547605 /addons | |
| parent | 2e251f7599c6ee5ccb49c73f1349be70803798ac (diff) | |
[IMP] project: change planner link to hr_timesheet_sheet
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/project/data/web_planner_data.xml | 19 | ||||
| -rw-r--r-- | addons/project/models/web_planner.py | 2 |
2 files changed, 3 insertions, 18 deletions
diff --git a/addons/project/data/web_planner_data.xml b/addons/project/data/web_planner_data.xml index e40819c3198..9e3f0d63056 100644 --- a/addons/project/data/web_planner_data.xml +++ b/addons/project/data/web_planner_data.xml @@ -476,8 +476,8 @@ </div> <div class="panel-body"> <li>For employees, the - <a t-if="is_module_installed('hr_timesheet_sheet')" t-attf-href="web#view_type=form&model=hr_timesheet_sheet.sheet&menu_id=#{timesheet_menu and timesheet_menu.id}">Current Timesheet</a> - <a t-if="not is_module_installed('hr_timesheet_sheet')" t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'hr_timesheet_sheet')">Current Timesheet</a> + <a t-if="is_module_installed('hr_timesheet')" t-attf-href="web#menu_id=#{timesheet_menu and timesheet_menu.id}">Current Timesheet</a> + <a t-if="not is_module_installed('hr_timesheet')" t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'hr_timesheet')">Current Timesheet</a> view of the HR module is the main tool to check, modify and confirm Timesheets.</li><br/> <li>Alternatively, Timesheets can be added directly from Tasks by activating <strong>'Log work activities on tasks'</strong> in the <a t-att-href="prepare_backend_url('project.action_config_settings')">Project Settings</a>.</li><br/> <li>Or, if you are using Issues, by activating 'Activate timesheets on issues', also in the <a t-att-href="prepare_backend_url('project.action_config_settings')">Project Settings</a>.</li> @@ -526,21 +526,6 @@ </div> </div> </div> - <h3><strong>Approve your Timesheets</strong> (every week)</h3> - <p> - At the end of the week, each employee should review - their entries for the week and makes sure the - entries are correctly encoded. This can be done - from the - <a t-if="is_module_installed('hr_timesheet_sheet')" t-attf-href="web#view_type=form&model=hr_timesheet_sheet.sheet&menu_id=#{timesheet_menu and timesheet_menu.id}">Current Timesheet</a> - <a t-if="not is_module_installed('hr_timesheet_sheet')" t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'hr_timesheet_sheet')">Current Timesheet</a> - view of the Human Resources module. - </p><p> - Once a Timesheet is confirmed by an employee, it needs to be Approved by a manager in the - <a t-if="is_module_installed('hr_timesheet_sheet')" t-att-href="prepare_backend_url('hr_timesheet_sheet.act_hr_timesheet_sheet_form')">Timesheets to Approve</a> - <a t-if="not is_module_installed('hr_timesheet_sheet')" t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'hr_timesheet_sheet')">Timesheets to Approve</a> - view. - </p> <h3><strong>Invoice your customers</strong> (every month)</h3> <p> If you work on a Time & Material project, you'll probably want to extract a Timesheet of the tasks and issues to invoice directly to the customer. To do that: diff --git a/addons/project/models/web_planner.py b/addons/project/models/web_planner.py index ae8b43efc56..ed10092b4df 100644 --- a/addons/project/models/web_planner.py +++ b/addons/project/models/web_planner.py @@ -15,5 +15,5 @@ class PlannerProject(models.Model): def _prepare_planner_project_data(self): return { - 'timesheet_menu': self.env.ref('hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current', raise_if_not_found=False), + 'timesheet_menu': self.env.ref('hr_timesheet.timesheet_menu_root', raise_if_not_found=False), } |