Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add total_billing_hours to Sales Invoice (fp #26783) #27742

Merged
merged 4 commits into from
Oct 4, 2021

Conversation

sagarvora
Copy link
Collaborator

@sagarvora sagarvora commented Oct 2, 2021

To be backported again for consistency between branches and applying fixes 😅

@sagarvora sagarvora marked this pull request as draft October 2, 2021 07:20
@sagarvora sagarvora force-pushed the si_total_billing_hours branch from 5496ea1 to 9cfd1fd Compare October 2, 2021 07:32
@sagarvora sagarvora marked this pull request as ready for review October 2, 2021 07:54
@sagarvora sagarvora force-pushed the si_total_billing_hours branch from 1ff4eda to 1644489 Compare October 2, 2021 08:02
@sagarvora sagarvora changed the title feat: add total_billing_hours to Sales Invoice feat: add total_billing_hours to Sales Invoice (fp #26783) Oct 2, 2021
@sagarvora
Copy link
Collaborator Author

@nabinhait Let's not accept PRs directly into version-13-hotfix. These are hard to front-port (another example).

@codecov
Copy link

codecov bot commented Oct 2, 2021

Codecov Report

Merging #27742 (3885acc) into develop (5905cf9) will increase coverage by 0.11%.
The diff coverage is 90.00%.

❗ Current head 3885acc differs from pull request most recent head 711d1ff. Consider uploading reports for the commit 711d1ff to get more accurate results

@@             Coverage Diff             @@
##           develop   #27742      +/-   ##
===========================================
+ Coverage    54.54%   54.66%   +0.11%     
===========================================
  Files         1248     1343      +95     
  Lines        67517    71049    +3532     
===========================================
+ Hits         36830    38837    +2007     
- Misses       30687    32212    +1525     
Impacted Files Coverage Δ
erpnext/projects/doctype/timesheet/timesheet.py 79.35% <83.33%> (+0.16%) ⬆️
...xt/accounts/doctype/sales_invoice/sales_invoice.py 75.32% <100.00%> (-1.50%) ⬇️
erpnext/education/doctype/student/student.py 74.46% <0.00%> (-3.20%) ⬇️
erpnext/assets/doctype/asset/depreciation.py 84.55% <0.00%> (-2.95%) ⬇️
...ion/doctype/course_enrollment/course_enrollment.py 45.09% <0.00%> (-1.97%) ⬇️
erpnext/controllers/queries.py 58.52% <0.00%> (-1.80%) ⬇️
erpnext/stock/report/stock_ledger/stock_ledger.py 80.00% <0.00%> (-0.84%) ⬇️
...ype/account/chart_of_accounts/chart_of_accounts.py 78.62% <0.00%> (-0.69%) ⬇️
erpnext/regional/india/utils.py 65.26% <0.00%> (-0.48%) ⬇️
... and 116 more

@sagarvora sagarvora force-pushed the si_total_billing_hours branch from 4e785b9 to 3885acc Compare October 3, 2021 08:14
@sagarvora sagarvora force-pushed the si_total_billing_hours branch from 3885acc to 711d1ff Compare October 4, 2021 11:10
@sagarvora sagarvora merged commit 09ccdee into frappe:develop Oct 4, 2021
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
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 18, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant