[minor] auto-create Fiscal Year, loading, general ledger

erpnext/accounts/doctype/fiscal_year/fiscal_year.py

@@ -35,7 +35,7 @@ class FiscalYear(Document):
 
 		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 @@ def auto_create_fiscal_year():
 			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
+		except frappe.NameError:
+			pass

erpnext/accounts/report/general_ledger/general_ledger.js

@@ -27,9 +27,6 @@ frappe.query_reports["General Ledger"] = {
 			"reqd": 1,
 			"width": "60px"
 		},
-		{
-			"fieldtype": "Break",
-		},
 		{
 			"fieldname":"account",
 			"label": __("Account"),
@@ -38,7 +35,7 @@ frappe.query_reports["General Ledger"] = {
 			"get_query": function() {
 				var company = frappe.query_report.filters_by_name.company.get_value();
 				return {
-					"doctype": "Account", 
+					"doctype": "Account",
 					"filters": {
 						"company": company,
 					}
@@ -50,6 +47,9 @@ frappe.query_reports["General Ledger"] = {
 			"label": __("Voucher No"),
 			"fieldtype": "Data",
 		},
+		{
+			"fieldtype": "Break",
+		},
 		{
 			"fieldname":"group_by_voucher",
 			"label": __("Group by Voucher"),
@@ -62,4 +62,4 @@ frappe.query_reports["General Ledger"] = {
 			"fieldtype": "Check",
 		}
 	]
-}
+}

erpnext/templates/includes/transactions.html

@@ -6,9 +6,7 @@
 	<p id="msgprint-alert" class="alert alert-danger"
 		style="display: none;">&nbsp;</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>

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>
 

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>