nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-13 06:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58014 from frappe/mergify/bp/version-16-hotfix/pr-58009

Browse Source 
fix: require material transfer before job card start and completion (backport #58009)
This commit is contained in:
Mihir Kandoi
2026-08-11 13:48:01 +05:30
committed by GitHub
parent 4229161f4f 4ee276d3db
commit 3d134bdd60
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/manufacturing/doctype/job_card/job_card.js
View File

@@ -598,8 +598,7 @@ frappe.ui.form.on("Job Card", {
const has_remaining_qty = doc.for_quantity + doc.process_loss_qty > doc.total_completed_qty;
const pending_transfer =
has_items && doc.items.some((row) => flt(row.transferred_qty) < flt(row.required_qty));
const materials_ready =
doc.skip_material_transfer || !pending_transfer || !doc.finished_good || !has_items;
const materials_ready = doc.skip_material_transfer || doc.is_corrective_job_card || !pending_transfer;
let last_row = {};
const has_sub_ops_or_pending_qty = doc.sub_operations?.length || doc.pending_qty > 0;

2
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@@ -1579,6 +1579,7 @@ class JobCard(Document):
def start_timer(self, **kwargs):
frappe.has_permission("Job Card", "write", doc=self, throw=True)
self.validate_docstatus()
self.validate_transfer_qty()
if isinstance(kwargs, dict):
kwargs = frappe._dict(kwargs)
@@ -1596,6 +1597,7 @@ class JobCard(Document):
frappe.has_permission("Job Card", "write", doc=self, throw=True)
self.validate_docstatus()
self.validate_transfer_qty()
if isinstance(kwargs, dict):
kwargs = frappe._dict(kwargs)

25
erpnext/manufacturing/doctype/job_card/test_job_card.py
View File

@@ -361,6 +361,31 @@ class TestJobCard(ERPNextTestSuite):
# JC is Completed with excess transfer
self.assertEqual(job_card.status, "Completed")
def test_job_card_actions_blocked_until_material_transfer(self):
"Start and Complete must wait for the transfer when RMs move against Job Card."
self.transfer_material_against = "Job Card"
self.source_warehouse = "Stores - _TC"
self.generate_required_stock(self.work_order)
job_card = frappe.get_last_doc("Job Card", {"work_order": self.work_order.name})
self.assertRaises(frappe.ValidationError, job_card.start_timer, start_time=now())
self.assertRaises(frappe.ValidationError, job_card.complete_job_card, qty=2, for_quantity=2)
transfer_entry = make_stock_entry_from_jc(job_card.name)
transfer_entry.insert()
transfer_entry.submit()
job_card.reload()
job_card.append("time_logs", {"from_time": "2024-03-01 08:00:00"})
job_card.save()
job_card.complete_job_card(
qty=2, for_quantity=2, pending_qty=0, process_loss_qty=0, end_time="2024-03-01 09:00:00"
)
job_card.reload()
self.assertEqual(flt(job_card.total_completed_qty), 2)
@ERPNextTestSuite.change_settings("Manufacturing Settings", {"job_card_excess_transfer": 0})
def test_job_card_excess_material_transfer_block(self):
self.transfer_material_against = "Job Card"