From 0799b28e46553ef43c18238d570ae4d621b740b0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 11 Feb 2014 12:02:46 +0530 Subject: [PATCH 1/3] 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 af0eb8e559..2bd078e71b 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 95e254ef2f..b6664b0b29 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 2/3] 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 1bd8a9f323..0948b7ac66 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 f23193274a..b06e8ebb4d 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 3/3] 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 93ef0e7198..4787535685 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