From a19915e805fd431fbd3da32ff5fc8ed3703601a5 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 19 Dec 2012 14:57:10 +0530 Subject: [PATCH] [FIX]leaves replaced by Time off bzr revid: kbh@tinyerp.com-20121219092710-i9x9j0c6iykix4d6 --- .../account/project/analytic_account_demo.xml | 2 +- addons/hr/hr_data.xml | 2 +- addons/hr/hr_department_view.xml | 2 +- addons/hr/hr_installer.xml | 2 +- addons/hr/res_config.py | 2 +- addons/hr_holidays/__openerp__.py | 12 +++---- addons/hr_holidays/board_hr_holidays_view.xml | 4 +-- addons/hr_holidays/hr_holidays.py | 14 ++++---- addons/hr_holidays/hr_holidays_data.xml | 8 ++--- addons/hr_holidays/hr_holidays_report.xml | 2 +- addons/hr_holidays/hr_holidays_view.xml | 34 +++++++++---------- .../report/available_holidays_view.xml | 4 +-- .../hr_holidays/report/holidays_summary.xsl | 4 +-- .../report/hr_holidays_report_view.xml | 4 +-- addons/hr_holidays/test/test_hr_holiday.yml | 2 +- .../wizard/hr_holidays_summary_department.py | 2 +- .../hr_holidays_summary_department_view.xml | 6 ++-- .../wizard/hr_holidays_summary_employees.py | 2 +- .../hr_holidays_summary_employees_view.xml | 6 ++-- addons/resource/__openerp__.py | 2 +- addons/resource/resource.py | 8 ++--- addons/resource/resource_view.xml | 6 ++-- 22 files changed, 65 insertions(+), 65 deletions(-) diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml index 2c4acc6bc45..462c20e7b11 100644 --- a/addons/account/project/analytic_account_demo.xml +++ b/addons/account/project/analytic_account_demo.xml @@ -5,7 +5,7 @@ - Leaves + Time off view diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml index 25c882f2201..b129af8c332 100644 --- a/addons/hr/hr_data.xml +++ b/addons/hr/hr_data.xml @@ -10,7 +10,7 @@ Employee Directory application installed! Manage your human resources with OpenERP: employees and their hierarchy, HR departments and job positions.

More HR features are available via extra applications: Recruitment Process (manage job positions and recruitment), Timesheet Validation (record timesheets and attendance), -Leave Management (keep track of employee leaves), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).

]]> +Leave Management (keep track of employee Time off), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).

]]> diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml index 6ea43e45b66..e43e37a91b3 100644 --- a/addons/hr/hr_department_view.xml +++ b/addons/hr/hr_department_view.xml @@ -53,7 +53,7 @@

OpenERP's department structure is used to manage all documents related to employees by departments: expenses, timesheets, - leaves and holidays, recruitments, etc. + Time off and holidays, recruitments, etc.

diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml index 1296029b941..20abb9682aa 100644 --- a/addons/hr/hr_installer.xml +++ b/addons/hr/hr_installer.xml @@ -14,7 +14,7 @@

Your departments structure is used to manage all documents related to employees by departments: expenses and timesheets, - leaves and holidays, recruitments, etc. + Time off and holidays, recruitments, etc.

diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py index 147c4e4d5b9..d822ed6cbb2 100644 --- a/addons/hr/res_config.py +++ b/addons/hr/res_config.py @@ -32,7 +32,7 @@ class hr_config_settings(osv.osv_memory): help ="""This installs the module hr_attendance."""), 'module_hr_timesheet': fields.boolean('Manage timesheets', help ="""This installs the module hr_timesheet."""), - 'module_hr_holidays': fields.boolean('Manage holidays, leaves and allocation requests', + 'module_hr_holidays': fields.boolean('Manage holidays, Time off and allocation requests', help ="""This installs the module hr_holidays."""), 'module_hr_expense': fields.boolean('Manage employees expenses', help ="""This installs the module hr_expense."""), diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index 417748d874b..9350a5de9ff 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -29,18 +29,18 @@ 'summary': 'Holidays, Allocation and Leave Requests', 'website': 'http://www.openerp.com', 'description': """ -Manage leaves and allocation requests +Manage Time off and allocation requests ===================================== This application controls the holiday schedule of your company. It allows employees to request holidays. Then, managers can review requests for holidays and approve or reject them. This way you can control the overall holiday planning for the company or department. -You can configure several kinds of leaves (sickness, holidays, paid days, ...) and allocate leaves to an employee or department quickly using allocation requests. An employee can also make a request for more days off by making a new Allocation. It will increase the total of available days for that leave type (if the request is accepted). +You can configure several kinds of Time off (sickness, holidays, paid days, ...) and allocate Time off to an employee or department quickly using allocation requests. An employee can also make a request for more days off by making a new Allocation. It will increase the total of available days for that leave type (if the request is accepted). -You can keep track of leaves in different ways by following reports: +You can keep track of Time off in different ways by following reports: -* Leaves Summary -* Leaves by Department -* Leaves Analysis +* Time off Summary +* Time off by Department +* Time off Analysis A synchronization with an internal agenda (Meetings of the CRM module) is also possible in order to automatically create a meeting when a holiday request is accepted by setting up a type of meeting in Leave Type. """, diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml index c90ee32c396..3c8e1e50c22 100644 --- a/addons/hr_holidays/board_hr_holidays_view.xml +++ b/addons/hr_holidays/board_hr_holidays_view.xml @@ -3,7 +3,7 @@ - My Leaves + My Time off hr.holidays.status form tree,form @@ -18,7 +18,7 @@ - + diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 630bce14e91..5d4f80ebca3 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -79,11 +79,11 @@ class hr_holidays_status(osv.osv): 'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type', help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'), 'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Department.'), - 'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and take them into account for the "Remaining Legal Leaves" defined on the employee form.'), + 'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more Time off than the available ones for this type and take them into account for the "Remaining Legal Time off" defined on the employee form.'), 'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."), 'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'), - 'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'), - 'remaining_leaves': fields.function(_user_left_days, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'), + 'leaves_taken': fields.function(_user_left_days, string='Time off Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'), + 'remaining_leaves': fields.function(_user_left_days, string='Remaining Time off', help='Maximum Time off Allowed - Time off Already Taken', multi='user_left_days'), 'double_validation': fields.boolean('Apply Double Validation', help="When selected, the Allocation/Leave Requests for this type require a second validation to be approved."), } _defaults = { @@ -149,7 +149,7 @@ class hr_holidays(osv.osv): 'number_of_days_temp': fields.float('Allocation', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True), 'meeting_id': fields.many2one('crm.meeting', 'Meeting'), - 'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True), + 'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of Time off available for someone", select=True), 'parent_id': fields.many2one('hr.holidays', 'Parent'), 'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',), 'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True), @@ -166,7 +166,7 @@ class hr_holidays(osv.osv): 'holiday_type': 'employee' } _constraints = [ - (_check_date, 'You can not have 2 leaves that overlaps on same day!', ['date_from','date_to']), + (_check_date, 'You can not have 2 Time off that overlaps on same day!', ['date_from','date_to']), ] _sql_constraints = [ @@ -482,7 +482,7 @@ class hr_employee(osv.osv): # Find for holidays status status_ids = type_obj.search(cr, uid, [('limit', '=', False)], context=context) if len(status_ids) != 1 : - raise osv.except_osv(_('Warning!'),_("The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \nYou may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in 'Human Resources \ Leaves' to manage the leave days of the employees if the configuration does not allow to use this field.") % (len(status_ids))) + raise osv.except_osv(_('Warning!'),_("The feature behind the field 'Remaining Legal Time off' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \nYou may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in 'Human Resources \ Leaves' to manage the leave days of the employees if the configuration does not allow to use this field.") % (len(status_ids))) status_id = status_ids and status_ids[0] or False if not status_id: return False @@ -541,7 +541,7 @@ class hr_employee(osv.osv): return result _columns = { - 'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave request. Total based on all the leave types without overriding limit.'), + 'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Time off', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave request. Total based on all the leave types without overriding limit.'), 'current_leave_state': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Status", type="selection", selection=[('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'), ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')]), diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml index 5af0c60fc44..e04c680d531 100644 --- a/addons/hr_holidays/hr_holidays_data.xml +++ b/addons/hr_holidays/hr_holidays_data.xml @@ -13,20 +13,20 @@ notification Leave Management application installed! - Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.

-

Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate leaves to employees and employee categories.

]]> + Manage employee Time off from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.

+

Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate Time off to employees and employee categories.

]]> - + black - Sick Leaves + Sick Time off True red diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml index 14d4cb99562..79a49fe4fab 100644 --- a/addons/hr_holidays/hr_holidays_report.xml +++ b/addons/hr_holidays/hr_holidays_report.xml @@ -3,7 +3,7 @@ - + - + @@ -154,10 +154,10 @@ - Leaves Management + Time off Management hr.holidays -
+