From 2208354292bfc75a635856c7880d858230e2725a Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Tue, 28 May 2013 15:05:17 +0530 Subject: [PATCH 01/11] [IMP] Sign In/ Sing out by project wizard, imporve the usability issues. bzr revid: nco@tinyerp.com-20130528093517-h4zc0t6op8xt033y --- addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 2 +- .../hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py index d0cbdc78c31..36504033429 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py @@ -32,7 +32,7 @@ class hr_so_project(osv.osv_memory): 'date_start': fields.datetime('Starting Date', readonly=True), 'date': fields.datetime('Closing Date'), 'analytic_amount': fields.float('Minimum Analytic Amount'), - 'name': fields.char('Employees name', size=32, required=True, readonly=True), + 'name': fields.char('Employees Name', size=32, required=True, readonly=True), 'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True), 'server_date': fields.datetime('Current Date', required=True, readonly=True), 'emp_id': fields.many2one('hr.employee', 'Employee ID') diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml index ea8d37ad454..c91b794b1f1 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml @@ -43,7 +43,7 @@ - Sign in / Sign out by project + Sign in / Sign out by Project hr.sign.in.project form tree,form @@ -67,7 +67,7 @@ - - Sign in / Sign out by project + Sign in / Sign out by Project hr.sign.out.project form tree,form From 2114adf97e83aabd49411c5fc070ce2304275b93 Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP Trainee)" Date: Tue, 28 May 2013 15:59:50 +0530 Subject: [PATCH 02/11] [IMP] current status value. bzr revid: nco@tinyerp.com-20130528102950-txs9fjuodrzrv0ue --- addons/hr_attendance/hr_attendance.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index dcff0ad5085..fcb1ea7a161 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -108,7 +108,7 @@ class hr_employee(osv.osv): AND hr_attendance.name = foo.name) \ WHERE hr_attendance.employee_id IN %s',(tuple(ids),)) for res in cr.fetchall(): - result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent' + result[res[1]] = res[0] == 'sign_in' and 'Present' or 'Absent' return result def _last_sign(self, cr, uid, ids, name, args, context=None): @@ -152,8 +152,8 @@ class hr_employee(osv.osv): warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out')} for employee in self.browse(cr, uid, ids, context=context): if not action: - if employee.state == 'present': action = 'sign_out' - if employee.state == 'absent': action = 'sign_in' + if employee.state == 'Present': action = 'sign_out' + if employee.state == 'Absent': action = 'sign_in' if not self._action_check(cr, uid, employee.id, action_date, context): raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[action],)) From 6644f6555b4b6625310610d78280865ba2488f24 Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Tue, 28 May 2013 16:01:19 +0530 Subject: [PATCH 03/11] [IMP] improve string Employee Name bzr revid: nco@tinyerp.com-20130528103119-569eqxi0hyb7906t --- addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py index 36504033429..a554fc73d3d 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py @@ -109,7 +109,7 @@ class hr_si_project(osv.osv_memory): _name = 'hr.sign.in.project' _description = 'Sign In By Project' _columns = { - 'name': fields.char('Employees name', size=32, readonly=True), + 'name': fields.char('Employees Name', size=32, readonly=True), 'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True), 'date': fields.datetime('Starting Date'), 'server_date': fields.datetime('Current Date', readonly=True), From 87f399689445a26cab892140203617532b85834f Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Tue, 28 May 2013 17:12:16 +0530 Subject: [PATCH 04/11] [IMP] put computed balance field. bzr revid: nco@tinyerp.com-20130528114216-2ow9907o6ckrse12 --- addons/account/account_view.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 603c4254b19..5c29d23ba0a 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -609,6 +609,13 @@ + +
+
+ + +
From 8c8a9378d831c970db3e865f021f34f6d6e4ad4a Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Wed, 29 May 2013 10:18:35 +0530 Subject: [PATCH 05/11] [FIX] set the missing selection on related field currunt status. bzr revid: nco@tinyerp.com-20130529044835-a3faab0nasqfntvk --- addons/hr_attendance/hr_attendance.py | 6 +++--- addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index fcb1ea7a161..dcff0ad5085 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -108,7 +108,7 @@ class hr_employee(osv.osv): AND hr_attendance.name = foo.name) \ WHERE hr_attendance.employee_id IN %s',(tuple(ids),)) for res in cr.fetchall(): - result[res[1]] = res[0] == 'sign_in' and 'Present' or 'Absent' + result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent' return result def _last_sign(self, cr, uid, ids, name, args, context=None): @@ -152,8 +152,8 @@ class hr_employee(osv.osv): warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out')} for employee in self.browse(cr, uid, ids, context=context): if not action: - if employee.state == 'Present': action = 'sign_out' - if employee.state == 'Absent': action = 'sign_in' + if employee.state == 'present': action = 'sign_out' + if employee.state == 'absent': action = 'sign_in' if not self._action_check(cr, uid, employee.id, action_date, context): raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[action],)) diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py index a554fc73d3d..04ddc87ef10 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py @@ -19,6 +19,7 @@ # ############################################################################## import time +from lxml import etree from openerp.osv import fields, osv from openerp.tools.translate import _ @@ -33,7 +34,7 @@ class hr_so_project(osv.osv_memory): 'date': fields.datetime('Closing Date'), 'analytic_amount': fields.float('Minimum Analytic Amount'), 'name': fields.char('Employees Name', size=32, required=True, readonly=True), - 'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True), + 'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], required=True, readonly=True), 'server_date': fields.datetime('Current Date', required=True, readonly=True), 'emp_id': fields.many2one('hr.employee', 'Employee ID') } @@ -110,7 +111,7 @@ class hr_si_project(osv.osv_memory): _description = 'Sign In By Project' _columns = { 'name': fields.char('Employees Name', size=32, readonly=True), - 'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True), + 'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], required=True, readonly=True), 'date': fields.datetime('Starting Date'), 'server_date': fields.datetime('Current Date', readonly=True), 'emp_id': fields.many2one('hr.employee', 'Employee ID') From b5346ce6bb4b6e3e6e88cd448d3e403fa7cae0dd Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Wed, 29 May 2013 10:28:44 +0530 Subject: [PATCH 06/11] [IMP] remove unused import. bzr revid: nco@tinyerp.com-20130529045844-e03p9l3rgu17n2xk --- addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py index 04ddc87ef10..9b3ea9af058 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py @@ -19,7 +19,6 @@ # ############################################################################## import time -from lxml import etree from openerp.osv import fields, osv from openerp.tools.translate import _ From 8e35f1789797bfe8bc9c070ce10353344f0f5186 Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Wed, 29 May 2013 11:26:24 +0530 Subject: [PATCH 07/11] [IMP] Employees name. bzr revid: nco@tinyerp.com-20130529055624-pcsyqbm0s5mkm3oo --- addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml index c91b794b1f1..54dce78369a 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml @@ -26,7 +26,7 @@
- +