From d9ef559f3be075b895c3d2d0a37b65df462bc3ae Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 9 Aug 2013 13:17:32 +0530 Subject: [PATCH 1/2] [fix] [minor] fix in updating numbering series --- setup/doctype/naming_series/naming_series.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup/doctype/naming_series/naming_series.py b/setup/doctype/naming_series/naming_series.py index c9604fc9490..9cc4de294b8 100644 --- a/setup/doctype/naming_series/naming_series.py +++ b/setup/doctype/naming_series/naming_series.py @@ -121,8 +121,7 @@ class DocType: def get_current(self, arg=None): """get series current""" - self.doc.current_value = webnotes.conn.sql("""select current from tabSeries where name=%s""", - self.doc.prefix)[0][0] + self.doc.current_value = webnotes.conn.get_value("Series", self.doc.prefix, "current") def insert_series(self, series): """insert series if missing""" From f71f5f55e51810e78ac0b3ecdb500c0e8d55686b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 9 Aug 2013 14:46:16 +0530 Subject: [PATCH 2/2] [minor] [fix] update serial no details on cancelling of purchase receipt --- stock/doctype/stock_ledger/stock_ledger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock/doctype/stock_ledger/stock_ledger.py b/stock/doctype/stock_ledger/stock_ledger.py index ed8196a2792..0af18b965a3 100644 --- a/stock/doctype/stock_ledger/stock_ledger.py +++ b/stock/doctype/stock_ledger/stock_ledger.py @@ -118,7 +118,7 @@ class DocType: elif purpose == 'Sales Return': webnotes.conn.sql("update `tabSerial No` set status = 'Delivered', purchase_document_type = '', purchase_document_no = '' where name = '%s'" % serial_no) else: - webnotes.conn.sql("update `tabSerial No` set docstatus = 2, status = 'Not in Use', purchase_document_type = '', purchase_document_no = '', purchase_date = null, purchase_rate = 0, supplier = null, supplier_name = '', supplier_address = '', warehouse = '' where name = '%s'" % serial_no) + webnotes.conn.sql("update `tabSerial No` set docstatus = 2, status = 'Not in Use', purchase_document_type = '', purchase_document_no = '', purchase_date = null, purchase_rate = 0, supplier = null, supplier_name = '', address_display = '', warehouse = '' where name = '%s'" % serial_no) def check_serial_no_exists(self, serial_no, item_code):