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

fix: incorrect status being set in Invoices #28019

Merged
merged 2 commits into from
Oct 20, 2021

Conversation

sagarvora
Copy link
Collaborator

@sagarvora sagarvora commented Oct 20, 2021

Fixes issues described in #27921, #27992, #28023

Failing test due to newly introduced QB check. Focus currently is on getting this fix out, so skipping QB for now.

@pruthvi145 pruthvi145 force-pushed the fix-invoice-statuses branch 3 times, most recently from f88c1d1 to 785244a Compare October 20, 2021 10:49
@sagarvora sagarvora marked this pull request as ready for review October 20, 2021 10:50
@sagarvora sagarvora marked this pull request as draft October 20, 2021 11:02
@pruthvi145 pruthvi145 force-pushed the fix-invoice-statuses branch from 785244a to 2e50c66 Compare October 20, 2021 11:05
@codecov
Copy link

codecov bot commented Oct 20, 2021

Codecov Report

Merging #28019 (5a18fb2) into develop (830fa60) will increase coverage by 0.07%.
The diff coverage is 95.55%.

@@             Coverage Diff             @@
##           develop   #28019      +/-   ##
===========================================
+ Coverage    54.26%   54.34%   +0.07%     
===========================================
  Files         1255     1255              
  Lines        67831    67851      +20     
===========================================
+ Hits         36810    36874      +64     
+ Misses       31021    30977      -44     
Impacted Files Coverage Δ
erpnext/controllers/accounts_controller.py 83.56% <0.00%> (-0.07%) ⬇️
erpnext/payroll/doctype/salary_slip/salary_slip.py 83.64% <94.73%> (+0.21%) ⬆️
...ounts/doctype/purchase_invoice/purchase_invoice.py 81.33% <100.00%> (+0.02%) ⬆️
...xt/accounts/doctype/sales_invoice/sales_invoice.py 76.67% <100.00%> (+0.17%) ⬆️
...oll/doctype/additional_salary/additional_salary.py 68.88% <100.00%> (+1.44%) ⬆️
...e/asset_value_adjustment/asset_value_adjustment.py 87.80% <0.00%> (-3.66%) ⬇️
erpnext/education/doctype/student/student.py 73.95% <0.00%> (-3.13%) ⬇️
...ion/doctype/course_enrollment/course_enrollment.py 45.09% <0.00%> (-1.97%) ⬇️
erpnext/stock/report/stock_ledger/stock_ledger.py 78.33% <0.00%> (-1.67%) ⬇️
...ctype/accounting_dimension/accounting_dimension.py 64.34% <0.00%> (-1.56%) ⬇️
... and 18 more

@pruthvi145 pruthvi145 force-pushed the fix-invoice-statuses branch from b5d7063 to 634c091 Compare October 20, 2021 12:11
@pruthvi145 pruthvi145 force-pushed the fix-invoice-statuses branch from 634c091 to 2ef4844 Compare October 20, 2021 12:11
@sagarvora sagarvora marked this pull request as ready for review October 20, 2021 12:12
@nextchamp-saqib
Copy link
Member

@Mergifyio backport version-13-hotfix

@nextchamp-saqib
Copy link
Member

@Mergifyio backport version-13-pre-release

@mergify
Copy link
Contributor

mergify bot commented Oct 20, 2021

backport version-13-hotfix

🟠 Waiting for conditions

  • merged [:pushpin: backport requirement]

@mergify
Copy link
Contributor

mergify bot commented Oct 20, 2021

backport version-13-pre-release

🟠 Waiting for conditions

  • merged [:pushpin: backport requirement]

@sagarvora sagarvora merged commit 8d9d098 into frappe:develop Oct 20, 2021
mergify bot pushed a commit that referenced this pull request Oct 20, 2021
Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
(cherry picked from commit 8d9d098)

# Conflicts:
#	erpnext/patches.txt
@mergify
Copy link
Contributor

mergify bot commented Oct 20, 2021

backport version-13-pre-release

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Oct 20, 2021
Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
(cherry picked from commit 8d9d098)

# Conflicts:
#	erpnext/patches.txt
@mergify
Copy link
Contributor

mergify bot commented Oct 20, 2021

backport version-13-hotfix

✅ Backports have been created

sagarvora added a commit that referenced this pull request Oct 20, 2021
* fix: incorrect status being set in Invoices (#28019)

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
(cherry picked from commit 8d9d098)

* fix: merge conflict

Co-authored-by: Sagar Vora <sagar@resilient.tech>
sagarvora added a commit that referenced this pull request Oct 20, 2021
* fix: incorrect status being set in Invoices (#28019)

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
(cherry picked from commit 8d9d098)

# Conflicts:
#	erpnext/patches.txt

* fix: merge conflict

Co-authored-by: Sagar Vora <sagar@resilient.tech>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
…rappe#28031)

* fix: incorrect status being set in Invoices (frappe#28019)

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
(cherry picked from commit 8d9d098)

# Conflicts:
#	erpnext/patches.txt

* fix: merge conflict

Co-authored-by: Sagar Vora <sagar@resilient.tech>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 12, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants