Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[optimization] get balance on

Browse Source
This commit is contained in:
Anand Doshi 2015-09-21 19:28:59 +05:30
parent 97c858a5e3
commit f7e6eb4fd7
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/gl_entry/gl_entry.json
View File

@ -330,7 +330,7 @@
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 1,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
@ -511,7 +511,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-09-11 15:51:26", "modified": "2015-09-21 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "GL Entry", "name": "GL Entry",

13
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@ -476,9 +476,18 @@ class JournalEntry(AccountsController):
frappe.throw("Accounts table cannot be blank.") frappe.throw("Accounts table cannot be blank.")
def set_account_and_party_balance(self): def set_account_and_party_balance(self):
account_balance = {}
party_balance = {}
for d in self.get("accounts"): for d in self.get("accounts"):
d.account_balance = get_balance_on(account=d.account, date=self.posting_date) if d.account not in account_balance:
d.party_balance = get_balance_on(party_type=d.party_type, party=d.party, date=self.posting_date) account_balance[d.account] = get_balance_on(account=d.account, date=self.posting_date)
if (d.party_type, d.party) not in party_balance:
party_balance[(d.party_type, d.party)] = get_balance_on(party_type=d.party_type,
party=d.party, date=self.posting_date)
d.account_balance = account_balance[d.account]
d.party_balance = party_balance[(d.party_type, d.party)]
@frappe.whitelist() @frappe.whitelist()
def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None): def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None):