feat: add total_billing_hours to Sales Invoice
#26783
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@barredterra Can you fix the conflict and sider issues? I don't have edit access to this branch. Or you can give Edit Access to maintainers. |
|
The backport to |
|
Hi @nabinhait, @ruchamahabal mentioned some remaining issues that need to be addressed. Did you fix them yourself? |
Yes |
sagarvora
added a commit
that referenced
this pull request
Oct 4, 2021
* feat: add `total_billing_hours` to Sales Invoice * fix: re-save doctypes * fix: indentation * fix: replace reference to old function
frappe-pr-bot
pushed a commit
to frappe-pr-bot/erpnext
that referenced
this pull request
Oct 4, 2021
…rappe#27742) * feat: add `total_billing_hours` to Sales Invoice * fix: re-save doctypes * fix: indentation * fix: replace reference to old function (cherry picked from commit 09ccdee) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.js # erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json # erpnext/projects/doctype/timesheet/timesheet.py
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
…rappe#27742) * feat: add `total_billing_hours` to Sales Invoice * fix: re-save doctypes * fix: indentation * fix: replace reference to old function
mergify bot
pushed a commit
that referenced
this pull request
Feb 18, 2025
* feat: add `total_billing_hours` to Sales Invoice * fix: re-save doctypes * fix: indentation * fix: replace reference to old function (cherry picked from commit 09ccdee) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.js # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.py # erpnext/projects/doctype/timesheet/timesheet.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Port of #26652
Additional changes
refactor to keep only one way of adding timesheets to the sales invoice.
(Previously one function was fetching timesheets from the backend and adding them to the table in the frontend. Another one was calling a backend method that adds timesheets to the table and then refreshes the frontend. Now we use the first approach only.)
add
from_timeandto_timeto Sales Invoice Timesheet. This is useful for printing timesheets on the Sales Invoice for the customer to check.order timesheets by
start_time. Useful for the same reason.add some section and column breaks to Sales Invoice Timesheet
no-docs