Merge pull request #35739 from s-aga-r/FIX-35493
fix(ux): set route options for new `SBB`
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 2075d57..7ab1c89 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -1001,10 +1001,16 @@
def check_prev_docstatus(self):
for d in self.get("items"):
- if d.sales_order and frappe.db.get_value("Sales Order", d.sales_order, "docstatus") != 1:
+ if (
+ d.sales_order
+ and frappe.db.get_value("Sales Order", d.sales_order, "docstatus", cache=True) != 1
+ ):
frappe.throw(_("Sales Order {0} is not submitted").format(d.sales_order))
- if d.delivery_note and frappe.db.get_value("Delivery Note", d.delivery_note, "docstatus") != 1:
+ if (
+ d.delivery_note
+ and frappe.db.get_value("Delivery Note", d.delivery_note, "docstatus", cache=True) != 1
+ ):
throw(_("Delivery Note {0} is not submitted").format(d.delivery_note))
def make_gl_entries(self, gl_entries=None, from_repost=False):
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 11cee28..818c789 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -660,6 +660,9 @@
if reference_voucher_detail_no:
filters["voucher_detail_no"] = reference_voucher_detail_no
+ if item_row and item_row.get("warehouse"):
+ filters["warehouse"] = item_row.get("warehouse")
+
return filters
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index 496cbfd..2c17568 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -161,7 +161,7 @@
self.total_completed_qty = flt(self.total_completed_qty, self.precision("total_completed_qty"))
for row in self.sub_operations:
- self.c += row.completed_qty
+ self.total_completed_qty += row.completed_qty
def get_overlap_for(self, args, check_next_available_slot=False):
production_capacity = 1
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 6ee8f20..6a9e241 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -1223,7 +1223,8 @@
"hidden": 1,
"label": "Pick List",
"options": "Pick List",
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"default": "0",
@@ -1399,7 +1400,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
- "modified": "2023-06-03 16:13:25.011487",
+ "modified": "2023-06-16 14:58:55.066602",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
@@ -1469,4 +1470,4 @@
"title_field": "title",
"track_changes": 1,
"track_seen": 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 4970bf7..922f76c 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -40,7 +40,7 @@
for location in self.get("locations"):
if (
location.sales_order
- and frappe.db.get_value("Sales Order", location.sales_order, "per_picked") == 100
+ and frappe.db.get_value("Sales Order", location.sales_order, "per_picked", cache=True) == 100
):
frappe.throw(
_("Row #{}: item {} has been picked already.").format(location.idx, location.item_code)
@@ -384,6 +384,7 @@
(pi_item.item_code.isin([x.item_code for x in items]))
& ((pi_item.picked_qty > 0) | (pi_item.stock_qty > 0))
& (pi.status != "Completed")
+ & (pi.status != "Cancelled")
& (pi_item.docstatus != 2)
)
.groupby(
@@ -497,7 +498,7 @@
)
qty = stock_qty / (item_doc.conversion_factor or 1)
- uom_must_be_whole_number = frappe.db.get_value("UOM", item_doc.uom, "must_be_whole_number")
+ uom_must_be_whole_number = frappe.get_cached_value("UOM", item_doc.uom, "must_be_whole_number")
if uom_must_be_whole_number:
qty = floor(qty)
stock_qty = qty * item_doc.conversion_factor
diff --git a/erpnext/stock/doctype/pick_list_item/pick_list_item.json b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
index e6653a8..2b519f5 100644
--- a/erpnext/stock/doctype/pick_list_item/pick_list_item.json
+++ b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -153,7 +153,8 @@
"fieldtype": "Data",
"hidden": 1,
"label": "Sales Order Item",
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "serial_no_and_batch_section",
@@ -208,7 +209,7 @@
],
"istable": 1,
"links": [],
- "modified": "2023-03-12 13:50:22.258100",
+ "modified": "2023-06-16 14:05:51.719959",
"modified_by": "Administrator",
"module": "Stock",
"name": "Pick List Item",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 1ac2f35..387f031 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -122,6 +122,7 @@
self.set_status()
self.po_required()
+ self.validate_items_quality_inspection()
self.validate_with_previous_doc()
self.validate_uom_is_integer("uom", ["qty", "received_qty"])
self.validate_uom_is_integer("stock_uom", "stock_qty")
@@ -195,6 +196,26 @@
if not d.purchase_order:
frappe.throw(_("Purchase Order number required for Item {0}").format(d.item_code))
+ def validate_items_quality_inspection(self):
+ for item in self.get("items"):
+ if item.quality_inspection:
+ qi = frappe.db.get_value(
+ "Quality Inspection",
+ item.quality_inspection,
+ ["reference_type", "reference_name", "item_code"],
+ as_dict=True,
+ )
+
+ if qi.reference_type != self.doctype or qi.reference_name != self.name:
+ msg = f"""Row #{item.idx}: Please select a valid Quality Inspection with Reference Type
+ {frappe.bold(self.doctype)} and Reference Name {frappe.bold(self.name)}."""
+ frappe.throw(_(msg))
+
+ if qi.item_code != item.item_code:
+ msg = f"""Row #{item.idx}: Please select a valid Quality Inspection with Item Code
+ {frappe.bold(item.item_code)}."""
+ frappe.throw(_(msg))
+
def get_already_received_qty(self, po, po_detail):
qty = frappe.db.sql(
"""select sum(qty) from `tabPurchase Receipt Item`
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 92235b0..ddc0556 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -1781,6 +1781,52 @@
pr.items[0].delivery_note_item = delivery_note_item
pr.save()
+ def test_purchase_return_valuation_with_rejected_qty(self):
+ item_code = "_Test Item Return Valuation"
+ create_item(item_code)
+
+ warehouse = create_warehouse("_Test Warehouse Return Valuation")
+ rejected_warehouse = create_warehouse("_Test Rejected Warehouse Return Valuation")
+
+ # Step 1: Create Purchase Receipt with valuation rate 100
+ make_purchase_receipt(
+ item_code=item_code,
+ warehouse=warehouse,
+ qty=10,
+ rate=100,
+ rejected_qty=2,
+ rejected_warehouse=rejected_warehouse,
+ )
+
+ # Step 2: Create One more Purchase Receipt with valuation rate 200
+ pr = make_purchase_receipt(
+ item_code=item_code,
+ warehouse=warehouse,
+ qty=10,
+ rate=200,
+ rejected_qty=2,
+ rejected_warehouse=rejected_warehouse,
+ )
+
+ # Step 3: Create Purchase Return for 2 qty
+ from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_return
+
+ pr_return = make_purchase_return(pr.name)
+ pr_return.items[0].qty = 2 * -1
+ pr_return.items[0].received_qty = 2 * -1
+ pr_return.items[0].rejected_qty = 0
+ pr_return.items[0].rejected_warehouse = ""
+ pr_return.save()
+ pr_return.submit()
+
+ data = frappe.get_all(
+ "Stock Ledger Entry",
+ filters={"voucher_no": pr_return.name, "docstatus": 1},
+ fields=["SUM(stock_value_difference) as stock_value_difference"],
+ )[0]
+
+ self.assertEqual(abs(data["stock_value_difference"]), 400.00)
+
def prepare_data_for_internal_transfer():
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 9bf679b..fe42b1f 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -577,7 +577,8 @@
"fieldtype": "Link",
"label": "Pick List",
"options": "Pick List",
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "print_settings_col_break",
@@ -677,7 +678,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2023-06-09 15:46:28.418339",
+ "modified": "2023-06-16 14:59:10.917235",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
@@ -738,7 +739,6 @@
"read": 1,
"report": 1,
"role": "Stock Manager",
- "set_user_permissions": 1,
"share": 1,
"submit": 1,
"write": 1
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 517fea5..d9b5503 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -266,10 +266,10 @@
return
for row in self.items:
- if row.job_card_item:
+ if row.job_card_item or not row.s_warehouse:
continue
- msg = f"""Row #{0}: The job card item reference
+ msg = f"""Row #{row.idx}: The job card item reference
is missing. Kindly create the stock entry
from the job card. If you have added the row manually
then you won't be able to add job card item reference."""