From e5f1152c01d418547f3f68199c1de9f0cdda1b5a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 18 Jan 2013 15:17:40 +0530 Subject: [PATCH] fixes in stock entry --- stock/doctype/stock_entry/stock_entry.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stock/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py index 1db24fe26a..00ae0e0433 100644 --- a/stock/doctype/stock_entry/stock_entry.py +++ b/stock/doctype/stock_entry/stock_entry.py @@ -182,7 +182,7 @@ class DocType(TransactionBase): if self.doc.purpose == "Sales Return" and \ (self.doc.delivery_note_no or self.doc.sales_invoice_no): sle = webnotes.conn.sql("""select name, posting_date, posting_time, - actual_qty, stock_value from `tabStock Ledger Entry` + actual_qty, stock_value, warehouse from `tabStock Ledger Entry` where voucher_type = %s and voucher_no = %s and item_code = %s and ifnull(is_cancelled, 'No') = 'No' limit 1""", ((self.doc.delivery_note_no and "Delivery Note" or "Sales Invoice"), @@ -191,7 +191,8 @@ class DocType(TransactionBase): args.update({ "posting_date": sle[0].posting_date, "posting_time": sle[0].posting_time, - "sle": sle[0].name + "sle": sle[0].name, + "warehouse": sle[0].warehouse, }) previous_sle = get_previous_sle(args) incoming_rate = (flt(sle[0].stock_value) - flt(previous_sle.get("stock_value"))) / \