-
Notifications
You must be signed in to change notification settings - Fork 7.1k
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: include payments in purchase / sales register report (backport #36069) #36706
Closed
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
…e Register (cherry picked from commit 4f0aa54) # Conflicts: # erpnext/accounts/report/purchase_register/purchase_register.py
(cherry picked from commit 4449370)
(cherry picked from commit d7ffad1) # Conflicts: # erpnext/accounts/report/purchase_register/purchase_register.py # erpnext/accounts/report/sales_register/sales_register.py
(cherry picked from commit cbef6c3) # Conflicts: # erpnext/accounts/report/purchase_register/purchase_register.py # erpnext/accounts/report/sales_register/sales_register.py # erpnext/accounts/report/utils.py
(cherry picked from commit 9c87997)
(cherry picked from commit d5aa0e3) # Conflicts: # erpnext/accounts/report/purchase_register/purchase_register.py # erpnext/accounts/report/sales_register/sales_register.py # erpnext/accounts/report/utils.py
(cherry picked from commit 7650b00)
(cherry picked from commit 1e8b8b5) # Conflicts: # erpnext/accounts/report/purchase_register/purchase_register.py # erpnext/accounts/report/sales_register/sales_register.py
(cherry picked from commit 6c11ca1) # Conflicts: # erpnext/accounts/report/utils.py
(cherry picked from commit f5027fd) # Conflicts: # erpnext/accounts/report/utils.py
(cherry picked from commit bf08aa7) # Conflicts: # erpnext/accounts/report/purchase_register/purchase_register.py # erpnext/accounts/report/sales_register/sales_register.py # erpnext/accounts/report/utils.py
(cherry picked from commit c973e3c)
(cherry picked from commit 944244c) # Conflicts: # erpnext/accounts/report/purchase_register/purchase_register.py # erpnext/accounts/report/sales_register/sales_register.py # erpnext/accounts/report/utils.py
(cherry picked from commit c084fe6) # Conflicts: # erpnext/accounts/report/purchase_register/purchase_register.py # erpnext/accounts/report/sales_register/sales_register.py # erpnext/accounts/report/utils.py
(cherry picked from commit 0d89bfa) # Conflicts: # erpnext/accounts/report/purchase_register/purchase_register.py # erpnext/accounts/report/sales_register/sales_register.py
(cherry picked from commit b8a83f5)
(cherry picked from commit a93d763)
(cherry picked from commit 2f7b112)
(cherry picked from commit 33f8f7d) # Conflicts: # erpnext/accounts/report/utils.py
(cherry picked from commit 1c033ce)
(cherry picked from commit 59a2a04)
(cherry picked from commit db49d53)
(cherry picked from commit e6d66fe)
(cherry picked from commit 95c6f4d)
(cherry picked from commit 341709a)
(cherry picked from commit b181813)
mergify
bot
requested review from
deepeshgarg007 and
ruthra-kumar
as code owners
August 18, 2023 07:08
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is an automatic backport of pull request #36069 done by Mergify.
Cherry-pick of 4f0aa54 has failed:
Cherry-pick of d7ffad1 has failed:
Cherry-pick of cbef6c3 has failed:
Cherry-pick of d5aa0e3 has failed:
Cherry-pick of 1e8b8b5 has failed:
Cherry-pick of 6c11ca1 has failed:
Cherry-pick of f5027fd has failed:
Cherry-pick of bf08aa7 has failed:
Cherry-pick of 944244c has failed:
Cherry-pick of c084fe6 has failed:
Cherry-pick of 0d89bfa has failed:
Cherry-pick of 33f8f7d has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com