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

fix: Removed raw query and used frappe.get_all

Browse Source
This commit is contained in:
Anurag Mishra 2019-03-12 13:12:31 +05:30
parent f71c147ea8
commit 0dc62e8747
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@ import frappe
from frappe import _ from frappe import _
from frappe.utils import time_diff_in_hours from frappe.utils import time_diff_in_hours
def get_columns(): def get_columns():
return [ return [
{ {
@ -53,7 +52,6 @@ def get_columns():
def get_data(filters): def get_data(filters):
data = [] data = []
record = get_records(filters) record = get_records(filters)
for entries in record: for entries in record:
@ -61,27 +59,20 @@ def get_data(filters):
total_billable_hours = 0 total_billable_hours = 0
total_amount = 0 total_amount = 0
entries_exists = False entries_exists = False
timesheet_details = get_timesheet_details(filters, entries.name) timesheet_details = get_timesheet_details(filters, entries.name)
for activity in timesheet_details: for activity in timesheet_details:
entries_exists = True entries_exists = True
time_start = activity.from_time time_start = activity.from_time
time_end = frappe.utils.add_to_date(activity.from_time, hours=activity.hours) time_end = frappe.utils.add_to_date(activity.from_time, hours=activity.hours)
from_date = frappe.utils.get_datetime(filters.from_date) from_date = frappe.utils.get_datetime(filters.from_date)
to_date = frappe.utils.get_datetime(filters.to_date) to_date = frappe.utils.get_datetime(filters.to_date)
if time_start <= from_date and time_end <= to_date: if time_start <= from_date and time_end <= to_date:
total_hours, total_billable_hours, total_amount = get_billable_and_total_hours(activity, total_hours, total_billable_hours, total_amount = get_billable_and_total_hours(activity,
time_end, from_date, total_hours, total_billable_hours, total_amount) time_end, from_date, total_hours, total_billable_hours, total_amount)
elif time_start >= from_date and time_end >= to_date: elif time_start >= from_date and time_end >= to_date:
total_hours, total_billable_hours, total_amount = get_billable_and_total_hours(activity, total_hours, total_billable_hours, total_amount = get_billable_and_total_hours(activity,
to_date, time_start, total_hours, total_billable_hours, total_amount) to_date, time_start, total_hours, total_billable_hours, total_amount)
elif time_start >= from_date and time_end <= to_date: elif time_start >= from_date and time_end <= to_date:
total_hours, total_billable_hours, total_amount = get_billable_and_total_hours(activity, total_hours, total_billable_hours, total_amount = get_billable_and_total_hours(activity,
time_end, time_start, total_hours, total_billable_hours, total_amount) time_end, time_start, total_hours, total_billable_hours, total_amount)
@ -102,28 +93,15 @@ def get_data(filters):
return data return data
def get_records(filters): def get_records(filters):
if "employee" in filters: record_filters = [
return frappe.db.sql('''SELECT ["start_date", "<=", filters.to_date],
employee, employee_name, name, total_billable_hours, total_hours, total_billable_amount ["end_date", ">=", filters.from_date]
FROM ]
`tabTimesheet`
WHERE
employee = %s and (start_date <= %s and end_date >= %s)''',
(filters.employee, filters.to_date, filters.from_date),
as_dict=1
)
elif "project" in filters: if "employee" in filters:
return frappe.db.sql('''SELECT record_filters.append(["employee", "=", filters.employee])
employee, employee_name, name, total_billable_hours, total_hours, total_billable_amount
FROM return frappe.get_all("Timesheet", filters=record_filters, fields=[" * "] )
`tabTimesheet`
WHERE
start_date <= %s and end_date >= %s''',(filters.to_date, filters.from_date),
as_dict=1
)
else:
return {}
def get_billable_and_total_hours(activity, end, start, total_hours, total_billable_hours, total_amount): def get_billable_and_total_hours(activity, end, start, total_hours, total_billable_hours, total_amount):
total_hours += abs(time_diff_in_hours(end, start)) total_hours += abs(time_diff_in_hours(end, start))
@ -142,4 +120,4 @@ def get_timesheet_details(filters, parent):
"Timesheet Detail", "Timesheet Detail",
filters = timesheet_details_filter, filters = timesheet_details_filter,
fields=["*"] fields=["*"]
) )