nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-14-hotfix' into show-party-values-when-naming-series-unset

Browse Source
This commit is contained in:
Gursheen Kaur Anand
2023-11-17 20:36:11 +05:30
committed by GitHub
parent 6b08aa2198 c7c751ecd0
commit 05d514ca8e
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

@@ -63,7 +63,7 @@ class Timesheet(Document):
def update_billing_hours(self, args): def update_billing_hours(self, args):
if args.is_billable: if args.is_billable:
if flt(args.billing_hours) == 0.0: if flt(args.billing_hours) == 0.0 or flt(args.billing_hours) > flt(args.hours):
args.billing_hours = args.hours args.billing_hours = args.hours
else: else:
args.billing_hours = 0 args.billing_hours = 0