CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-14 10:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Timesheet): don't use billing_hours for costing amount (#50394)

Browse Source
This commit is contained in:
Patrick Eißler
2025-11-07 08:56:44 +01:00
committed by GitHub
parent 8e199af118
commit 29c976e9ae
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,7 +285,7 @@ class Timesheet(Document):
if data.activity_type or data.is_billable: if data.activity_type or data.is_billable:
rate = get_activity_cost(self.employee, data.activity_type) rate = get_activity_cost(self.employee, data.activity_type)
hours = data.billing_hours or 0 hours = data.billing_hours or 0
costing_hours = data.billing_hours or data.hours or 0 costing_hours = data.hours or 0
if rate: if rate:
data.billing_rate = ( data.billing_rate = (
flt(rate.get("billing_rate")) if flt(data.billing_rate) == 0 else data.billing_rate flt(rate.get("billing_rate")) if flt(data.billing_rate) == 0 else data.billing_rate