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.

Sign up for GitHub

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

Jump to bottom

fix: do not generate multiple invoices #28187

Merged
merged 2 commits into from
Nov 3, 2021
Merged

fix: do not generate multiple invoices #28187

merged 2 commits into from
Nov 3, 2021

Conversation

hrwX
Copy link
Contributor

@hrwX hrwX commented Nov 1, 2021 •
edited

  • fixes #28179
  • checks if the invoice date is between the current invoice period.
  • the invoice date was always smaller than invoice period hence there were multiple invoices being created.

@codecov
Copy link

codecov bot commented Nov 1, 2021 •
edited

Codecov Report

Merging #28187 (2bce193) into develop (ec0a724) will decrease coverage by 0.04%.
The diff coverage is 85.71%.

@@             Coverage Diff             @@
##           develop   #28187      +/-   ##
===========================================
- Coverage    55.41%   55.37%   -0.05%     
===========================================
  Files         1248     1248              
  Lines        67755    67756       +1     
===========================================
- Hits         37549    37517      -32     
- Misses       30206    30239      +33
Impacted Files Coverage Δ
...next/accounts/doctype/subscription/subscription.py 82.07% <85.71%> (-0.52%) ⬇️
...work_order_stock_report/work_order_stock_report.py 51.42% <0.00%> (-48.58%) ⬇️
...tch_item_expiry_status/batch_item_expiry_status.py 69.81% <0.00%> (-24.53%) ⬇️
...value/warehouse_wise_item_balance_age_and_value.py 92.59% <0.00%> (-2.47%) ⬇️
erpnext/stock/report/stock_ageing/stock_ageing.py 87.76% <0.00%> (-1.44%) ⬇️
.../report/stock_projected_qty/stock_projected_qty.py 87.01% <0.00%> (-1.30%) ⬇️
...eport/production_analytics/production_analytics.py 69.87% <0.00%> (-1.21%) ⬇️
erpnext/stock/reorder_item.py 76.27% <0.00%> (-0.85%) ⬇️
erpnext/stock/stock_ledger.py 85.50% <0.00%> (-0.37%) ⬇️
... and 7 more

@hrwX hrwX marked this pull request as ready for review November 1, 2021 16:24
@nextchamp-saqib
Copy link
Member

@Mergifyio backport version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Nov 2, 2021

backport version-13-hotfix

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@nextchamp-saqib
Copy link
Member

@Mergifyio backport version-13-pre-release

@mergify
Copy link
Contributor

mergify bot commented Nov 2, 2021

backport version-13-pre-release

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

nextchamp-saqib
nextchamp-saqib previously approved these changes Nov 2, 2021
View reviewed changes
@nextchamp-saqib nextchamp-saqib enabled auto-merge (squash) November 2, 2021 12:03
auto-merge was automatically disabled November 2, 2021 14:05

Head branch was pushed to by a user without write access

@hrwX
Copy link
Contributor Author

hrwX commented Nov 2, 2021

@nextchamp-saqib Can you check again, there was a failing test

@nextchamp-saqib nextchamp-saqib merged commit a5902fa into frappe:develop Nov 3, 2021
@mergify
Copy link
Contributor

mergify bot commented Nov 3, 2021

backport version-13-hotfix

✅ Backports have been created

This was referenced Nov 3, 2021
Merged
Merged
@mergify
Copy link
Contributor

mergify bot commented Nov 3, 2021

backport version-13-pre-release

✅ Backports have been created

@ankush ankush mentioned this pull request Nov 11, 2021
Closed
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 19, 2022
@fproldan
fix: do not generate multiple invoices (backport frappe#28187)
256569d
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 22, 2022
@fproldan @hrwX
@sagarvora @deepeshgarg007
Fixes subs (#532)
b38a9c2 
* fix: reorder updation of end date

(cherry picked from commit 0f03b19)

* fix: remove newline

(cherry picked from commit fc375c5)

* test: use `test_dependencies` instead of duplication

(cherry picked from commit 656015d)

* fix: create past invoices

(cherry picked from commit ae657c7)

* Update subscription.py

(cherry picked from commit 44306bd)

* fix: do not generate multiple invoices (backport frappe#28187)

* chore: remove __future__ py2 compatibility imports

* fix: Multicurrency invoices using subscription

(cherry picked from commit 0e4842b)

* fix: Add tests for multicurrency subscription

(cherry picked from commit 6ab7530)

* fix

Co-authored-by: hrwx <himanshuwarekar@yahoo.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
github-actions bot pushed a commit to fproldan/erpnext that referenced this pull request Dec 22, 2022
@fproldan @hrwX
@sagarvora @deepeshgarg007 @github-actions
Fixes subs (#532)
20a4610 
* fix: reorder updation of end date

(cherry picked from commit 0f03b19)

* fix: remove newline

(cherry picked from commit fc375c5)

* test: use `test_dependencies` instead of duplication

(cherry picked from commit 656015d)

* fix: create past invoices

(cherry picked from commit ae657c7)

* Update subscription.py

(cherry picked from commit 44306bd)

* fix: do not generate multiple invoices (backport frappe#28187)

* chore: remove __future__ py2 compatibility imports

* fix: Multicurrency invoices using subscription

(cherry picked from commit 0e4842b)

* fix: Add tests for multicurrency subscription

(cherry picked from commit 6ab7530)

* fix

Co-authored-by: hrwx <himanshuwarekar@yahoo.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
github-actions bot pushed a commit to fproldan/erpnext that referenced this pull request Dec 22, 2022
@fproldan @hrwX
@sagarvora @deepeshgarg007 @github-actions
Fixes subs (#532)
69e2525 
* fix: reorder updation of end date

(cherry picked from commit 0f03b19)

* fix: remove newline

(cherry picked from commit fc375c5)

* test: use `test_dependencies` instead of duplication

(cherry picked from commit 656015d)

* fix: create past invoices

(cherry picked from commit ae657c7)

* Update subscription.py

(cherry picked from commit 44306bd)

* fix: do not generate multiple invoices (backport frappe#28187)

* chore: remove __future__ py2 compatibility imports

* fix: Multicurrency invoices using subscription

(cherry picked from commit 0e4842b)

* fix: Add tests for multicurrency subscription

(cherry picked from commit 6ab7530)

* fix

Co-authored-by: hrwx <himanshuwarekar@yahoo.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
github-actions bot pushed a commit to fproldan/erpnext that referenced this pull request Dec 22, 2022
@fproldan @hrwX
@sagarvora @deepeshgarg007 @github-actions
Fixes subs (#532)
0a093de 
* fix: reorder updation of end date

(cherry picked from commit 0f03b19)

* fix: remove newline

(cherry picked from commit fc375c5)

* test: use `test_dependencies` instead of duplication

(cherry picked from commit 656015d)

* fix: create past invoices

(cherry picked from commit ae657c7)

* Update subscription.py

(cherry picked from commit 44306bd)

* fix: do not generate multiple invoices (backport frappe#28187)

* chore: remove __future__ py2 compatibility imports

* fix: Multicurrency invoices using subscription

(cherry picked from commit 0e4842b)

* fix: Add tests for multicurrency subscription

(cherry picked from commit 6ab7530)

* fix

Co-authored-by: hrwx <himanshuwarekar@yahoo.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@barredterra barredterra barredterra approved these changes

@nextchamp-saqib nextchamp-saqib nextchamp-saqib left review comments

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Multiple Subscription Invoices being raised every hour
3 participants
@hrwX @nextchamp-saqib @barredterra