From 2bf4245334530fffaf57d1c4f9f16294dc4a77d5 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 23 Sep 2020 12:50:06 +0530 Subject: [PATCH] fix: Conversion factor fixes in Stock Entry --- erpnext/stock/doctype/stock_entry/stock_entry.py | 10 ++++++---- .../doctype/stock_entry_detail/stock_entry_detail.json | 8 +++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index a92d04ff8c..80d82e22e0 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -96,7 +96,7 @@ class StockEntry(StockController): self.update_quality_inspection() if self.work_order and self.purpose == "Manufacture": self.update_so_in_serial_number() - + if self.purpose == 'Material Transfer' and self.add_to_transit: self.set_material_request_transfer_status('In Transit') if self.purpose == 'Material Transfer' and self.outgoing_stock_entry: @@ -205,7 +205,9 @@ class StockEntry(StockController): for f in ("uom", "stock_uom", "description", "item_name", "expense_account", "cost_center", "conversion_factor"): - if f in ["stock_uom", "conversion_factor"] or not item.get(f): + if f == "stock_uom" or not item.get(f): + item.set(f, item_details.get(f)) + if f == 'conversion_factor' and item.uom == item_details.get('stock_uom'): item.set(f, item_details.get(f)) if not item.transfer_qty and item.qty: @@ -1370,7 +1372,7 @@ class StockEntry(StockController): if self.outgoing_stock_entry: parent_se = frappe.get_value("Stock Entry", self.outgoing_stock_entry, 'add_to_transit') - for item in self.items: + for item in self.items: material_request = item.material_request or None if self.purpose == "Material Transfer" and material_request not in material_requests: if self.outgoing_stock_entry and parent_se: @@ -1430,7 +1432,7 @@ def make_stock_in_entry(source_name, target_doc=None): if add_to_transit: warehouse = frappe.get_value('Material Request Item', source_doc.material_request_item, 'warehouse') target_doc.t_warehouse = warehouse - + target_doc.s_warehouse = source_doc.t_warehouse target_doc.qty = source_doc.qty - source_doc.transferred_qty diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json index 7b9c129804..ae2e3a134f 100644 --- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json +++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json @@ -238,7 +238,6 @@ "oldfieldname": "conversion_factor", "oldfieldtype": "Currency", "print_hide": 1, - "read_only": 1, "reqd": 1 }, { @@ -498,15 +497,14 @@ "depends_on": "eval:parent.purpose===\"Repack\" && doc.t_warehouse", "fieldname": "set_basic_rate_manually", "fieldtype": "Check", - "label": "Set Basic Rate Manually", - "show_days": 1, - "show_seconds": 1 + "label": "Set Basic Rate Manually" } ], "idx": 1, + "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-06-08 12:57:03.172887", + "modified": "2020-09-22 17:55:03.384138", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry Detail",