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: Add corrective job card operating cost as additional costs in s… (backport #45282) #45542

Merged
merged 9 commits into from
Jan 28, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 27, 2025

Reference issue #44976

This PR does two new things:

The operating cost of corrective job cards will now be added to the additional costs table of Manufacture Stock Entry.
Newly created corrective job cards will now have raw materials table pre-filled based on the job card it is being created from.

no-docs


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

…tock entry

(cherry picked from commit 2bf10f6)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
(cherry picked from commit 4fb48b7)
(cherry picked from commit 47f8a86)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
Copy link
Contributor Author

mergify bot commented Jan 27, 2025

Cherry-pick of 2bf10f6 has failed:

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

You are currently cherry-picking commit 2bf10f68a8.
  (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/manufacturing/doctype/bom/bom.py

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

Cherry-pick of 47f8a86 has failed:

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

You are currently cherry-picking commit 47f8a86003.
  (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/manufacturing/doctype/bom/bom.py
	modified:   erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.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

@mihir-kandoi mihir-kandoi force-pushed the mergify/bp/version-15-hotfix/pr-45282 branch from 7ad9152 to 1be1981 Compare January 28, 2025 04:39
@mihir-kandoi mihir-kandoi merged commit 6323e64 into version-15-hotfix Jan 28, 2025
11 checks passed
@mihir-kandoi mihir-kandoi deleted the mergify/bp/version-15-hotfix/pr-45282 branch January 28, 2025 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant