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

[fix] opening balance in general ledger report

Browse Source
This commit is contained in:
Nabin Hait 2015-06-17 17:37:08 +05:30
parent af5820874c
commit 59f063e5c3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@ -66,7 +66,7 @@ def get_gl_entries(filters):
gl_entries = frappe.db.sql("""select posting_date, account, party_type, party, gl_entries = frappe.db.sql("""select posting_date, account, party_type, party,
sum(ifnull(debit, 0)) as debit, sum(ifnull(credit, 0)) as credit, sum(ifnull(debit, 0)) as debit, sum(ifnull(credit, 0)) as credit,
voucher_type, voucher_no, cost_center, remarks, against voucher_type, voucher_no, cost_center, remarks, against, is_opening
from `tabGL Entry` from `tabGL Entry`
where company=%(company)s {conditions} where company=%(company)s {conditions}
{group_by_condition} {group_by_condition}

4
erpnext/patches/v4_2/party_model.py
View File

@ -30,8 +30,8 @@ def create_receivable_payable_account():
account_id = account.name account_id = account.name
frappe.db.set_value("Company", args["company"], ("default_receivable_account" frappe.db.set_value("Company", args["company"], ("default_receivable_account"
if args["account_type"]=="Receivable" else "default_payable_account"), account_id) if args["account_type"]=="Receivable" else "default_payable_account"), account_id)
receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id) receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id)