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

Merge pull request #3893 from nabinhait/fix2

Browse Source 
[fix] Get Balance only if account or party mentioned
This commit is contained in:
Anand Doshi 2015-08-17 14:29:03 +05:30
commit b528c5cad2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/accounts/utils.py
View File

@ -100,14 +100,15 @@ def get_balance_on(account=None, date=None, party_type=None, party=None):
if party_type and party: if party_type and party:
cond.append("""gle.party_type = "%s" and gle.party = "%s" """ % cond.append("""gle.party_type = "%s" and gle.party = "%s" """ %
(party_type.replace('"', '\\"'), party.replace('"', '\\"'))) (party_type.replace('"', '\\"'), party.replace('"', '\\"')))
if account or (party_type and party):
bal = frappe.db.sql("""
SELECT sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
FROM `tabGL Entry` gle
WHERE %s""" % " and ".join(cond))[0][0]
bal = frappe.db.sql(""" # if bal is None, return 0
SELECT sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) return flt(bal)
FROM `tabGL Entry` gle
WHERE %s""" % " and ".join(cond))[0][0]
# if bal is None, return 0
return flt(bal)
@frappe.whitelist() @frappe.whitelist()
def add_ac(args=None): def add_ac(args=None):