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: Fields Modification for Subcontracting DocTypes (backport #42383) #42468

Merged
merged 3 commits into from
Jul 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 25, 2024

Current Issues:

  • All fields in both Subcontracting Order and Subcontracting Receipt are currently organized under a single tab which is less user-friendly and harder to navigate.

  • And field labels related to Supplier in subcontracting doctypes should be Job Worker, to accurately reflect the role in the subcontracting process.

After Changes:

  • Subcontracting Receipt

image

  • Subcontracting Order

image


This is an automatic backport of pull request #42383 done by Mergify.

* fix: fields renaming and reordering for enhanced user experience

* fix: dashboard data for stock entry

(cherry picked from commit 3023399)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
Copy link
Contributor Author

mergify bot commented Jul 25, 2024

Cherry-pick of 3023399 has failed:

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

You are currently cherry-picking commit 302339998f.
  (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/stock_entry/stock_entry.json
	new file:   erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py
	modified:   erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jul 25, 2024
fix: Field type is small text for v15
@vorasmit vorasmit merged commit 3a279db into version-15-hotfix Jul 26, 2024
11 checks passed
@vorasmit vorasmit deleted the mergify/bp/version-15-hotfix/pr-42383 branch July 26, 2024 10:54
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.31.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 Aug 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants