nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-14 02:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28845 from ruchamahabal/fix-salary-slip-timesheet

Browse Source 
fix: incorrect amount based on payment days in timesheet salary slip
This commit is contained in:
Rucha Mahabal
2021-12-14 14:57:21 +05:30
committed by GitHub
parent 7fd06108bf
commit b027050f77
3 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/projects/doctype/timesheet/test_timesheet.py
View File

@@ -34,10 +34,6 @@ class TestTimesheet(unittest.TestCase):
for dt in ["Salary Slip", "Salary Structure", "Salary Structure Assignment", "Timesheet"]:
frappe.db.sql("delete from `tab%s`" % dt)
if not frappe.db.exists("Salary Component", "Timesheet Component"):
frappe.get_doc({"doctype": "Salary Component", "salary_component": "Timesheet Component"}).insert()
def test_timesheet_billing_amount(self):
emp = make_employee("test_employee_6@salary.com")
@@ -160,6 +156,9 @@ def make_salary_structure_for_timesheet(employee, company=None):
salary_structure_name = "Timesheet Salary Structure Test"
frequency = "Monthly"
if not frappe.db.exists("Salary Component", "Timesheet Component"):
frappe.get_doc({"doctype": "Salary Component", "salary_component": "Timesheet Component"}).insert()
salary_structure = make_salary_structure(salary_structure_name, frequency, company=company, dont_submit=True)
salary_structure.salary_component = "Timesheet Component"
salary_structure.salary_slip_based_on_timesheet = 1