Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX hr_holidays_usability use float_compare

Browse Source
This commit is contained in:
Alexis de Lattre
2017-06-09 13:09:37 +02:00
parent 6f8ffc403a
commit 4ee0d18712
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hr_holidays_usability/hr_holidays.py
View File

@@ -24,6 +24,7 @@ from openerp.osv import orm, fields
from openerp.tools.translate import _ from openerp.tools.translate import _
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, \ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, \
DEFAULT_SERVER_DATETIME_FORMAT DEFAULT_SERVER_DATETIME_FORMAT
from openerp.tools import float_compare
from datetime import datetime from datetime import datetime
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
import pytz import pytz
@@ -345,7 +346,8 @@ class HrHolidays(orm.Model):
False)[record.holiday_status_id.id]['remaining_leaves'] False)[record.holiday_status_id.id]['remaining_leaves']
# here is the code that I modify # here is the code that I modify
#if leaves_rest < record.number_of_days_temp: #if leaves_rest < record.number_of_days_temp:
if leaves_rest < record.number_of_days * -1: #if leaves_rest < record.number_of_days * -1:
if float_compare(leaves_rest, record.number_of_days * -1, precision_digits=2) < 0:
raise orm.except_orm( raise orm.except_orm(
_('Warning!'), _('Warning!'),
_('There are not enough %s allocated for ' _('There are not enough %s allocated for '

17
hr_holidays_usability/hr_holidays_view.xml
View File

@@ -180,12 +180,25 @@ This menu entry is designed for this and only accessible to HR Manager -->
<record id="hr_holidays_leave_force_number_action" model="ir.actions.act_window"> <record id="hr_holidays_leave_force_number_action" model="ir.actions.act_window">
<field name="name">Leave Requests Force Qty</field> <field name="name">Leave Requests Force Qty</field>
<field name="res_model">hr.holidays</field> <field name="res_model">hr.holidays</field>
<field name="view_mode">form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="hr_holidays_leave_force_number_form"/>
<field name="context">{'default_type': 'remove'}</field> <field name="context">{'default_type': 'remove'}</field>
<field name="domain">[('type','=','remove')]</field> <field name="domain">[('type','=','remove')]</field>
</record> </record>
<record id="hr_holidays_leave_force_number_tree_act_window_view" model="ir.actions.act_window.view">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_holiday"/>
<field name="act_window_id" ref="hr_holidays_leave_force_number_action"/>
</record>
<record id="hr_holidays_leave_force_number_form_act_window_view" model="ir.actions.act_window.view">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="hr_holidays_leave_force_number_form"/>
<field name="act_window_id" ref="hr_holidays_leave_force_number_action"/>
</record>
<menuitem id="hr_holidays_leave_force_number_menu" action="hr_holidays_leave_force_number_action" parent="hr_holidays.menu_open_ask_holidays" sequence="15" groups="base.group_hr_manager"/> <menuitem id="hr_holidays_leave_force_number_menu" action="hr_holidays_leave_force_number_action" parent="hr_holidays.menu_open_ask_holidays" sequence="15" groups="base.group_hr_manager"/>
<menuitem id="resource_calendar_leaves_cal_first_menu" <menuitem id="resource_calendar_leaves_cal_first_menu"