nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Pratik Vyas
2014-02-14 10:36:23 +05:30
parent 89a3ee7f57 d45f7d60c3
commit fc274e29ec
5 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
accounts/doctype/purchase_invoice/purchase_invoice.txt
View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-05-21 16:16:39", "creation": "2013-05-21 16:16:39",
"docstatus": 0, "docstatus": 0,
"modified": "2013-11-22 17:15:27", "modified": "2014-02-11 12:01:59",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -739,6 +739,15 @@
"fieldtype": "Column Break", "fieldtype": "Column Break",
"read_only": 0 "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", "doctype": "DocField",
"fieldname": "fiscal_year", "fieldname": "fiscal_year",

4
accounts/report/accounts_payable/accounts_payable.py
View File

@@ -51,10 +51,10 @@ def execute(filters=None):
ageing_based_on_date = gle.posting_date ageing_based_on_date = gle.posting_date
row += get_ageing_data(age_on, ageing_based_on_date, outstanding_amount) + \ 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": 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] row += [account_supplier_type_map.get(gle.account), gle.remarks]
data.append(row) data.append(row)

6
accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -101,13 +101,13 @@ class AccountsReceivableReport(object):
return flt(gle.debit) - flt(gle.credit) - payment_received return flt(gle.debit) - flt(gle.credit) - payment_received
def get_customer(self, account): 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): 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): 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): def get_account_map(self):
if not hasattr(self, "account_map"): if not hasattr(self, "account_map"):

4
config.json
View File

@@ -1,6 +1,6 @@
{ {
"app_name": "ERPNext", "app_name": "ERPNext",
"app_version": "3.8.5", "app_version": "3.8.6",
"base_template": "app/portal/templates/base.html", "base_template": "app/portal/templates/base.html",
"modules": { "modules": {
"Accounts": { "Accounts": {
@@ -74,5 +74,5 @@
"type": "module" "type": "module"
} }
}, },
"requires_framework_version": "==3.9.4" "requires_framework_version": "==3.9.5"
} }

11
stock/doctype/purchase_receipt/purchase_receipt.txt
View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-05-21 16:16:39", "creation": "2013-05-21 16:16:39",
"docstatus": 0, "docstatus": 0,
"modified": "2013-11-22 17:15:47", "modified": "2014-02-11 12:01:00",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -621,6 +621,15 @@
"oldfieldtype": "Date", "oldfieldtype": "Date",
"print_hide": 1 "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, "allow_on_submit": 1,
"doctype": "DocField", "doctype": "DocField",