CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-12 14:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: material request status (backport #44917) (#44918)

Browse Source 
* 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:
mergify[bot]
2024-12-26 22:58:29 +05:30
committed by GitHub
parent c241262266
commit 042d12b2c1
3 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/status_updater.py
View File

@@ -126,9 +126,13 @@ status_map = {
"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'",
],
[
"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",
"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",

6
erpnext/stock/doctype/material_request/material_request_list.js
View File

@@ -14,6 +14,12 @@ frappe.listview_settings["Material Request"] = {
}
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) == 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) {
return [__("Partially ordered"), "yellow", "per_ordered,<,100"];
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) == 100) {

38
erpnext/stock/doctype/material_request/test_material_request.py
View File

@@ -17,6 +17,7 @@ from erpnext.stock.doctype.material_request.material_request import (
make_supplier_quotation,
raise_work_orders,
)
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
class TestMaterialRequest(FrappeTestCase):
@@ -59,6 +60,43 @@ class TestMaterialRequest(FrappeTestCase):
self.assertEqual(se.doctype, "Stock Entry")
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):
mr = frappe.copy_doc(test_records[0]).insert()