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: completed DC will not appear in a delivery trip (backport #41655) #41741

Merged
merged 3 commits into from
Jul 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 3, 2024

fixes: #41427

Set the condition for the delivery trip so that a completed Delivery Challan (DC) will not appear. Also, add the customer filter in the "Get stops from".

The docstatus 1 was removed from the delivery trip due to #38559, but docstatus 1 is still set in delivery_note.js, which is confusing because it is set in one place but not in another.

Currently, I haven't made any changes related to docstatus, but if you request, I will also update it in delivery_note.js.

Output:

scrnli_27_05_2024_15-35-21.mp4

This is an automatic backport of pull request #41655 done by [Mergify](https://mergify.com).

* fix: completed DC will not appear in a delivery trip

* fix: completed DC will not appear in a delivery trip

(cherry picked from commit 4f0214d)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.js
@mergify mergify bot requested a review from rohitwaghchaure as a code owner June 3, 2024 11:57
@mergify mergify bot added the conflicts label Jun 3, 2024
@mergify mergify bot requested a review from s-aga-r as a code owner June 3, 2024 11:57
Copy link
Contributor Author

mergify bot commented Jun 3, 2024

Cherry-pick of 4f0214d has failed:

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

You are currently cherry-picking commit 4f0214d00e.
  (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/stock/doctype/delivery_trip/delivery_trip.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/delivery_note/delivery_note.js

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@stale stale bot added the inactive label Jul 3, 2024
@frappe frappe deleted a comment from stale bot Jul 4, 2024
@stale stale bot removed the inactive label Jul 4, 2024
@ruthra-kumar ruthra-kumar merged commit b9c0f3f into version-15-hotfix Jul 10, 2024
5 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-41655 branch July 10, 2024 05:03
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.29.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants