Merge pull request #26278 from rohitwaghchaure/fixed-employee-selection-issue-in-payroll-entry
fix: employee selection not working in payroll entry
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 27019db..15a7c31 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -325,8 +325,7 @@
freeze: true,
args: {
update_parent: true,
- from_child_bom:false,
- save: frm.doc.docstatus === 1 ? true : false
+ from_child_bom:false
},
callback: function(r) {
refresh_field("items");
diff --git a/erpnext/manufacturing/doctype/work_order/work_order_preview.html b/erpnext/manufacturing/doctype/work_order/work_order_preview.html
deleted file mode 100644
index a4bf93e..0000000
--- a/erpnext/manufacturing/doctype/work_order/work_order_preview.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<div style="padding: 15px;">
- <div class="row mb-5">
- <div class="col-md-5" style="max-height: 500px">
- {% if data.image %}
- <div class="border image-field " style="overflow: hidden;border-color:#e6e6e6">
- <img class="responsive" src={{ data.image }}>
- </div>
- {% endif %}
- </div>
- <div class="col-md-7 h-500">
- <div style="padding-top: 10px;">
- <b> Status </b> {{ data.status }}
- </div>
- <div style="padding-top: 10px;">
- <b> Qty to Produce </b> {{ data.qty }}
- </div>
- <div style="padding-top: 10px;">
- <b> Produced Qty </b> {{ data.produced_qty }}
- </div>
- <hr style="margin: 15px -15px;">
- <p>
- {% if data.value %}
- <a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="#Form/Work Order/{{ data.value }}">
- {{ __("Open Work Order {0}", [data.value.bold()]) }}</a>
- {% endif %}
- {% if data.item_code %}
- <a class="btn btn-default btn-xs" href="#Form/Item/{{ data.item_code }}">
- {{ __("Open Item {0}", [data.item_code.bold()]) }}</a>
- {% endif %}
- </p>
- </div>
- </div>
-</div>
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index e21a800..8f27ef4 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -72,7 +72,7 @@
self.validate_with_material_request()
self.validate_batch()
self.validate_inspection()
- # self.validate_fg_completed_qty()
+ self.validate_fg_completed_qty()
self.validate_difference_account()
self.set_job_card_data()
self.set_purpose_for_stock_entry()