From 9e563e7b47308bdda15c2461c0b3bf107bdd9a5d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 1 Sep 2014 18:15:29 +0530 Subject: [PATCH] Stock reconciliation when valuation rate column is blank --- .../stock_reconciliation/stock_reconciliation.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 8b32211177..40a980debb 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -74,7 +74,7 @@ class StockReconciliation(StockController): self.validation_messages.append(_get_msg(row_num, _("Warehouse not found in the system"))) # if both not specified - if row[2] == "" and row[3] == "": + if row[2] in ["", None] and row[3] in ["", None]: self.validation_messages.append(_get_msg(row_num, _("Please specify either Quantity or Valuation Rate or both"))) @@ -149,13 +149,13 @@ class StockReconciliation(StockController): }) # check valuation rate mandatory - if row.qty != "" and not row.valuation_rate and \ + if row.qty not in ["", None] and not row.valuation_rate and \ flt(previous_sle.get("qty_after_transaction")) <= 0: frappe.throw(_("Valuation Rate required for Item {0}").format(row.item_code)) change_in_qty = row.qty not in ["", None] and \ (flt(row.qty) - flt(previous_sle.get("qty_after_transaction"))) - + change_in_rate = row.valuation_rate not in ["", None] and \ (flt(row.valuation_rate) - flt(previous_sle.get("valuation_rate"))) @@ -171,7 +171,7 @@ class StockReconciliation(StockController): if previous_valuation_rate == 0: return flt(valuation_rate) else: - if valuation_rate == "": + if valuation_rate in ["", None]: valuation_rate = previous_valuation_rate return (qty * valuation_rate - previous_qty * previous_valuation_rate) \ / flt(qty - previous_qty) @@ -179,8 +179,7 @@ class StockReconciliation(StockController): if change_in_qty: # if change in qty, irrespective of change in rate incoming_rate = _get_incoming_rate(flt(row.qty), flt(row.valuation_rate), - flt(previous_sle.get("qty_after_transaction")), - flt(previous_sle.get("valuation_rate"))) + flt(previous_sle.get("qty_after_transaction")), flt(previous_sle.get("valuation_rate"))) row["voucher_detail_no"] = "Row: " + cstr(row.row_num) + "/Actual Entry" self.insert_entries({"actual_qty": change_in_qty, "incoming_rate": incoming_rate}, row) @@ -211,7 +210,7 @@ class StockReconciliation(StockController): def _insert_entries(): if previous_stock_queue != [[row.qty, row.valuation_rate]]: # make entry as per attachment - if row.qty: + if flt(row.qty): row["voucher_detail_no"] = "Row: " + cstr(row.row_num) + "/Actual Entry" self.insert_entries({"actual_qty": row.qty, "incoming_rate": flt(row.valuation_rate)}, row) @@ -225,7 +224,7 @@ class StockReconciliation(StockController): if change_in_qty: - if row.valuation_rate == "": + if row.valuation_rate in ["", None]: # dont want change in valuation if previous_stock_qty > 0: # set valuation_rate as previous valuation_rate