[FIX] payroll

bzr revid: mra@mra-laptop-20110331071802-7dht90mooy7egqf1
2011-03-31 12:48:02 +05:30
parent 3066f1206b
commit 2e4287681d
1 changed files with 2 additions and 2 deletions
@@ -451,8 +451,8 @@ class hr_payslip(osv.osv):
            dates = prev_bounds(record.date)
            sql = '''SELECT id FROM hr_holidays
                        WHERE date_from >= '%s' AND date_to <= '%s'
-                        AND employee_id = %s
-                        ''' % (dates[0], dates[1], record.employee_id.id)
+                        AND employee_id = %s AND contract_id = %s
+                        ''' % (dates[0], dates[1], record.employee_id.id, record.contract_id.id)
            cr.execute(sql)
            res = cr.fetchall()
            if res: