nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 02:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58946 from frappe/mergify/bp/version-15-hotfix/pr-58927

Browse Source 
fix(manufacturing): handle empty raw materials in workstation (backport #58927)
This commit is contained in:
Sudharsanan Ashok
2026-09-10 18:08:52 +05:30
committed by GitHub
parent e37ba3f8cf c72bc6925b
commit bb0140ff3f
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1182,7 +1182,7 @@ def make_material_request(source_name, target_doc=None):
@frappe.whitelist()
def make_stock_entry(source_name, target_doc=None):
def make_stock_entry(source_name: str, target_doc: Document | str | None = None):
def update_item(source, target, source_parent):
target.t_warehouse = source_parent.wip_warehouse
@@ -1194,6 +1194,9 @@ def make_stock_entry(source_name, target_doc=None):
target.qty = pending_rm_qty
def set_missing_values(source, target):
if not source.items:
frappe.throw(_("This Job Card has no raw materials to transfer."))
target.purpose = "Material Transfer for Manufacture"
target.from_bom = 1

48
erpnext/manufacturing/doctype/workstation/test_workstation.py
View File

@@ -4,20 +4,66 @@ import frappe
from frappe.test_runner import make_test_records
from frappe.tests.utils import FrappeTestCase
from erpnext.manufacturing.doctype.job_card.job_card import make_stock_entry
from erpnext.manufacturing.doctype.operation.test_operation import make_operation
from erpnext.manufacturing.doctype.routing.test_routing import create_routing, setup_bom
from erpnext.manufacturing.doctype.workstation.workstation import (
NotInWorkingHoursError,
WorkstationHolidayError,
check_if_within_operating_hours,
get_raw_materials,
)
test_dependencies = ["Warehouse"]
test_dependencies = ["Warehouse", "Item"]
test_records = frappe.get_test_records("Workstation")
make_test_records("Workstation")
class TestWorkstation(FrappeTestCase):
def test_get_raw_materials_without_items(self):
job_card = frappe.get_doc(
{
"doctype": "Job Card",
"company": "_Test Company",
"wip_warehouse": "_Test Warehouse 1 - _TC",
}
).insert(ignore_mandatory=True)
self.assertEqual(get_raw_materials([job_card.name]), {})
with self.assertRaisesRegex(frappe.ValidationError, "This Job Card has no raw materials to transfer"):
make_stock_entry(job_card.name)
job_card.reload()
self.assertFalse(job_card.items)
self.assertFalse(frappe.db.exists("Stock Entry", {"job_card": job_card.name}))
def test_get_raw_materials_with_items(self):
job_card = frappe.get_doc(
{
"doctype": "Job Card",
"company": "_Test Company",
"wip_warehouse": "_Test Warehouse 1 - _TC",
"items": [
{
"item_code": "_Test Item",
"source_warehouse": "_Test Warehouse - _TC",
"required_qty": 5,
"transferred_qty": 2,
}
],
}
).insert(ignore_mandatory=True)
materials = get_raw_materials([job_card.name])
self.assertEqual(list(materials), [job_card.name])
self.assertEqual(len(materials[job_card.name]), 1)
material = materials[job_card.name][0]
self.assertEqual(material.item_code, "_Test Item")
self.assertEqual(material.required_qty, 5)
self.assertEqual(material.transferred_qty, 2)
self.assertEqual(material.source_warehouse, "_Test Warehouse - _TC")
def test_validate_timings(self):
check_if_within_operating_hours(
"_Test Workstation 1", "Operation 1", "2013-02-02 11:00:00", "2013-02-02 19:00:00"