projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f08d7c2
)
[IMP]hr_holiday: remove date_to condition from domain for getting correct value
author
DBR (OpenERP)
<dbr@tinyerp.com>
Fri, 11 May 2012 10:23:14 +0000
(15:53 +0530)
committer
DBR (OpenERP)
<dbr@tinyerp.com>
Fri, 11 May 2012 10:23:14 +0000
(15:53 +0530)
bzr revid: dbr@tinyerp.com-
20120511102314
-3xx8ht0sylll31rw
addons/hr_holidays/hr_holidays.py
patch
|
blob
|
history
diff --git
a/addons/hr_holidays/hr_holidays.py
b/addons/hr_holidays/hr_holidays.py
index
43d7202
..
92becaf
100644
(file)
--- a/
addons/hr_holidays/hr_holidays.py
+++ b/
addons/hr_holidays/hr_holidays.py
@@
-487,7
+487,7
@@
class hr_employee(osv.osv):
def _get_leave_status(self, cr, uid, ids, name, args, context=None):
holidays_id = self.pool.get('hr.holidays').search(cr, uid,
[('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d %H:%M:%S')),
- ('date_to','>=',time.strftime('%Y-%m-%d %H:%M:%S')),('type','=','remove'),('state','not in',('cancel','refuse'))],
+ ('type','=','remove'),('state','not in',('cancel','refuse'))],
context=context)
result = {}
for id in ids: