* Fix Purchase Receipt tests

* Fix Item test

* Fix daily work summary test

* Modify currency exchange test cases

* Fix Leave Application test

* Update working hours when making salary slip from timesheet

* Replace fixer.io with exchangeratesapi

* Fix codacy
This commit is contained in:
Shreya Shah
2018-06-05 12:56:10 +05:30
committed by Nabin Hait
parent 81d12cc9c8
commit 630721aacc
11 changed files with 35 additions and 22 deletions

View File

@@ -381,6 +381,11 @@ def set_missing_values(time_sheet, target):
target.start_date = doc.start_date
target.end_date = doc.end_date
target.posting_date = doc.modified
target.total_working_hours = doc.total_hours
target.append('timesheets', {
'time_sheet': doc.name,
'working_hours': doc.total_hours
})
@frappe.whitelist()
def get_activity_cost(employee=None, activity_type=None):