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: multiple pos issues (copy #30324) #30515

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 31, 2022

This is an automatic copy of pull request #30324 done by Mergify.
Cherry-pick of aff7408 has failed:

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

You are currently cherry-picking commit aff7408775.
  (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/doctype/pos_profile/pos_profile.json
	modified:   erpnext/selling/page/point_of_sale/pos_controller.js
	modified:   erpnext/selling/page/point_of_sale/pos_payment.js

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

Cherry-pick of f2ae63c has failed:

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

You are currently cherry-picking commit f2ae63cbfd.
  (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/doctype/pos_invoice/pos_invoice.json
	modified:   erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/pos_invoice/pos_invoice.py
	both modified:   erpnext/stock/doctype/serial_no/serial_no.py

Cherry-pick of cf51a0a has failed:

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

You are currently cherry-picking commit cf51a0a1b8.
  (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/doctype/pos_invoice_reference/pos_invoice_reference.json

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

Cherry-pick of 16253a2 has failed:

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

You are currently cherry-picking commit 16253a2f72.
  (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:
	new file:   erpnext/patches/v13_0/set_return_against_in_pos_invoice_references.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

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

(cherry picked from commit aff7408)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
(cherry picked from commit f2ae63c)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
#	erpnext/stock/doctype/serial_no/serial_no.py
(cherry picked from commit cf51a0a)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
#	erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
(cherry picked from commit cb4873c)
(cherry picked from commit 1b556d1)
(cherry picked from commit 16253a2)

# Conflicts:
#	erpnext/patches.txt
(cherry picked from commit e0c36d8)
@nextchamp-saqib nextchamp-saqib merged commit 9a5acc3 into version-13-hotfix Apr 1, 2022
@mergify mergify bot deleted the mergify/copy/version-13-hotfix/pr-30324 branch April 1, 2022 06:41
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 4, 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.

1 participant