fix: Added conditional check for conversion factor
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index bb85ef0..6c82c8b 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -254,11 +254,11 @@
stock_entry_type: function(frm){
frm.remove_custom_button('Bill of Materials', "Get items from");
- if (frm.doc.docstatus === 0 && ['Material Issue','Material Receipt',
- 'Material Transfer','Send to Subcontractor'].includes(frm.doc.purpose)) {
- frm.add_custom_button(__('Bill of Materials'), function(){
- frm.events.get_items_from_bom(frm);
- }, __("Get items from"));
+ if (frm.doc.docstatus === 0 &&
+ ['Material Issue', 'Material Receipt', 'Material Transfer', 'Send to Subcontractor'].includes(frm.doc.purpose)) {
+ frm.add_custom_button(__('Bill of Materials'), function() {
+ frm.events.get_items_from_bom(frm);
+ }, __("Get items from"));
}
},
@@ -449,7 +449,7 @@
d.t_warehouse = values.target_warehouse;
d.uom = item.stock_uom;
d.stock_uom = item.stock_uom;
- d.conversion_factor = 1;
+ d.conversion_factor = item.conversion_factor ? item.conversion_factor : 1;
d.qty = item.qty;
d.expense_account = item.expense_account;
d.project = item.project;