Sanjay Gohel (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr-improvements-holidays-sgo into
lp:~openerp-dev/openobject-addons/trunk-hr-improvements.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr-improvements-holidays-sgo/+merge/97876
Hello sir,
I have made following changes in hr_holidays.
1) Put 3 fields in HR officer group.
2) Rearrange all fields in list view as for better view and understanding.
3) Modify warning message whrn leave is not allocated to the employee.
and open chatter group still not in base therefore cannot move approval fields
in that group.
Thank You.
SGO
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr-improvements-holidays-sgo/+merge/97876
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-hr-improvements.
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2012-01-03 13:52:24 +0000
+++ hr_holidays/hr_holidays.py 2012-03-16 13:20:30 +0000
@@ -341,7 +341,7 @@
if record.employee_id and not record.holiday_status_id.limit:
leaves_rest = holi_status_obj.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
if leaves_rest < record.number_of_days_temp:
- raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for employee %s: too few remaining days (%s).') % (record.employee_id.name, leaves_rest))
+ raise osv.except_osv(_('Warning!'),_('There are no %s allocated for employee %s, Please create allocation request for this leave type.') % (record.holiday_status_id.name,record.employee_id.name))
return True
hr_holidays()
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-02-13 15:27:55 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-03-16 13:20:30 +0000
@@ -65,18 +65,18 @@
<form string="Leave Request">
<group col="8" colspan="4">
<field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
- <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_manager"/>
+ <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
<group attrs="{'invisible':[('holiday_type','=','employee')]}">
<field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
</group>
<group attrs="{'invisible':[('holiday_type','=','category')]}">
- <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
+ <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}" groups="base.group_hr_user"/>
</group>
</group>
<notebook colspan="4">
<page string="General">
<field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
- <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}"/>
+ <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
<field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
<field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
<field name="number_of_days_temp"/>
@@ -150,8 +150,8 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
+ <field name="employee_id"/>
<field name="holiday_type"/>
- <field name="employee_id"/>
<field name="category_id"/>
<field name="department_id" invisible="1"/>
<field name="holiday_status_id"/>
@@ -231,21 +231,21 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
- <field name="holiday_type"/>
<field name="employee_id"/>
- <field name="category_id"/>
+ <field name="holiday_type" groups="base.group_hr_user"/>
+ <field name="name"/>
+ <field name="date_from"/>
+ <field name="date_to"/>
+ <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
+ <field name="state"/>
+ <field name="category_id" invisible="1"/>
<field name="department_id" invisible="not context.get('set_visible',False)"/>
- <field name="holiday_status_id"/>
- <field name="name"/>
- <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
- <field name="date_from"/>
- <field name="date_to"/>
+ <field name="holiday_status_id" invisible="1"/>
<field name="manager_id" invisible="1"/>
<field name="user_id" invisible="1"/>
<!--field name="type"/-->
- <field name="state"/>
- <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
- <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
+ <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager" invisible="1"/>
+ <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager" invisible="1"/>
</tree>
</field>
</record>
_______________________________________________
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
