Merge branch 'staging' into develop

2026-08-24 04:26:38 +00:00 · 2019-01-05 09:11:15 +00:00
parent c466825a8a 094d539cd9
commit fdd5d54d41
13 changed files with 376 additions and 193 deletions
--- a/erpnext/projects/doctype/timesheet/test_timesheet.py
+++ b/erpnext/projects/doctype/timesheet/test_timesheet.py
@@ -186,6 +186,8 @@ def make_salary_structure_for_timesheet(employee):

 	if not frappe.db.get_value("Salary Structure Assignment",
 		{'employee':employee, 'docstatus': 1}):
+			frappe.db.set_value('Employee', employee, 'date_of_joining',
+				add_months(nowdate(), -5))
 			create_salary_structure_assignment(employee, salary_structure.name)

 	return salary_structure