BudgetError Fix
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index bbc69f5..b7b698c 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -7,7 +7,6 @@
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
- "document_type": "Document",
"fields": [
{
"allow_on_submit": 0,
@@ -17,7 +16,6 @@
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "Posting Date",
@@ -27,7 +25,6 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -43,7 +40,6 @@
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Transaction Date",
@@ -53,7 +49,6 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -69,7 +64,6 @@
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "Account",
@@ -80,7 +74,6 @@
"options": "Account",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -96,7 +89,6 @@
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Party Type",
@@ -105,7 +97,6 @@
"options": "DocType",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -121,7 +112,6 @@
"fieldtype": "Dynamic Link",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Party",
@@ -130,7 +120,6 @@
"options": "party_type",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -146,7 +135,6 @@
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "Cost Center",
@@ -157,7 +145,6 @@
"options": "Cost Center",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -173,7 +160,6 @@
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Debit Amount",
@@ -185,7 +171,6 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -201,7 +186,6 @@
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Credit Amount",
@@ -213,7 +197,6 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -229,7 +212,6 @@
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Account Currency",
@@ -239,7 +221,6 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -255,7 +236,6 @@
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Debit Amount in Account Currency",
@@ -265,7 +245,6 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -281,7 +260,6 @@
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Credit Amount in Account Currency",
@@ -291,7 +269,6 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -307,7 +284,6 @@
"fieldtype": "Text",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
"label": "Against",
@@ -317,7 +293,6 @@
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -333,7 +308,6 @@
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Against Voucher Type",
@@ -344,7 +318,6 @@
"options": "DocType",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -360,7 +333,6 @@
"fieldtype": "Dynamic Link",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
"label": "Against Voucher",
@@ -371,7 +343,6 @@
"options": "against_voucher_type",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -387,7 +358,6 @@
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
"label": "Voucher Type",
@@ -398,7 +368,6 @@
"options": "DocType",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -414,7 +383,6 @@
"fieldtype": "Dynamic Link",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
"label": "Voucher No",
@@ -425,7 +393,6 @@
"options": "voucher_type",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -441,7 +408,6 @@
"fieldtype": "Text",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
"label": "Remarks",
@@ -451,7 +417,6 @@
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -467,7 +432,6 @@
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
"label": "Is Opening",
@@ -478,7 +442,6 @@
"options": "No\nYes",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -494,7 +457,6 @@
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Is Advance",
@@ -505,7 +467,31 @@
"options": "No\nYes",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Fiscal Year",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "fiscal_year",
+ "oldfieldtype": "Select",
+ "options": "Fiscal Year",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -521,7 +507,6 @@
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
"label": "Company",
@@ -532,7 +517,6 @@
"options": "Company",
"permlevel": 0,
"print_hide": 0,
- "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -551,7 +535,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-03-03 06:37:28.153004",
+ "modified": "2015-11-16 06:29:47.382225",
"modified_by": "Administrator",
"module": "Accounts",
"name": "GL Entry",
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 635bcd1..ae225d2 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -220,6 +220,7 @@
gl_dict = frappe._dict({
'company': self.company,
'posting_date': self.posting_date,
+ 'fiscal_year': get_fiscal_year(self.posting_date, company=self.company)[0],
'voucher_type': self.doctype,
'voucher_no': self.name,
'remarks': self.get("remarks"),