commit b0433d96a33ecd4a6f4445ae827c38532ebfcc1e
author Pratik Vyas <m@pd.io> Tue Jan 21 12:09:31 2014 +0530
committer Pratik Vyas <m@pd.io> Tue Jan 21 12:09:31 2014 +0530
tree e3853de2f738c63f6574c99a5047ba086f1e5239
parent f0307dc75e2a5c0e14be568a5aba9941de74cca4
parent f3aba2e536a58427b477c4064847ce38ea06a753

Merge branch 'develop'

accounts/report/general_ledger/general_ledger.py

diff --git a/accounts/report/general_ledger/general_ledger.py b/accounts/report/general_ledger/general_ledger.py
index 4b1a63b..02e970b 100644
--- a/accounts/report/general_ledger/general_ledger.py
+++ b/accounts/report/general_ledger/general_ledger.py
@@ -138,7 +138,7 @@
 	for gle in gl_entries:
 		amount = flt(gle.debit) - flt(gle.credit)
 		if filters.get("account") and (gle.posting_date < filters.from_date 
-				or cstr(gle.is_advance) == "Yes"):
+				or cstr(gle.is_opening) == "Yes"):
 			gle_map[gle.account].opening += amount
 			opening += amount
 		elif gle.posting_date <= filters.to_date:

config.json

diff --git a/config.json b/config.json
index 5a916c5..d454594 100644
--- a/config.json
+++ b/config.json
@@ -1,6 +1,6 @@
 {
  "app_name": "ERPNext", 
- "app_version": "3.6.4", 
+ "app_version": "3.6.5", 
  "base_template": "app/portal/templates/base.html", 
  "modules": {
   "Accounts": {