mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-20 07:15:11 +00:00
* fix: material request status (#44917)
(cherry picked from commit 1319ce4bc1)
* chore: fix test case
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
@@ -126,9 +126,13 @@ status_map = {
|
|||||||
"Partially Received",
|
"Partially Received",
|
||||||
"eval:self.status != 'Stopped' and self.per_received > 0 and self.per_received < 100 and self.docstatus == 1 and self.material_request_type == 'Purchase'",
|
"eval:self.status != 'Stopped' and self.per_received > 0 and self.per_received < 100 and self.docstatus == 1 and self.material_request_type == 'Purchase'",
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
"Partially Received",
|
||||||
|
"eval:self.status != 'Stopped' and self.per_ordered < 100 and self.per_ordered > 0 and self.docstatus == 1 and self.material_request_type == 'Material Transfer'",
|
||||||
|
],
|
||||||
[
|
[
|
||||||
"Partially Ordered",
|
"Partially Ordered",
|
||||||
"eval:self.status != 'Stopped' and self.per_ordered < 100 and self.per_ordered > 0 and self.docstatus == 1",
|
"eval:self.status != 'Stopped' and self.per_ordered < 100 and self.per_ordered > 0 and self.docstatus == 1 and self.material_request_type != 'Material Transfer'",
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
"Manufactured",
|
"Manufactured",
|
||||||
|
|||||||
@@ -14,6 +14,12 @@ frappe.listview_settings["Material Request"] = {
|
|||||||
}
|
}
|
||||||
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) == 0) {
|
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) == 0) {
|
||||||
return [__("Pending"), "orange", "per_ordered,=,0"];
|
return [__("Pending"), "orange", "per_ordered,=,0"];
|
||||||
|
} else if (
|
||||||
|
doc.docstatus == 1 &&
|
||||||
|
flt(doc.per_ordered, precision) < 100 &&
|
||||||
|
doc.material_request_type == "Material Transfer"
|
||||||
|
) {
|
||||||
|
return [__("Partially Received"), "yellow", "per_ordered,<,100"];
|
||||||
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) < 100) {
|
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) < 100) {
|
||||||
return [__("Partially ordered"), "yellow", "per_ordered,<,100"];
|
return [__("Partially ordered"), "yellow", "per_ordered,<,100"];
|
||||||
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) == 100) {
|
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) == 100) {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ from erpnext.stock.doctype.material_request.material_request import (
|
|||||||
make_supplier_quotation,
|
make_supplier_quotation,
|
||||||
raise_work_orders,
|
raise_work_orders,
|
||||||
)
|
)
|
||||||
|
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
|
||||||
|
|
||||||
|
|
||||||
class TestMaterialRequest(FrappeTestCase):
|
class TestMaterialRequest(FrappeTestCase):
|
||||||
@@ -59,6 +60,43 @@ class TestMaterialRequest(FrappeTestCase):
|
|||||||
self.assertEqual(se.doctype, "Stock Entry")
|
self.assertEqual(se.doctype, "Stock Entry")
|
||||||
self.assertEqual(len(se.get("items")), len(mr.get("items")))
|
self.assertEqual(len(se.get("items")), len(mr.get("items")))
|
||||||
|
|
||||||
|
def test_partial_make_stock_entry(self):
|
||||||
|
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry as _make_stock_entry
|
||||||
|
|
||||||
|
mr = frappe.copy_doc(test_records[0]).insert()
|
||||||
|
|
||||||
|
source_wh = create_warehouse(
|
||||||
|
warehouse_name="_Test Source Warehouse",
|
||||||
|
properties={"parent_warehouse": "All Warehouses - _TC"},
|
||||||
|
company="_Test Company",
|
||||||
|
)
|
||||||
|
|
||||||
|
mr = frappe.get_doc("Material Request", mr.name)
|
||||||
|
mr.material_request_type = "Material Transfer"
|
||||||
|
|
||||||
|
for row in mr.items:
|
||||||
|
_make_stock_entry(
|
||||||
|
item_code=row.item_code,
|
||||||
|
qty=10,
|
||||||
|
to_warehouse=source_wh,
|
||||||
|
company="_Test Company",
|
||||||
|
rate=100,
|
||||||
|
)
|
||||||
|
|
||||||
|
row.from_warehouse = source_wh
|
||||||
|
row.qty = 10
|
||||||
|
|
||||||
|
mr.save()
|
||||||
|
mr.submit()
|
||||||
|
|
||||||
|
se = make_stock_entry(mr.name)
|
||||||
|
se.get("items")[0].qty = 5
|
||||||
|
se.insert()
|
||||||
|
se.submit()
|
||||||
|
|
||||||
|
mr.reload()
|
||||||
|
self.assertEqual(mr.status, "Partially Received")
|
||||||
|
|
||||||
def test_in_transit_make_stock_entry(self):
|
def test_in_transit_make_stock_entry(self):
|
||||||
mr = frappe.copy_doc(test_records[0]).insert()
|
mr = frappe.copy_doc(test_records[0]).insert()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user