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

fix: calculate total billing amount on fetching timesheets

Browse Source 
- show timesheet billing amounts in doc currency
This commit is contained in:
Rucha Mahabal
2021-05-20 23:02:11 +05:30
parent 8a407f1ec3
commit a7d0dbb085
4 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,9 +342,9 @@ def get_activity_cost(employee=None, activity_type=None, currency=None):
rate = frappe.db.get_values("Activity Type", {"activity_type": activity_type},
["costing_rate", "billing_rate"], as_dict=True)
if rate and currency and currency!=base_currency:
exchnage_rate = get_exchange_rate(base_currency, currency)
rate[0]["costing_rate"] = rate[0]["costing_rate"] * exchnage_rate
rate[0]["billing_rate"] = rate[0]["billing_rate"] * exchnage_rate
exchange_rate = get_exchange_rate(base_currency, currency)
rate[0]["costing_rate"] = rate[0]["costing_rate"] * exchange_rate
rate[0]["billing_rate"] = rate[0]["billing_rate"] * exchange_rate
return rate[0] if rate else {}