Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-leave_type-pna
into lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-leave_type-pna/+merge/106567
Hello ,
hr_holiday:improve leave report color,tooltips
Thank You,
pna
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-leave_type-pna/+merge/106567
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-leave_type-pna
into lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2012-05-07 18:13:46 +0000
+++ hr_holidays/hr_holidays.py 2012-05-21 06:00:26 +0000
@@ -76,7 +76,7 @@
'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 tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
+ '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.'),
'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'),
=== modified file 'hr_holidays/hr_holidays_data.xml'
--- hr_holidays/hr_holidays_data.xml 2012-05-15 14:46:30 +0000
+++ hr_holidays/hr_holidays_data.xml 2012-05-21 06:00:26 +0000
@@ -20,7 +20,7 @@
<record model="hr.holidays.status" id="holiday_status_comp">
<field name="name">Compensatory Days</field>
<field name="limit">True</field>
- <field name="color_name">brown</field>
+ <field name="color_name">lavender</field>
</record>
<!--Unpaid Leave -->
=== modified file 'hr_holidays/i18n/hr_holidays.pot'
--- hr_holidays/i18n/hr_holidays.pot 2012-02-08 01:08:30 +0000
+++ hr_holidays/i18n/hr_holidays.pot 2012-05-21 06:00:26 +0000
@@ -767,8 +767,8 @@
#. module: hr_holidays
#: help:hr.holidays.status,limit:0
msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system will allow the "
+"employees to take more leaves than the available ones for this type. "
msgstr ""
#. module: hr_holidays
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
