Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Timesheet): warn user if billing hours > actual hours instead of resetting (backport #38239) (#38241)

Browse Source 
fix(Timesheet): warn user if billing hours > actual hours instead of resetting  (#38239)

* revert: "fix(Timesheet): reset billing hours equal to hours if they exceed actual hours"

This reverts commit 0ec8034507996f06eaf8ca13a414d10b34038c6c.

* fix: warn user if billing hours > actual hours

(cherry picked from commit ac91030b31f1108b7e32844f12a3a6c916c0120f)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This commit is contained in:
mergify[bot] 2023-11-21 13:41:50 +05:30 committed by GitHub
parent bb77546849
commit 1f2f5d8cf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,8 +69,14 @@ class Timesheet(Document):
def update_billing_hours(self, args):
if args.is_billable:
if flt(args.billing_hours) == 0.0 or flt(args.billing_hours) > flt(args.hours):
if flt(args.billing_hours) == 0.0:
args.billing_hours = args.hours
elif flt(args.billing_hours) > flt(args.hours):
frappe.msgprint(
_("Warning - Row {0}: Billing Hours are more than Actual Hours").format(args.idx),
indicator="orange",
alert=True,
)
else:
args.billing_hours = 0