Merge branch 'develop' of github.com:frappe/erpnext into develop
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 20f5e54..d916789 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.2.17'
+__version__ = '7.2.18'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 032fd66..c489008 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -93,8 +93,10 @@
sle.voucher_type, sle.voucher_no)
sle.stock_value = flt(sle.qty_after_transaction) * flt(sle.valuation_rate)
sle.stock_value_difference = sle.stock_value
- sle.doctype="Stock Ledger Entry"
- frappe.get_doc(sle).db_update()
+ if sle.name:
+ frappe.db.sql(""" update `tabStock Ledger Entry` set stock_value = %(stock_value)s,
+ valuation_rate = %(valuation_rate)s, stock_value_difference = %(stock_value_difference)s
+ where name = %(name)s""", (sle))
def validate_negative_stock(self, sle):
if sle.qty_after_transaction < 0 and sle.actual_qty < 0:
@@ -148,7 +150,7 @@
def get_stock_ledger_details(self):
stock_ledger = {}
- for sle in frappe.db.sql("""select warehouse, stock_value_difference,
+ for sle in frappe.db.sql("""select name, warehouse, stock_value_difference,
voucher_detail_no, item_code, posting_date, posting_time, actual_qty, qty_after_transaction
from `tabStock Ledger Entry` where voucher_type=%s and voucher_no=%s""",
(self.doctype, self.name), as_dict=True):