Merge pull request #39816 from s-aga-r/FIX-9595
fix(ux): set rate as price list rate on uom change in MR
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 5ae48ee..b5189b8 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -20,6 +20,7 @@
from erpnext.selling.doctype.product_bundle.test_product_bundle import make_product_bundle
from erpnext.selling.doctype.sales_order.sales_order import (
WarehouseRequired,
+ create_pick_list,
make_delivery_note,
make_material_request,
make_raw_material_request,
@@ -2023,6 +2024,83 @@
frappe.db.get_value(so.doctype, so.name, "advance_payment_status"), "Not Requested"
)
+ def test_pick_list_without_rejected_materials(self):
+ serial_and_batch_item = make_item(
+ "_Test Serial and Batch Item for Rejected Materials",
+ properties={
+ "has_serial_no": 1,
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "BAT-TSBIFRM-.#####",
+ "serial_no_series": "SN-TSBIFRM-.#####",
+ },
+ ).name
+
+ serial_item = make_item(
+ "_Test Serial Item for Rejected Materials",
+ properties={
+ "has_serial_no": 1,
+ "serial_no_series": "SN-TSIFRM-.#####",
+ },
+ ).name
+
+ batch_item = make_item(
+ "_Test Batch Item for Rejected Materials",
+ properties={
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "BAT-TBIFRM-.#####",
+ },
+ ).name
+
+ normal_item = make_item("_Test Normal Item for Rejected Materials").name
+
+ warehouse = "_Test Warehouse - _TC"
+ rejected_warehouse = "_Test Dummy Rejected Warehouse - _TC"
+
+ if not frappe.db.exists("Warehouse", rejected_warehouse):
+ frappe.get_doc(
+ {
+ "doctype": "Warehouse",
+ "warehouse_name": rejected_warehouse,
+ "company": "_Test Company",
+ "warehouse_group": "_Test Warehouse Group",
+ "is_rejected_warehouse": 1,
+ }
+ ).insert()
+
+ se = make_stock_entry(item_code=normal_item, qty=1, to_warehouse=warehouse, do_not_submit=True)
+ for item in [serial_and_batch_item, serial_item, batch_item]:
+ se.append("items", {"item_code": item, "qty": 1, "t_warehouse": warehouse})
+
+ se.save()
+ se.submit()
+
+ se = make_stock_entry(
+ item_code=normal_item, qty=1, to_warehouse=rejected_warehouse, do_not_submit=True
+ )
+ for item in [serial_and_batch_item, serial_item, batch_item]:
+ se.append("items", {"item_code": item, "qty": 1, "t_warehouse": rejected_warehouse})
+
+ se.save()
+ se.submit()
+
+ so = make_sales_order(item_code=normal_item, qty=2, do_not_submit=True)
+
+ for item in [serial_and_batch_item, serial_item, batch_item]:
+ so.append("items", {"item_code": item, "qty": 2, "warehouse": warehouse})
+
+ so.save()
+ so.submit()
+
+ pick_list = create_pick_list(so.name)
+
+ pick_list.save()
+ for row in pick_list.locations:
+ self.assertEqual(row.qty, 1.0)
+ self.assertFalse(row.warehouse == rejected_warehouse)
+ self.assertTrue(row.warehouse == warehouse)
+
def automatically_fetch_payment_terms(enable=1):
accounts_settings = frappe.get_doc("Accounts Settings")
diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json
index bd84aad..0c47434 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.json
+++ b/erpnext/stock/doctype/pick_list/pick_list.json
@@ -16,6 +16,7 @@
"for_qty",
"column_break_4",
"parent_warehouse",
+ "consider_rejected_warehouses",
"get_item_locations",
"section_break_6",
"scan_barcode",
@@ -184,11 +185,18 @@
"report_hide": 1,
"reqd": 1,
"search_index": 1
+ },
+ {
+ "default": "0",
+ "description": "Enable it if users want to consider rejected materials to dispatch.",
+ "fieldname": "consider_rejected_warehouses",
+ "fieldtype": "Check",
+ "label": "Consider Rejected Warehouses"
}
],
"is_submittable": 1,
"links": [],
- "modified": "2024-02-01 16:17:44.877426",
+ "modified": "2024-02-02 16:17:44.877426",
"modified_by": "Administrator",
"module": "Stock",
"name": "Pick List",
@@ -260,4 +268,4 @@
"sort_order": "DESC",
"states": [],
"track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py
index e2edb20..98ed569 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -369,6 +369,7 @@
self.item_count_map.get(item_code),
self.company,
picked_item_details=picked_items_details.get(item_code),
+ consider_rejected_warehouses=self.consider_rejected_warehouses,
),
)
@@ -710,6 +711,7 @@
company,
ignore_validation=False,
picked_item_details=None,
+ consider_rejected_warehouses=False,
):
locations = []
total_picked_qty = (
@@ -725,18 +727,34 @@
required_qty,
company,
total_picked_qty,
+ consider_rejected_warehouses=consider_rejected_warehouses,
)
elif has_serial_no:
locations = get_available_item_locations_for_serialized_item(
- item_code, from_warehouses, required_qty, company, total_picked_qty
+ item_code,
+ from_warehouses,
+ required_qty,
+ company,
+ total_picked_qty,
+ consider_rejected_warehouses=consider_rejected_warehouses,
)
elif has_batch_no:
locations = get_available_item_locations_for_batched_item(
- item_code, from_warehouses, required_qty, company, total_picked_qty
+ item_code,
+ from_warehouses,
+ required_qty,
+ company,
+ total_picked_qty,
+ consider_rejected_warehouses=consider_rejected_warehouses,
)
else:
locations = get_available_item_locations_for_other_item(
- item_code, from_warehouses, required_qty, company, total_picked_qty
+ item_code,
+ from_warehouses,
+ required_qty,
+ company,
+ total_picked_qty,
+ consider_rejected_warehouses=consider_rejected_warehouses,
)
total_qty_available = sum(location.get("qty") for location in locations)
@@ -775,6 +793,7 @@
required_qty,
company,
total_picked_qty=0,
+ consider_rejected_warehouses=False,
):
# Get batch nos by FIFO
locations = get_available_item_locations_for_batched_item(
@@ -782,6 +801,7 @@
from_warehouses,
required_qty,
company,
+ consider_rejected_warehouses=consider_rejected_warehouses,
)
if locations:
@@ -811,7 +831,12 @@
def get_available_item_locations_for_serialized_item(
- item_code, from_warehouses, required_qty, company, total_picked_qty=0
+ item_code,
+ from_warehouses,
+ required_qty,
+ company,
+ total_picked_qty=0,
+ consider_rejected_warehouses=False,
):
picked_serial_nos = get_picked_serial_nos(item_code, from_warehouses)
@@ -828,6 +853,10 @@
else:
query = query.where(Coalesce(sn.warehouse, "") != "")
+ if not consider_rejected_warehouses:
+ if rejected_warehouses := get_rejected_warehouses():
+ query = query.where(sn.warehouse.notin(rejected_warehouses))
+
serial_nos = query.run(as_list=True)
warehouse_serial_nos_map = frappe._dict()
@@ -860,7 +889,12 @@
def get_available_item_locations_for_batched_item(
- item_code, from_warehouses, required_qty, company, total_picked_qty=0
+ item_code,
+ from_warehouses,
+ required_qty,
+ company,
+ total_picked_qty=0,
+ consider_rejected_warehouses=False,
):
locations = []
data = get_auto_batch_nos(
@@ -875,7 +909,14 @@
)
warehouse_wise_batches = frappe._dict()
+ rejected_warehouses = get_rejected_warehouses()
+
for d in data:
+ if (
+ not consider_rejected_warehouses and rejected_warehouses and d.warehouse in rejected_warehouses
+ ):
+ continue
+
if d.warehouse not in warehouse_wise_batches:
warehouse_wise_batches.setdefault(d.warehouse, defaultdict(float))
@@ -898,7 +939,12 @@
def get_available_item_locations_for_other_item(
- item_code, from_warehouses, required_qty, company, total_picked_qty=0
+ item_code,
+ from_warehouses,
+ required_qty,
+ company,
+ total_picked_qty=0,
+ consider_rejected_warehouses=False,
):
bin = frappe.qb.DocType("Bin")
query = (
@@ -915,6 +961,10 @@
wh = frappe.qb.DocType("Warehouse")
query = query.from_(wh).where((bin.warehouse == wh.name) & (wh.company == company))
+ if not consider_rejected_warehouses:
+ if rejected_warehouses := get_rejected_warehouses():
+ query = query.where(bin.warehouse.notin(rejected_warehouses))
+
item_locations = query.run(as_dict=True)
return item_locations
@@ -1236,3 +1286,15 @@
item.serial_no = location.serial_no
item.batch_no = location.batch_no
item.material_request_item = location.material_request_item
+
+
+def get_rejected_warehouses():
+ if not hasattr(frappe.local, "rejected_warehouses"):
+ frappe.local.rejected_warehouses = []
+
+ if not frappe.local.rejected_warehouses:
+ frappe.local.rejected_warehouses = frappe.get_all(
+ "Warehouse", filters={"is_rejected_warehouse": 1}, pluck="name"
+ )
+
+ return frappe.local.rejected_warehouses
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index 43b2ad2..7b0cade 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -13,6 +13,7 @@
"column_break_3",
"is_group",
"parent_warehouse",
+ "is_rejected_warehouse",
"column_break_4",
"account",
"company",
@@ -249,13 +250,20 @@
{
"fieldname": "column_break_qajx",
"fieldtype": "Column Break"
+ },
+ {
+ "default": "0",
+ "description": "If yes, then this warehouse will be used to store rejected materials",
+ "fieldname": "is_rejected_warehouse",
+ "fieldtype": "Check",
+ "label": "Is Rejected Warehouse"
}
],
"icon": "fa fa-building",
"idx": 1,
"is_tree": 1,
"links": [],
- "modified": "2023-05-29 13:10:43.333160",
+ "modified": "2024-01-24 16:27:28.299520",
"modified_by": "Administrator",
"module": "Stock",
"name": "Warehouse",