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

Merge pull request #23622 from AfshanKhan/fix-billing-summary-report-precision

Browse Source 
fix: setting user defined precision instead of 2
This commit is contained in:
rohitwaghchaure 2020-10-13 22:46:02 +05:30 committed by GitHub
commit 4d93bfebd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/projects/report/billing_summary.py
View File

@ -6,6 +6,7 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import time_diff_in_hours, flt from frappe.utils import time_diff_in_hours, flt
from frappe.model.meta import get_field_precision
def get_columns(): def get_columns():
return [ return [
@ -136,6 +137,7 @@ def get_timesheet_details(filters, timesheet_list):
return timesheet_details_map return timesheet_details_map
def get_billable_and_total_duration(activity, start_time, end_time): def get_billable_and_total_duration(activity, start_time, end_time):
precision = frappe.get_precision("Timesheet Detail", "hours")
activity_duration = time_diff_in_hours(end_time, start_time) activity_duration = time_diff_in_hours(end_time, start_time)
billing_duration = 0.0 billing_duration = 0.0
if activity.billable: if activity.billable:
@ -143,4 +145,4 @@ def get_billable_and_total_duration(activity, start_time, end_time):
if activity_duration != activity.billing_hours: if activity_duration != activity.billing_hours:
billing_duration = activity_duration * activity.billing_hours / activity.hours billing_duration = activity_duration * activity.billing_hours / activity.hours
return flt(activity_duration, 2), flt(billing_duration, 2) return flt(activity_duration, precision), flt(billing_duration, precision)