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

[codex] Show in-transit status for add-to-transit Stock Entries (backport #55644 to version-15-hotfix) (#55659)

Browse Source 
[codex] Show in-transit status for add-to-transit Stock Entries (#55644)

(cherry picked from commit df03524b19)
This commit is contained in:
Mihir Kandoi
2026-06-05 17:02:33 +05:30
committed by GitHub
parent 4fadc4aab6
commit ffb36cff78
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/stock/doctype/stock_entry/stock_entry_list.js
View File

@@ -1,11 +1,13 @@
frappe.listview_settings["Stock Entry"] = { frappe.listview_settings["Stock Entry"] = {
add_fields: [ add_fields: [
"`tabStock Entry`.`from_warehouse`", "from_warehouse",
"`tabStock Entry`.`to_warehouse`", "to_warehouse",
"`tabStock Entry`.`purpose`", "purpose",
"`tabStock Entry`.`work_order`", "work_order",
"`tabStock Entry`.`bom_no`", "bom_no",
"`tabStock Entry`.`is_return`", "is_return",
"add_to_transit",
"per_transferred",
], ],
get_indicator: function (doc) { get_indicator: function (doc) {
if (doc.is_return === 1 && doc.purpose === "Material Transfer for Manufacture") { if (doc.is_return === 1 && doc.purpose === "Material Transfer for Manufacture") {
@@ -16,6 +18,17 @@ frappe.listview_settings["Stock Entry"] = {
]; ];
} else if (doc.docstatus === 0) { } else if (doc.docstatus === 0) {
return [__("Draft"), "red", "docstatus,=,0"]; return [__("Draft"), "red", "docstatus,=,0"];
} else if (
doc.docstatus === 1 &&
doc.add_to_transit === 1 &&
doc.purpose === "Material Transfer" &&
doc.per_transferred < 100
) {
return [
__("In Transit"),
"yellow",
"docstatus,=,1|add_to_transit,=,1|purpose,=,Material Transfer|per_transferred,<,100",
];
} else if (doc.purpose === "Send to Warehouse" && doc.per_transferred < 100) { } else if (doc.purpose === "Send to Warehouse" && doc.per_transferred < 100) {
// not delivered & overdue // not delivered & overdue
return [__("Goods In Transit"), "grey", "per_transferred,<,100"]; return [__("Goods In Transit"), "grey", "per_transferred,<,100"];

10
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@@ -235,7 +235,15 @@ class TestStockEntry(FrappeTestCase):
self.assertEqual(transit_entry.name, end_transit_entry.items[0].against_stock_entry) self.assertEqual(transit_entry.name, end_transit_entry.items[0].against_stock_entry)
self.assertEqual(transit_entry.items[0].name, end_transit_entry.items[0].ste_detail) self.assertEqual(transit_entry.items[0].name, end_transit_entry.items[0].ste_detail)
# create add to transit transit_entry.reload()
self.assertEqual(transit_entry.per_transferred, 0)
end_transit_entry.to_warehouse = "Test To Warehouse - _TC"
end_transit_entry.items[0].t_warehouse = "Test To Warehouse - _TC"
end_transit_entry.save().submit()
transit_entry.reload()
self.assertEqual(transit_entry.per_transferred, 100)
def test_material_receipt_gl_entry(self): def test_material_receipt_gl_entry(self):
company = frappe.db.get_value("Warehouse", "Stores - TCP1", "company") company = frappe.db.get_value("Warehouse", "Stores - TCP1", "company")