From 59f063e5c35d8148a92d32f202335a1c50069684 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 17 Jun 2015 17:37:08 +0530 Subject: [PATCH 1/2] [fix] opening balance in general ledger report --- erpnext/accounts/report/general_ledger/general_ledger.py | 2 +- erpnext/patches/v4_2/party_model.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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) From be496bc91c0b0b45ed93c429b3a3e3e532dccaa0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 18 Jun 2015 10:32:42 +0530 Subject: [PATCH 2/2] [fix] Trial Balance opening --- erpnext/accounts/report/trial_balance/trial_balance.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index 2571751166..11af273eb2 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import cint, flt, getdate, formatdate +from frappe.utils import cint, flt, getdate, formatdate, cstr from erpnext.accounts.report.financial_statements import filter_accounts, get_gl_entries value_fields = ("opening_debit", "opening_credit", "debit", "credit", "closing_debit", "closing_credit") @@ -133,10 +133,7 @@ def calculate_values(accounts, gl_entries_by_account, opening_balances, filters) d["opening_credit"] = opening_balances.get(d.name, {}).get("opening_credit", 0) for entry in gl_entries_by_account.get(d.name, []): - if entry.is_opening == "Yes" and d.root_type in ("Asset", "Liability", "Equity"): - d["opening_debit"] += flt(entry.debit) - d["opening_credit"] += flt(entry.credit) - else: + if cstr(entry.is_opening) != "Yes": d["debit"] += flt(entry.debit) d["credit"] += flt(entry.credit)