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: include payments in purchase / sales register report (backport #36069) #36706

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2023

This is an automatic backport of pull request #36069 done by Mergify.
Cherry-pick of 4f0aa54 has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 4f0aa54c09.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/report/purchase_register/purchase_register.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/purchase_register/purchase_register.py

Cherry-pick of d7ffad1 has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d7ffad1dd3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/report/sales_register/sales_register.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	both modified:   erpnext/accounts/report/sales_register/sales_register.py

Cherry-pick of cbef6c3 has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit cbef6c30c3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	both modified:   erpnext/accounts/report/sales_register/sales_register.py
	both modified:   erpnext/accounts/report/utils.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d5aa0e3 has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d5aa0e325e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	both modified:   erpnext/accounts/report/sales_register/sales_register.py
	both modified:   erpnext/accounts/report/utils.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 1e8b8b5 has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1e8b8b5b29.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	both modified:   erpnext/accounts/report/sales_register/sales_register.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 6c11ca1 has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 8 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 6c11ca1b75.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	modified:   erpnext/accounts/report/sales_register/sales_register.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/utils.py

Cherry-pick of f5027fd has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 9 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f5027fdcaf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	modified:   erpnext/accounts/report/sales_register/sales_register.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/utils.py

Cherry-pick of bf08aa7 has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 10 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bf08aa7529.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	both modified:   erpnext/accounts/report/sales_register/sales_register.py
	both modified:   erpnext/accounts/report/utils.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 944244c has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 12 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 944244ceff.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/report/purchase_register/purchase_register.js
	modified:   erpnext/accounts/report/sales_register/sales_register.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	both modified:   erpnext/accounts/report/sales_register/sales_register.py
	both modified:   erpnext/accounts/report/utils.py

Cherry-pick of c084fe6 has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 13 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c084fe6b3f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	both modified:   erpnext/accounts/report/sales_register/sales_register.py
	both modified:   erpnext/accounts/report/utils.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 0d89bfa has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 14 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0d89bfacdb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/report/utils.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	both modified:   erpnext/accounts/report/sales_register/sales_register.py

Cherry-pick of 33f8f7d has failed:

On branch mergify/bp/version-14-hotfix/pr-36069
Your branch is ahead of 'origin/version-14-hotfix' by 18 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 33f8f7d7b3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/utils.py

no changes added to commit (use "git add" and/or "git commit -a")

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> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…e Register

(cherry picked from commit 4f0aa54)

# Conflicts:
#	erpnext/accounts/report/purchase_register/purchase_register.py
(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 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 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 33f8f7d)

# Conflicts:
#	erpnext/accounts/report/utils.py
(cherry picked from commit db49d53)
(cherry picked from commit b181813)
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36069 branch August 29, 2023 12:56
@GursheenK GursheenK restored the mergify/bp/version-14-hotfix/pr-36069 branch November 29, 2023 14:09
@GursheenK GursheenK reopened this Nov 29, 2023
@GursheenK GursheenK marked this pull request as draft November 29, 2023 14:42
@GursheenK GursheenK marked this pull request as ready for review November 30, 2023 09:44
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36069 branch December 2, 2023 14:21
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 1, 2024
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.

2 participants