pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_holidays: much better version of

Browse Source 
69297dbf81
This commit is contained in:
Richard Mathot
2014-09-17 10:23:02 +02:00
parent 4cf17179d5
commit cbda6e25a5
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/hr_holidays.py
+5 -4
View File
@@ -458,10 +458,11 @@ class hr_holidays(osv.osv):
'Please verify also the leaves waiting for validation.'))
return True
def set_payslip_status(self, cr, uid, ids, context=None):
holidays_obj = self.browse(cr, uid, ids, context=context)[0]
status = False if holidays_obj['payslip_status'] else True
return self.write(cr, uid, ids, {'payslip_status': status}, context=context)
def toggle_payslip_status(self, cr, uid, ids, context=None):
ids_to_set_true = self.search(cr, uid, [('id', 'in', ids), ('payslip_status', '=', False)], context=context)
ids_to_set_false = list(set(ids) - set(ids_to_set_true))
return self.write(cr, uid, ids_to_set_true, {'payslip_status': True}, context=context) and self.write(cr, uid, ids_to_set_false, {'payslip_status': False}, context=context)
class resource_calendar_leaves(osv.osv):
_inherit = "resource.calendar.leaves"
addons/hr_holidays/hr_holidays_view.xml
+3 -3
View File
@@ -158,7 +158,7 @@
<field name="date_to" required="1" on_change="onchange_date_to(date_to, date_from)"/>
<field name="number_of_days_temp" string="Allocated Days" sum="Remaining Days"/>
<field name="state"/>
<button name="set_payslip_status" field_name="payslip_status" type="object"
<button name="toggle_payslip_status" field_name="payslip_status" type="object"
widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="base.group_hr_manager"/>
<field name="report_note" groups="base.group_hr_manager"/>
<field name="payslip_status" invisible="1"/>
@@ -202,7 +202,7 @@
<field name="date_to"/>
<field name="holiday_status_id"/>
<field name="state"/>
<button name="set_payslip_status" field_name="payslip_status" type="object"
<button name="toggle_payslip_status" field_name="payslip_status" type="object"
widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="base.group_hr_manager"/>
<field name="report_note"/>
<field name="payslip_status" invisible="1"/>
@@ -225,7 +225,7 @@
<field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
<field name="state"/>
<field name="payslip_status" invisible="1"/>
<button name="set_payslip_status" field_name="payslip_status" type="object"
<button name="toggle_payslip_status" field_name="payslip_status" type="object"
widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="base.group_hr_manager"/>
<field name="category_id" invisible="1"/>
<field name="department_id" invisible="not context.get('set_visible',False)"/>