Merge branch 'develop'
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index af0eb8e..2bd078e 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"
},
@@ -740,6 +740,15 @@
"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",
"fieldtype": "Select",
diff --git a/accounts/report/accounts_payable/accounts_payable.py b/accounts/report/accounts_payable/accounts_payable.py
index 1bd8a9f..0948b7a 100644
--- a/accounts/report/accounts_payable/accounts_payable.py
+++ b/accounts/report/accounts_payable/accounts_payable.py
@@ -51,10 +51,10 @@
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 f231932..b06e8eb 100644
--- a/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/accounts/report/accounts_receivable/accounts_receivable.py
@@ -101,13 +101,13 @@
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"):
diff --git a/config.json b/config.json
index 93ef0e7..4787535 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
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index 95e254e..b6664b0 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"
},
@@ -624,6 +624,15 @@
{
"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",
"fieldname": "select_print_heading",
"fieldtype": "Link",
"label": "Print Heading",