From fbb10d37d3e9436c619ce776e6257d30ccf7ae0b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 7 Feb 2014 11:49:26 +0530 Subject: [PATCH 1/4] Removed on_trash function from support ticket --- support/doctype/support_ticket/support_ticket.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py index 3030a146fe..b31f883bc7 100644 --- a/support/doctype/support_ticket/support_ticket.py +++ b/support/doctype/support_ticket/support_ticket.py @@ -49,10 +49,6 @@ class DocType(TransactionBase): self.doc.company = webnotes.conn.get_value("Lead", self.doc.lead, "company") or \ webnotes.conn.get_default("company") - def on_trash(self): - webnotes.conn.sql("""update `tabCommunication` set support_ticket=NULL - where support_ticket=%s""", (self.doc.name,)) - def update_status(self): status = webnotes.conn.get_value("Support Ticket", self.doc.name, "status") if self.doc.status!="Open" and status =="Open" and not self.doc.first_responded_on: From c4e92c6416bba6953f23d5afeca08404046ec9ec Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 7 Feb 2014 15:22:50 +0530 Subject: [PATCH 2/4] Validate duplicate serial nos entry --- stock/doctype/serial_no/serial_no.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stock/doctype/serial_no/serial_no.py b/stock/doctype/serial_no/serial_no.py index 57b3b460b1..ccfe3069d5 100644 --- a/stock/doctype/serial_no/serial_no.py +++ b/stock/doctype/serial_no/serial_no.py @@ -213,6 +213,10 @@ def validate_serial_no(sle, item_det): if len(serial_nos) and len(serial_nos) != abs(cint(sle.actual_qty)): webnotes.throw(_("Serial Nos do not match with qty") + \ (": %s (%s)" % (sle.item_code, sle.actual_qty)), SerialNoQtyError) + + # if len(serial_nos) != len(set(serial_nos)): + # webnotes.throw(_("Duplicate Serial No entered against item") + + # (": %s" % sle.item_code), SerialNoDuplicateError) for serial_no in serial_nos: if webnotes.conn.exists("Serial No", serial_no): From e1e5d675acf6b0e713a035916fa1f1f64c181f2f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 7 Feb 2014 15:33:34 +0530 Subject: [PATCH 3/4] Validate duplicate serial nos entry --- stock/doctype/serial_no/serial_no.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stock/doctype/serial_no/serial_no.py b/stock/doctype/serial_no/serial_no.py index ccfe3069d5..1cb4eee65f 100644 --- a/stock/doctype/serial_no/serial_no.py +++ b/stock/doctype/serial_no/serial_no.py @@ -214,9 +214,9 @@ def validate_serial_no(sle, item_det): webnotes.throw(_("Serial Nos do not match with qty") + \ (": %s (%s)" % (sle.item_code, sle.actual_qty)), SerialNoQtyError) - # if len(serial_nos) != len(set(serial_nos)): - # webnotes.throw(_("Duplicate Serial No entered against item") + - # (": %s" % sle.item_code), SerialNoDuplicateError) + if len(serial_nos) != len(set(serial_nos)): + webnotes.throw(_("Duplicate Serial No entered against item") + + (": %s" % sle.item_code), SerialNoDuplicateError) for serial_no in serial_nos: if webnotes.conn.exists("Serial No", serial_no): From e0c9dd3d238ebecfe8d65876920f8cd19230ed0c Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 7 Feb 2014 16:33:09 +0600 Subject: [PATCH 4/4] bumped to version 3.8.4 --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index dba2e815f8..feda1f066d 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "app_name": "ERPNext", - "app_version": "3.8.3", + "app_version": "3.8.4", "base_template": "app/portal/templates/base.html", "modules": { "Accounts": { @@ -74,5 +74,5 @@ "type": "module" } }, - "requires_framework_version": "==3.9.2" + "requires_framework_version": "==3.9.3" } \ No newline at end of file