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

fix: column sequence and add total

Browse Source
This commit is contained in:
Anurag Mishra 2019-06-13 16:08:01 +05:30
parent 0d7d4879a9
commit 05c17a505c
3 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,23 +30,23 @@ def get_columns():
"options": "Timesheet", "options": "Timesheet",
"width": 150 "width": 150
}, },
{
"label": _("Billable Hours"),
"fieldtype": "Float",
"fieldname": "total_billable_hours",
"width": 50
},
{ {
"label": _("Working Hours"), "label": _("Working Hours"),
"fieldtype": "Float", "fieldtype": "Float",
"fieldname": "total_hours", "fieldname": "total_hours",
"width": 50 "width": 150
},
{
"label": _("Billable Hours"),
"fieldtype": "Float",
"fieldname": "total_billable_hours",
"width": 150
}, },
{ {
"label": _("Billing Amount"), "label": _("Billing Amount"),
"fieldtype": "Currency", "fieldtype": "Currency",
"fieldname": "amount", "fieldname": "amount",
"width": 100 "width": 150
} }
] ]

42
erpnext/projects/report/employee_billing_summary/employee_billing_summary.json
View File

@ -1,34 +1,34 @@
{ {
"add_total_row": 0, "add_total_row": 1,
"creation": "2019-03-08 15:08:19.929728", "creation": "2019-03-08 15:08:19.929728",
"disable_prepared_report": 0, "disable_prepared_report": 0,
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Report", "doctype": "Report",
"idx": 0, "idx": 0,
"is_standard": "Yes", "is_standard": "Yes",
"modified": "2019-03-08 15:08:19.929728", "modified": "2019-06-13 15:54:49.213973",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Employee Billing Summary", "name": "Employee Billing Summary",
"owner": "Administrator", "owner": "Administrator",
"prepared_report": 0, "prepared_report": 0,
"ref_doctype": "Timesheet", "ref_doctype": "Timesheet",
"report_name": "Employee Billing Summary", "report_name": "Employee Billing Summary",
"report_type": "Script Report", "report_type": "Script Report",
"roles": [ "roles": [
{ {
"role": "Projects User" "role": "Projects User"
}, },
{ {
"role": "HR User" "role": "HR User"
}, },
{ {
"role": "Manufacturing User" "role": "Manufacturing User"
}, },
{ {
"role": "Employee" "role": "Employee"
}, },
{ {
"role": "Accounts User" "role": "Accounts User"
} }

42
erpnext/projects/report/project_billing_summary/project_billing_summary.json
View File

@ -1,34 +1,34 @@
{ {
"add_total_row": 0, "add_total_row": 1,
"creation": "2019-03-11 16:22:39.460524", "creation": "2019-03-11 16:22:39.460524",
"disable_prepared_report": 0, "disable_prepared_report": 0,
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Report", "doctype": "Report",
"idx": 0, "idx": 0,
"is_standard": "Yes", "is_standard": "Yes",
"modified": "2019-03-11 16:22:39.460524", "modified": "2019-06-13 15:54:55.255947",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Project Billing Summary", "name": "Project Billing Summary",
"owner": "Administrator", "owner": "Administrator",
"prepared_report": 0, "prepared_report": 0,
"ref_doctype": "Timesheet", "ref_doctype": "Timesheet",
"report_name": "Project Billing Summary", "report_name": "Project Billing Summary",
"report_type": "Script Report", "report_type": "Script Report",
"roles": [ "roles": [
{ {
"role": "Projects User" "role": "Projects User"
}, },
{ {
"role": "HR User" "role": "HR User"
}, },
{ {
"role": "Manufacturing User" "role": "Manufacturing User"
}, },
{ {
"role": "Employee" "role": "Employee"
}, },
{ {
"role": "Accounts User" "role": "Accounts User"
} }