Merge pull request #48611 from rohitwaghchaure/fixed-job-card-stock-entry

fix: confirmation dialog for submitting the stock entry

erpnext/manufacturing/doctype/job_card/job_card.js

@@ -48,24 +48,37 @@ frappe.ui.form.on("Job Card", {
 			frm.doc.track_semi_finished_goods &&
 			frm.doc.docstatus === 1 &&
 			!frm.doc.is_subcontracted &&
+			(frm.doc.skip_material_transfer || frm.doc.transferred_qty > 0) &&
 			flt(frm.doc.for_quantity) + flt(frm.doc.process_loss_qty) > flt(frm.doc.manufactured_qty)
 		) {
 			frm.add_custom_button(__("Make Stock Entry"), () => {
-				frm.call({
+				frappe.confirm(
-					method: "make_stock_entry_for_semi_fg_item",
+					__("Do you want to submit the stock entry?"),
-					args: {
+					() => {
-						auto_submit: 1,
+						frm.events.make_manufacture_stock_entry(frm, 1);
 					},
-					doc: frm.doc,
+					() => {
-					freeze: true,
+						frm.events.make_manufacture_stock_entry(frm, 0);
-					callback() {
+					}
-						frm.reload_doc();
+				);
-					},
-				});
 			}).addClass("btn-primary");
 		}
 	},
 
+	make_manufacture_stock_entry(frm, submit_entry) {
+		frm.call({
+			method: "make_stock_entry_for_semi_fg_item",
+			args: {
+				auto_submit: submit_entry,
+			},
+			doc: frm.doc,
+			freeze: true,
+			callback() {
+				frm.reload_doc();
+			},
+		});
+	},
+
 	refresh: function (frm) {
 		frm.trigger("setup_stock_entry");
 

erpnext/manufacturing/doctype/work_order/work_order.py

@@ -440,6 +440,9 @@ class WorkOrder(Document):
 		"""Update **Manufactured Qty** and **Material Transferred for Qty** in Work Order
 		based on Stock Entry"""
 
+		if self.track_semi_finished_goods:
+			return
+
 		allowance_percentage = flt(
 			frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order")
 		)

erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -1727,9 +1727,6 @@ class StockEntry(StockController):
 			else:
 				job_doc.set_manufactured_qty()
 
-		if self.job_card and frappe.get_cached_value("Job Card", self.job_card, "finished_good"):
-			return
-
 		if self.work_order:
 			pro_doc = frappe.get_doc("Work Order", self.work_order)
 			_validate_work_order(pro_doc)