nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-22 02:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: timesheet portal showing total billing hours

Browse Source 
(cherry picked from commit b04a07fda0)
This commit is contained in:
Mihir Kandoi
2025-05-09 13:38:42 +05:30
committed by Mergify
parent 005014ef6a
commit 64ae4e1fec
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/projects/doctype/timesheet/timesheet.py
View File

@@ -535,7 +535,7 @@ def get_timesheets_list(doctype, txt, filters, limit_start, limit_page_length=20
table.name, table.name,
child_table.activity_type, child_table.activity_type,
table.status, table.status,
table.total_billable_hours, child_table.billing_hours,
(table.sales_invoice | child_table.sales_invoice).as_("sales_invoice"), (table.sales_invoice | child_table.sales_invoice).as_("sales_invoice"),
child_table.project, child_table.project,
) )

2
erpnext/templates/includes/timesheet/timesheet_row.html
View File

@@ -5,7 +5,7 @@
{{ doc.name }} {{ doc.name }}
</span> </span>
</div> </div>
<div class="col-xs-2 small"> {{ doc.total_billable_hours }} </div> <div class="col-xs-2 small"> {{ doc.billing_hours }} </div>
<div class="col-xs-2 small"> {{ doc.project or '' }} </div> <div class="col-xs-2 small"> {{ doc.project or '' }} </div>
<div class="col-xs-2 small"> {{ doc.sales_invoice or '' }} </div> <div class="col-xs-2 small"> {{ doc.sales_invoice or '' }} </div>
<div class="col-xs-2 small"> {{ _(doc.activity_type) }} </div> <div class="col-xs-2 small"> {{ _(doc.activity_type) }} </div>