[minor] auto-create Fiscal Year, loading, general ledger
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
index 4549498..3459918 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -35,7 +35,7 @@
if (getdate(self.year_end_date) - getdate(self.year_start_date)).days > 366:
frappe.throw(_("Fiscal Year Start Date and Fiscal Year End Date cannot be more than a year apart."))
-
+
check_duplicate_fiscal_year(self)
@frappe.whitelist()
@@ -60,7 +60,7 @@
start_year = new_fy.year_start_date[:4]
end_year = new_fy.year_end_date[:4]
new_fy.year = start_year if start_year==end_year else (start_year + "-" + end_year)
-
+
new_fy.insert()
- except:
- pass
\ No newline at end of file
+ except frappe.NameError:
+ pass
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index b4f283e..cae4cc5 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -28,9 +28,6 @@
"width": "60px"
},
{
- "fieldtype": "Break",
- },
- {
"fieldname":"account",
"label": __("Account"),
"fieldtype": "Link",
@@ -38,7 +35,7 @@
"get_query": function() {
var company = frappe.query_report.filters_by_name.company.get_value();
return {
- "doctype": "Account",
+ "doctype": "Account",
"filters": {
"company": company,
}
@@ -51,6 +48,9 @@
"fieldtype": "Data",
},
{
+ "fieldtype": "Break",
+ },
+ {
"fieldname":"group_by_voucher",
"label": __("Group by Voucher"),
"fieldtype": "Check",
@@ -62,4 +62,4 @@
"fieldtype": "Check",
}
]
-}
\ No newline at end of file
+}
diff --git a/erpnext/templates/includes/transactions.html b/erpnext/templates/includes/transactions.html
index b0eda19..fb570cd 100644
--- a/erpnext/templates/includes/transactions.html
+++ b/erpnext/templates/includes/transactions.html
@@ -6,9 +6,7 @@
<p id="msgprint-alert" class="alert alert-danger"
style="display: none;"> </p>
<div class="list-group transaction-list">
- <div class="progress progress-striped active">
- <div class="progress-bar progress-bar-info" style="width: 100%;"></div>
- </div>
+ <div class="text-muted progress">{{ _("Loading") }}...</div>
</div>
<div class="text-center">
<button class="btn btn-default btn-show-more hide">More</button>
diff --git a/erpnext/templates/pages/addresses.html b/erpnext/templates/pages/addresses.html
index 5cb56c0..997143a 100644
--- a/erpnext/templates/pages/addresses.html
+++ b/erpnext/templates/pages/addresses.html
@@ -9,9 +9,7 @@
<p><a class="btn btn-default" href="address"><i class="icon-plus"> New Address</i></a></p>
<hr>
<div id="address-list">
- <div class="progress progress-striped active">
- <div class="progress-bar progress-bar-info" style="width: 100%;"></div>
- </div>
+ <div class="text-muted progress">{{ _("Loading") }}...</div>
</div>
</div>
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index a8dc03e..07e9560 100644
--- a/erpnext/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -6,9 +6,7 @@
{% block content %}
<div class="cart-content">
- <div class="progress progress-striped active">
- <div class="progress-bar progress-bar-info" style="width: 100%;"></div>
- </div>
+ <div class="text-muted progress">{{ _("Loading") }}...</div>
<div id="cart-container" class="hide">
<p class="pull-right"><button class="btn btn-success btn-place-order" type="button">Place Order</button></p>
<div class="clearfix"></div>