From fbb10d37d3e9436c619ce776e6257d30ccf7ae0b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 7 Feb 2014 11:49:26 +0530 Subject: [PATCH 1/8] 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 3030a146fe2..b31f883bc75 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/8] 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 57b3b460b1a..ccfe3069d5c 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/8] 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 ccfe3069d5c..1cb4eee65f9 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/8] 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 dba2e815f88..feda1f066d5 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 From 347bf93b4fcf4d0cb18b52f8ca52da17f47dc782 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 10 Feb 2014 21:27:25 +0600 Subject: [PATCH 5/8] bumped to version 3.8.5 --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index feda1f066d5..93ef0e71986 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "app_name": "ERPNext", - "app_version": "3.8.4", + "app_version": "3.8.5", "base_template": "app/portal/templates/base.html", "modules": { "Accounts": { @@ -74,5 +74,5 @@ "type": "module" } }, - "requires_framework_version": "==3.9.3" + "requires_framework_version": "==3.9.4" } \ No newline at end of file From 0799b28e46553ef43c18238d570ae4d621b740b0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 11 Feb 2014 12:02:46 +0530 Subject: [PATCH 6/8] Letter Head field added in purchase receipt and invoice --- .../doctype/purchase_invoice/purchase_invoice.txt | 11 ++++++++++- stock/doctype/purchase_receipt/purchase_receipt.txt | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt index af0eb8e5598..2bd078e71b5 100755 --- a/accounts/doctype/purchase_invoice/purchase_invoice.txt +++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-11-22 17:15:27", + "modified": "2014-02-11 12:01:59", "modified_by": "Administrator", "owner": "Administrator" }, @@ -739,6 +739,15 @@ "fieldtype": "Column Break", "read_only": 0 }, + { + "allow_on_submit": 1, + "doctype": "DocField", + "fieldname": "letter_head", + "fieldtype": "Select", + "label": "Letter Head", + "options": "link:Letter Head", + "print_hide": 1 + }, { "doctype": "DocField", "fieldname": "fiscal_year", diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt index 95e254ef2fe..b6664b0b29f 100755 --- a/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-11-22 17:15:47", + "modified": "2014-02-11 12:01:00", "modified_by": "Administrator", "owner": "Administrator" }, @@ -621,6 +621,15 @@ "oldfieldtype": "Date", "print_hide": 1 }, + { + "allow_on_submit": 1, + "doctype": "DocField", + "fieldname": "letter_head", + "fieldtype": "Select", + "label": "Letter Head", + "options": "link:Letter Head", + "print_hide": 1 + }, { "allow_on_submit": 1, "doctype": "DocField", From e0f6b3edbe5463a3106c80260bd9b33277b832f8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 13 Feb 2014 18:43:18 +0530 Subject: [PATCH 7/8] minor fixes in account receivable/payable --- accounts/report/accounts_payable/accounts_payable.py | 4 ++-- accounts/report/accounts_receivable/accounts_receivable.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/accounts/report/accounts_payable/accounts_payable.py b/accounts/report/accounts_payable/accounts_payable.py index 1bd8a9f3232..0948b7ac668 100644 --- a/accounts/report/accounts_payable/accounts_payable.py +++ b/accounts/report/accounts_payable/accounts_payable.py @@ -51,10 +51,10 @@ def execute(filters=None): ageing_based_on_date = gle.posting_date row += get_ageing_data(age_on, ageing_based_on_date, outstanding_amount) + \ - [account_map.get(gle.account).get("supplier") or ""] + [account_map.get(gle.account, {}).get("supplier") or ""] if supplier_naming_by == "Naming Series": - row += [account_map.get(gle.account).get("supplier_name") or ""] + row += [account_map.get(gle.account, {}).get("supplier_name") or ""] row += [account_supplier_type_map.get(gle.account), gle.remarks] data.append(row) diff --git a/accounts/report/accounts_receivable/accounts_receivable.py b/accounts/report/accounts_receivable/accounts_receivable.py index f23193274a7..b06e8ebb4d4 100644 --- a/accounts/report/accounts_receivable/accounts_receivable.py +++ b/accounts/report/accounts_receivable/accounts_receivable.py @@ -101,13 +101,13 @@ class AccountsReceivableReport(object): return flt(gle.debit) - flt(gle.credit) - payment_received def get_customer(self, account): - return self.get_account_map().get(account).get("customer") or "" + return self.get_account_map().get(account, {}).get("customer") or "" def get_customer_name(self, account): - return self.get_account_map().get(account).get("customer_name") or "" + return self.get_account_map().get(account, {}).get("customer_name") or "" def get_territory(self, account): - return self.get_account_map().get(account).get("territory") or "" + return self.get_account_map().get(account, {}).get("territory") or "" def get_account_map(self): if not hasattr(self, "account_map"): From d45f7d60c319d48d27012698fbd8b610f325f475 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 14 Feb 2014 11:06:23 +0600 Subject: [PATCH 8/8] bumped to version 3.8.6 --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 93ef0e71986..4787535685d 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "app_name": "ERPNext", - "app_version": "3.8.5", + "app_version": "3.8.6", "base_template": "app/portal/templates/base.html", "modules": { "Accounts": { @@ -74,5 +74,5 @@ "type": "module" } }, - "requires_framework_version": "==3.9.4" + "requires_framework_version": "==3.9.5" } \ No newline at end of file