mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-18 09:05:00 +00:00
Merge branch 'version-14-hotfix' into show-party-values-when-naming-series-unset
This commit is contained in:
@@ -63,7 +63,7 @@ class Timesheet(Document):
|
||||
|
||||
def update_billing_hours(self, args):
|
||||
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
|
||||
else:
|
||||
args.billing_hours = 0
|
||||
|
||||
Reference in New Issue
Block a user