Browse Source

chore: clean-up

- set default date filters for last month instead of year

- added abbreviations for columns to use them in the metrics labels
develop
Rucha Mahabal 3 years ago
parent
commit
2a1a472371
  1. 4
      erpnext/projects/report/employee_hours_utilization_based_on_timesheet/employee_hours_utilization_based_on_timesheet.js
  2. 20
      erpnext/projects/report/employee_hours_utilization_based_on_timesheet/employee_hours_utilization_based_on_timesheet.py

4
erpnext/projects/report/employee_hours_utilization_based_on_timesheet/employee_hours_utilization_based_on_timesheet.js

@ -16,14 +16,14 @@ frappe.query_reports["Employee Hours Utilization Based On Timesheet"] = {
fieldname: "from_date",
label: __("From Date"),
fieldtype: "Date",
default: frappe.defaults.get_global_default("year_start_date"),
default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
reqd: 1
},
{
fieldname:"to_date",
label: __("To Date"),
fieldtype: "Date",
default: frappe.defaults.get_global_default("year_end_date"),
default: frappe.datetime.now_date(),
reqd: 1
},
{

20
erpnext/projects/report/employee_hours_utilization_based_on_timesheet/employee_hours_utilization_based_on_timesheet.py

@ -57,34 +57,34 @@ class EmployeeHoursReport:
'options': 'Department',
'fieldname': 'department',
'fieldtype': 'Link',
'width': 170
'width': 120
},
{
'label': _('Total Hours'),
'label': _('Total Hours (T)'),
'fieldname': 'total_hours',
'fieldtype': 'Float',
'width': 150
'width': 120
},
{
'label': _('Billed Hours'),
'label': _('Billed Hours (B)'),
'fieldname': 'billed_hours',
'fieldtype': 'Float',
'width': 150
'width': 170
},
{
'label': _('Non-Billed Hours'),
'label': _('Non-Billed Hours (NB)'),
'fieldname': 'non_billed_hours',
'fieldtype': 'Float',
'width': 150
'width': 170
},
{
'label': _('Untracked Hours'),
'label': _('Untracked Hours (U)'),
'fieldname': 'untracked_hours',
'fieldtype': 'Float',
'width': 150
'width': 170
},
{
'label': _('% Utilization (Billed Hours + Non-Billed Hours / Total Hours)'),
'label': _('% Utilization (B + NB) / T'),
'fieldname': 'per_util',
'fieldtype': 'Percentage',
'width': 200

Loading…
Cancel
Save