diff --git a/erpnext/payroll/doctype/overtime_slip/overtime_slip.py b/erpnext/payroll/doctype/overtime_slip/overtime_slip.py index 7176c5d3643..6145112f954 100644 --- a/erpnext/payroll/doctype/overtime_slip/overtime_slip.py +++ b/erpnext/payroll/doctype/overtime_slip/overtime_slip.py @@ -116,7 +116,7 @@ class OvertimeSlip(Document): def get_attendance_record(self): if self.from_date and self.to_date: records = frappe.db.sql("""SELECT overtime_duration, name, attendance_date, overtime_type, standard_working_time - FROM `TabAttendance` + FROM `tabAttendance` WHERE attendance_date >= %s AND attendance_date <= %s AND employee = %s @@ -132,7 +132,7 @@ class OvertimeSlip(Document): if self.from_date and self.to_date: records = frappe.db.sql("""SELECT ts.name, ts.start_date, ts.end_date, tsd.overtime_on, tsd.overtime_type, tsd.overtime_hours - FROM `TabTimesheet` AS ts + FROM `tabTimesheet` AS ts INNER JOIN `tabTimesheet Detail` As tsd ON tsd.parent = ts.name WHERE ts.docstatus = 1 diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.py b/erpnext/payroll/doctype/salary_slip/salary_slip.py index 62514c4f420..3a56c8182fd 100644 --- a/erpnext/payroll/doctype/salary_slip/salary_slip.py +++ b/erpnext/payroll/doctype/salary_slip/salary_slip.py @@ -769,7 +769,7 @@ class SalarySlip(TransactionBase): tax_row = get_salary_component_data(d) self.update_component_row(tax_row, tax_amount, "deductions") - def update_component_row(self, component_data, amount, component_type, additional_salary=None, processed_overtime_slips =[]): + def update_component_row(self, component_data, amount, component_type, additional_salary=None, processed_overtime_slips =[], is_recurring=0): component_row = None for d in self.get(component_type): if d.salary_component != component_data.salary_component: