mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 00:14:50 +00:00
chore: mass trailing whitespace and EOF fixes
This commit is contained in:
@@ -144,4 +144,4 @@ def get_billable_and_total_duration(activity, start_time, end_time):
|
||||
if activity_duration != activity.billing_hours:
|
||||
billing_duration = activity_duration * activity.billing_hours / activity.hours
|
||||
|
||||
return flt(activity_duration, precision), flt(billing_duration, precision)
|
||||
return flt(activity_duration, precision), flt(billing_duration, precision)
|
||||
|
||||
@@ -20,8 +20,8 @@ def execute(filters=None):
|
||||
return columns, data
|
||||
|
||||
def get_column():
|
||||
return [_("Timesheet") + ":Link/Timesheet:120", _("Employee") + "::150", _("Employee Name") + "::150",
|
||||
_("From Datetime") + "::140", _("To Datetime") + "::140", _("Hours") + "::70",
|
||||
return [_("Timesheet") + ":Link/Timesheet:120", _("Employee") + "::150", _("Employee Name") + "::150",
|
||||
_("From Datetime") + "::140", _("To Datetime") + "::140", _("Hours") + "::70",
|
||||
_("Activity Type") + "::120", _("Task") + ":Link/Task:150",
|
||||
_("Project") + ":Link/Project:120", _("Status") + "::70"]
|
||||
|
||||
@@ -45,4 +45,4 @@ def get_conditions(filters):
|
||||
if match_conditions:
|
||||
conditions += " and %s" % match_conditions
|
||||
|
||||
return conditions
|
||||
return conditions
|
||||
|
||||
@@ -10,7 +10,7 @@ class TestDelayedTasksSummary(unittest.TestCase):
|
||||
def setUp(self):
|
||||
task1 = create_task("_Test Task 98", add_days(nowdate(), -10), nowdate())
|
||||
create_task("_Test Task 99", add_days(nowdate(), -10), add_days(nowdate(), -1))
|
||||
|
||||
|
||||
task1.status = "Completed"
|
||||
task1.completed_on = add_days(nowdate(), -1)
|
||||
task1.save()
|
||||
@@ -38,7 +38,7 @@ class TestDelayedTasksSummary(unittest.TestCase):
|
||||
]
|
||||
report = execute(filters)
|
||||
data = list(filter(lambda x: x.subject == "_Test Task 99", report[1]))[0]
|
||||
|
||||
|
||||
for key in ["subject", "status", "priority", "delay"]:
|
||||
self.assertEqual(expected_data[0].get(key), data.get(key))
|
||||
|
||||
@@ -51,4 +51,4 @@ class TestDelayedTasksSummary(unittest.TestCase):
|
||||
|
||||
def tearDown(self):
|
||||
for task in ["_Test Task 98", "_Test Task 99"]:
|
||||
frappe.get_doc("Task", {"subject": task}).delete()
|
||||
frappe.get_doc("Task", {"subject": task}).delete()
|
||||
|
||||
@@ -11,4 +11,4 @@ def execute(filters=None):
|
||||
columns = get_columns()
|
||||
|
||||
data = get_data(filters)
|
||||
return columns, data
|
||||
return columns, data
|
||||
|
||||
@@ -195,4 +195,4 @@ class TestEmployeeUtilization(unittest.TestCase):
|
||||
'per_util': 27.78,
|
||||
'per_util_billed_only': 27.78
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
@@ -11,4 +11,4 @@ def execute(filters=None):
|
||||
columns = get_columns()
|
||||
|
||||
data = get_data(filters)
|
||||
return columns, data
|
||||
return columns, data
|
||||
|
||||
@@ -208,4 +208,4 @@ def get_columns():
|
||||
"options": "Currency",
|
||||
"width": 80
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user