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: using DN for transfer w/o internal customer (backport #27798) (backport #27805) #27807

Merged
merged 3 commits into from
Oct 5, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 5, 2021

This is an automatic backport of pull request #27805 done by Mergify.
Cherry-pick of fa94438 has failed:

On branch mergify/bp/develop/pr-27805
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit fa944382c5.
  (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/controllers/selling_controller.py
	modified:   erpnext/stock/doctype/delivery_note/delivery_note.py
	modified:   erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

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

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.io/

…27805)

* fix: using DN for transfer w/o internal customer (#27798)

This used to be work before though not "advertised", since a lot of
users have started using it as feature, it can't be broken now.

(cherry picked from commit df1f8fd)

* fix(ux): use toast instead of popup

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit fa94438)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@ankush ankush self-assigned this Oct 5, 2021
@ankush ankush added squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. and removed conflicts labels Oct 5, 2021
@ankush ankush merged commit 233bf5d into develop Oct 5, 2021
@mergify mergify bot deleted the mergify/bp/develop/pr-27805 branch October 5, 2021 10:46
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
…) (backport frappe#27805) (frappe#27807)

* fix: using DN for transfer w/o internal customer (backport frappe#27798) (frappe#27805)

* fix: using DN for transfer w/o internal customer (frappe#27798)

This used to be work before though not "advertised", since a lot of
users have started using it as feature, it can't be broken now.

(cherry picked from commit 9485ef9)

* fix(ux): use toast instead of popup

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit 6187f97)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

* fix: resolve conflict

* fix: resolve conflicts

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant