From 609046990b5544a6e5596780d162afcc80281ae7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 8 Oct 2013 17:58:41 +0530 Subject: [PATCH] [fix] [minor] fix in serial no --- patches/october_2013/p01_fix_serial_no_status.py | 1 + stock/doctype/serial_no/serial_no.py | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/patches/october_2013/p01_fix_serial_no_status.py b/patches/october_2013/p01_fix_serial_no_status.py index 38423281a1..0bfc400a8e 100644 --- a/patches/october_2013/p01_fix_serial_no_status.py +++ b/patches/october_2013/p01_fix_serial_no_status.py @@ -11,6 +11,7 @@ def execute(): for sr in serial_nos: sr_bean = webnotes.bean("Serial No", sr[0]) sr_bean.make_controller().via_stock_ledger = True + sr_bean.run_method("validate") sr_bean.save() webnotes.conn.sql("""update `tabSerial No` set warehouse='' where status in diff --git a/stock/doctype/serial_no/serial_no.py b/stock/doctype/serial_no/serial_no.py index c8b7222033..3922878280 100644 --- a/stock/doctype/serial_no/serial_no.py +++ b/stock/doctype/serial_no/serial_no.py @@ -88,7 +88,7 @@ class DocType(StockController): where (serial_no like %s or serial_no like %s or serial_no=%s) and item_code=%s and ifnull(is_cancelled, 'No')='No' order by name desc limit 1""", - ("%%%s%%" % self.doc.name+"\n", "%%%s%%" % "\n"+self.doc.name, self.doc.name, + ("%%%s%%" % (self.doc.name+"\n"), "%%%s%%" % ("\n"+self.doc.name), self.doc.name, self.doc.item_code), as_dict=1) if last_sle: @@ -116,9 +116,9 @@ class DocType(StockController): where (serial_no like %s or serial_no like %s or serial_no=%s) and item_code=%s and actual_qty > 0 and ifnull(is_cancelled, 'No')='No' order by name asc limit 1""", - ("%%%s%%" % self.doc.name+"\n", "%%%s%%" % "\n"+self.doc.name, self.doc.name, + ("%%%s%%" % (self.doc.name+"\n"), "%%%s%%" % ("\n"+self.doc.name), self.doc.name, self.doc.item_code), as_dict=1) - + if purchase_sle: self.doc.purchase_document_type = purchase_sle[0].voucher_type self.doc.purchase_document_no = purchase_sle[0].voucher_no @@ -128,7 +128,7 @@ class DocType(StockController): if purchase_sle[0].voucher_type == "Purchase Receipt": self.doc.supplier, self.doc.supplier_name = \ webnotes.conn.get_value("Purchase Receipt", purchase_sle[0].voucher_no, - ["supplier_name", "supplier_name"]) + ["supplier", "supplier_name"]) else: for fieldname in ("purchase_document_type", "purchase_document_no", "purchase_date", "purchase_time", "purchase_rate", "supplier", "supplier_name"): @@ -140,7 +140,7 @@ class DocType(StockController): and item_code=%s and actual_qty<0 and voucher_type in ('Delivery Note', 'Sales Invoice') and ifnull(is_cancelled, 'No')='No' order by name desc limit 1""", - ("%%%s%%" % self.doc.name+"\n", "%%%s%%" % "\n"+self.doc.name, self.doc.name, + ("%%%s%%" % (self.doc.name+"\n"), "%%%s%%" % ("\n"+self.doc.name), self.doc.name, self.doc.item_code), as_dict=1) if delivery_sle: self.doc.delivery_document_type = delivery_sle[0].voucher_type