diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml
index 566b4083d64..dfb4924c631 100644
--- a/addons/hr_holidays/board_hr_manager_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_manager_holidays_view.xml
@@ -3,7 +3,7 @@
- Leaves To Approved
+ Leaves to Approve
ir.actions.act_window
hr.holidays
form
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 78204932ac8..6fc23156424 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -76,12 +76,12 @@ class hr_holidays_status(osv.osv):
'name': fields.char('Leave Type', size=64, required=True, translate=True),
'categ_id': fields.many2one('crm.case.categ', 'Meeting', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated.'),
'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 Departement'),
- 'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system will allow the employees to take more leaves than the available ones for this type.'),
+ 'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type.'),
'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'),
- 'double_validation': fields.boolean('Apply Double Validation', help="If its True then the Allocation/Leave Requests for this type will require a second validation to be approved")
+ '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 = {
'color_name': 'red',
@@ -397,11 +397,11 @@ class hr_holidays(osv.osv):
for obj in self.browse(cr, uid, ids):
if obj.holiday_status_id.double_validation:
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been Approved. A second validation is necessary and is now pending.")
+ _("The %s request has been approved. A second validation is necessary and is now pending.")
% ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
else:
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been Approved. The validation process is now over.")
+ _("The %s request has been approved. The validation process is now over.")
% ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
def holidays_valid2_notificate(self, cr, uid, ids, context=None):
@@ -521,6 +521,7 @@ hr_employee()
class crm_meeting(osv.osv):
_inherit = 'crm.meeting'
_columns = {
- 'leave_id': fields.many2one('hr.holidays','Leave Meeting'),
+ 'leave_id': fields.many2one('hr.holidays','Leave'),
}
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9205993326f..de5ad659b23 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -525,12 +525,12 @@
-
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index 9e900fde0b5..eeb4e7b5e27 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -401,7 +401,8 @@ msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,double_validation:0
msgid ""
-"If its True then the Allocation/Leave Requests for this type will require a second validation to be approved"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
msgstr ""
#. module: hr_holidays
@@ -766,8 +767,8 @@ msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,limit:0
msgid ""
-"If you select this checkbox, the system will allow the "
-"employees to take more leaves than the available ones for this type. "
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
msgstr ""
#. module: hr_holidays
diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl
index a269632d176..4d83cd9cdc7 100644
--- a/addons/hr_holidays/report/holidays_summary.xsl
+++ b/addons/hr_holidays/report/holidays_summary.xsl
@@ -151,7 +151,7 @@
Leaves Summary
- Analyze from to of the Leaves.
+ Analyze from to of the leaves.
0.7cm,5.0cm
@@ -236,7 +236,7 @@
| Color |
- Leaves Type |
+ Leave Type |
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index ede6fd7d656..8a782075853 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -107,9 +107,9 @@ class report_custom(report_rml):
day_diff=eom-som
name = ''
- if data['form'].has_key('emp') and len(data['form']['emp']) == 1:
- name = 'of'+' '+obj_emp.read(cr, uid, data['form']['emp'][0], ['name'])['name']
-
+ if len(data['form'].get('emp', ())) == 1:
+ name = obj_emp.read(cr, uid, data['form']['emp'][0], ['name'])['name']
+
if data['form']['holiday_type']!='both':
type=data['form']['holiday_type']
if data['form']['holiday_type']=='Confirmed':
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index 5c12e9922fd..72844a58ccb 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -30,12 +30,12 @@
new
-
+
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 14095e47091..1f330580c6e 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -7,20 +7,20 @@
hr.holidays.summary.employee
form
-
+