Fixes in general ledger report
diff --git a/accounts/report/general_ledger/general_ledger.py b/accounts/report/general_ledger/general_ledger.py
index e76c0c4..b88d5bc 100644
--- a/accounts/report/general_ledger/general_ledger.py
+++ b/accounts/report/general_ledger/general_ledger.py
@@ -9,8 +9,9 @@
def execute(filters=None):
account_details = webnotes.conn.get_value("Account", filters["account"],
- ["debit_or_credit", "group_or_ledger"], as_dict=True)
- validate_filters(filters, account_details.group_or_ledger)
+ ["debit_or_credit", "group_or_ledger"], as_dict=True) if filters.get("account") else None
+ validate_filters(filters, account_details)
+
columns = get_columns()
data = []
if filters.get("group_by"):
@@ -20,14 +21,15 @@
if data:
data.append(get_total_row(data))
- if filters.get("account"):
+ if account_details:
data = [get_opening_balance_row(filters, account_details.debit_or_credit)] + data + \
[get_closing_balance_row(filters, account_details.debit_or_credit)]
return columns, data
-def validate_filters(filters, group_or_ledger):
- if group_or_ledger == "Ledger" and filters.get("group_by") == "Group by Account":
+def validate_filters(filters, account_details):
+ if account_details and account_details.group_or_ledger == "Ledger" \
+ and filters.get("group_by") == "Group by Account":
webnotes.throw(_("Can not filter based on Account, if grouped by Account"))
if filters.get("voucher_no") and filters.get("group_by") == "Group by Voucher":
diff --git a/setup/doctype/features_setup/features_setup.txt b/setup/doctype/features_setup/features_setup.txt
index 3f73ee2..d68f489 100644
--- a/setup/doctype/features_setup/features_setup.txt
+++ b/setup/doctype/features_setup/features_setup.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-12-20 12:50:49",
"docstatus": 0,
- "modified": "2013-11-03 14:20:18",
+ "modified": "2013-12-24 11:40:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -90,7 +90,7 @@
"doctype": "DocField",
"fieldname": "fs_packing_details",
"fieldtype": "Check",
- "label": "Packing Detials"
+ "label": "Packing Details"
},
{
"description": "To get Item Group in details table",