nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-03 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6460 from KanchanChauhan/salary-slip-fixes

Browse Source 
[Fix]Salary Slip can be created without salary structure
This commit is contained in:
Nabin Hait
2016-09-28 12:55:04 +05:30
committed by GitHub
parent ba03ef775d 273c5e71fd
commit 1e97fc8687
7 changed files with 81 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ class TestTimesheet(unittest.TestCase):
self.assertEquals(salary_slip.total_working_hours, 2)
self.assertEquals(salary_slip.hour_rate, 50)
self.assertEquals(salary_slip.net_pay, 50)
self.assertEquals(salary_slip.net_pay, 150)
self.assertEquals(salary_slip.timesheets[0].time_sheet, timesheet.name)
self.assertEquals(salary_slip.timesheets[0].working_hours, 2)

1
erpnext/projects/doctype/timesheet/timesheet.py
View File

@@ -345,6 +345,7 @@ def set_missing_values(time_sheet, target):
target.salary_slip_based_on_timesheet = 1
target.start_date = doc.start_date
target.end_date = doc.end_date
target.posting_date = doc.modified
@frappe.whitelist()
def get_activity_cost(employee=None, activity_type=None):