From be779f57d08dd1f5bda974fa68150fe65ea8b379 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 29 Oct 2012 16:08:09 +0100 Subject: [PATCH 01/19] [IMP] useability timesheets bzr revid: fp@tinyerp.com-20121029150809-86cieq1flmb45ubl --- addons/hr/res_config.py | 2 +- .../hr_timesheet_sheet/hr_timesheet_sheet.py | 4 ++-- .../hr_timesheet_sheet_view.xml | 23 +++++++++++-------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py index 148499190fd..299c5ca68fe 100644 --- a/addons/hr/res_config.py +++ b/addons/hr/res_config.py @@ -42,7 +42,7 @@ class hr_config_settings(osv.osv_memory): help ="""This installs the module hr_contract."""), 'module_hr_evaluation': fields.boolean('Organize employees periodic evaluation', help ="""This installs the module hr_evaluation."""), - 'module_account_analytic_analysis': fields.boolean('Allow invoicing based on timesheets (will install the sale application)', + 'module_account_analytic_analysis': fields.boolean('Allow invoicing based on timesheets (the sale application will be installed)', help ="""This installs the module account_analytic_analysis, which will install sales management too."""), 'module_hr_payroll': fields.boolean('Manage payroll', help ="""This installs the module hr_payroll."""), diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 9902d82d95b..a9276ba6984 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -79,7 +79,7 @@ class hr_timesheet_sheet(osv.osv): if not new_user_id: raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must assign it to a user.')) if not self._sheet_date(cr, uid, ids, forced_user_id=new_user_id): - raise osv.except_osv(_('Error!'), _('You cannot have 2 timesheets that overlaps!\nYou should use the menu \'My Timesheet\' to avoid this problem.')) + raise osv.except_osv(_('Error!'), _('You cannot have 2 timesheets that overlap!\nYou should use the menu \'My Timesheet\' to avoid this problem.')) if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id: raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link the employee to a product.')) if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id: @@ -187,7 +187,7 @@ class hr_timesheet_sheet(osv.osv): _constraints = [ - (_sheet_date, 'You cannot have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']), + (_sheet_date, 'You cannot have 2 timesheets that overlap!\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']), ] def action_set_to_draft(self, cr, uid, ids, *args): diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 098853fafac..ee5a329c800 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -303,18 +303,21 @@ + context="{'search_default_sheet_id': [active_id]}" + id="act_hr_timesheet_sheet_sheet_by_account" + name="Timesheet by Account" + groups="base.group_hr_attendance" + res_model="hr_timesheet_sheet.sheet.account" + src_model="hr_timesheet_sheet.sheet"/> + context="{'search_default_sheet_id': [active_id]}" + id="act_hr_timesheet_sheet_sheet_by_day" + name="Timesheet by Day" + groups="base.group_hr_attendance" + res_model="hr_timesheet_sheet.sheet.day" + src_model="hr_timesheet_sheet.sheet"/> + hr.timesheet.sheet.tree hr_timesheet_sheet.sheet From 57d0ba0b23a68383b036312cdf617b1a41539ec3 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 29 Oct 2012 16:25:57 +0100 Subject: [PATCH 02/19] [IMP] useaiblity views bzr revid: fp@tinyerp.com-20121029152557-tje0jdyl3quglgyx --- .../project/wizard/account_analytic_journal_report_view.xml | 2 +- addons/project/project_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml index b0cb0293270..6d632016ba1 100644 --- a/addons/account/project/wizard/account_analytic_journal_report_view.xml +++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml @@ -10,7 +10,7 @@ - +