Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Conversion factor fixes in Stock Entry

Browse Source
This commit is contained in:
Deepesh Garg 2020-09-23 12:50:06 +05:30
parent 639542c81d
commit 2bf4245334
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -96,7 +96,7 @@ class StockEntry(StockController):
self.update_quality_inspection() self.update_quality_inspection()
if self.work_order and self.purpose == "Manufacture": if self.work_order and self.purpose == "Manufacture":
self.update_so_in_serial_number() self.update_so_in_serial_number()
if self.purpose == 'Material Transfer' and self.add_to_transit: if self.purpose == 'Material Transfer' and self.add_to_transit:
self.set_material_request_transfer_status('In Transit') self.set_material_request_transfer_status('In Transit')
if self.purpose == 'Material Transfer' and self.outgoing_stock_entry: 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", for f in ("uom", "stock_uom", "description", "item_name", "expense_account",
"cost_center", "conversion_factor"): "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)) item.set(f, item_details.get(f))
if not item.transfer_qty and item.qty: if not item.transfer_qty and item.qty:
@ -1370,7 +1372,7 @@ class StockEntry(StockController):
if self.outgoing_stock_entry: if self.outgoing_stock_entry:
parent_se = frappe.get_value("Stock Entry", self.outgoing_stock_entry, 'add_to_transit') 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 material_request = item.material_request or None
if self.purpose == "Material Transfer" and material_request not in material_requests: if self.purpose == "Material Transfer" and material_request not in material_requests:
if self.outgoing_stock_entry and parent_se: 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: if add_to_transit:
warehouse = frappe.get_value('Material Request Item', source_doc.material_request_item, 'warehouse') warehouse = frappe.get_value('Material Request Item', source_doc.material_request_item, 'warehouse')
target_doc.t_warehouse = warehouse target_doc.t_warehouse = warehouse
target_doc.s_warehouse = source_doc.t_warehouse target_doc.s_warehouse = source_doc.t_warehouse
target_doc.qty = source_doc.qty - source_doc.transferred_qty target_doc.qty = source_doc.qty - source_doc.transferred_qty

8
erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
View File

@ -238,7 +238,6 @@
"oldfieldname": "conversion_factor", "oldfieldname": "conversion_factor",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"print_hide": 1, "print_hide": 1,
"read_only": 1,
"reqd": 1 "reqd": 1
}, },
{ {
@ -498,15 +497,14 @@
"depends_on": "eval:parent.purpose===\"Repack\" && doc.t_warehouse", "depends_on": "eval:parent.purpose===\"Repack\" && doc.t_warehouse",
"fieldname": "set_basic_rate_manually", "fieldname": "set_basic_rate_manually",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Set Basic Rate Manually", "label": "Set Basic Rate Manually"
"show_days": 1,
"show_seconds": 1
} }
], ],
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2020-06-08 12:57:03.172887", "modified": "2020-09-22 17:55:03.384138",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry Detail", "name": "Stock Entry Detail",