diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 9f1f56064d..35c839f786 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -66,7 +66,7 @@ def get_gl_entries(filters): gl_entries = frappe.db.sql("""select posting_date, account, party_type, party, 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` where company=%(company)s {conditions} {group_by_condition} diff --git a/erpnext/patches/v4_2/party_model.py b/erpnext/patches/v4_2/party_model.py index b1bd895f59..8f4fc335d8 100644 --- a/erpnext/patches/v4_2/party_model.py +++ b/erpnext/patches/v4_2/party_model.py @@ -30,8 +30,8 @@ def create_receivable_payable_account(): account_id = account.name - frappe.db.set_value("Company", args["company"], ("default_receivable_account" - if args["account_type"]=="Receivable" else "default_payable_account"), account_id) + frappe.db.set_value("Company", args["company"], ("default_receivable_account" + if args["account_type"]=="Receivable" else "default_payable_account"), account_id) receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id)