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

This commit is contained in:
Anand Doshi 2015-01-12 12:18:54 +05:30
parent 4ab09fab11
commit b942cb86ae
5 changed files with 12 additions and 18 deletions

View File

@ -62,5 +62,5 @@ def auto_create_fiscal_year():
new_fy.year = start_year if start_year==end_year else (start_year + "-" + end_year) new_fy.year = start_year if start_year==end_year else (start_year + "-" + end_year)
new_fy.insert() new_fy.insert()
except: except frappe.NameError:
pass pass

View File

@ -27,9 +27,6 @@ frappe.query_reports["General Ledger"] = {
"reqd": 1, "reqd": 1,
"width": "60px" "width": "60px"
}, },
{
"fieldtype": "Break",
},
{ {
"fieldname":"account", "fieldname":"account",
"label": __("Account"), "label": __("Account"),
@ -50,6 +47,9 @@ frappe.query_reports["General Ledger"] = {
"label": __("Voucher No"), "label": __("Voucher No"),
"fieldtype": "Data", "fieldtype": "Data",
}, },
{
"fieldtype": "Break",
},
{ {
"fieldname":"group_by_voucher", "fieldname":"group_by_voucher",
"label": __("Group by Voucher"), "label": __("Group by Voucher"),

View File

@ -6,9 +6,7 @@
<p id="msgprint-alert" class="alert alert-danger" <p id="msgprint-alert" class="alert alert-danger"
style="display: none;">&nbsp;</p> style="display: none;">&nbsp;</p>
<div class="list-group transaction-list"> <div class="list-group transaction-list">
<div class="progress progress-striped active"> <div class="text-muted progress">{{ _("Loading") }}...</div>
<div class="progress-bar progress-bar-info" style="width: 100%;"></div>
</div>
</div> </div>
<div class="text-center"> <div class="text-center">
<button class="btn btn-default btn-show-more hide">More</button> <button class="btn btn-default btn-show-more hide">More</button>

View File

@ -9,9 +9,7 @@
<p><a class="btn btn-default" href="address"><i class="icon-plus"> New Address</i></a></p> <p><a class="btn btn-default" href="address"><i class="icon-plus"> New Address</i></a></p>
<hr> <hr>
<div id="address-list"> <div id="address-list">
<div class="progress progress-striped active"> <div class="text-muted progress">{{ _("Loading") }}...</div>
<div class="progress-bar progress-bar-info" style="width: 100%;"></div>
</div>
</div> </div>
</div> </div>

View File

@ -6,9 +6,7 @@
{% block content %} {% block content %}
<div class="cart-content"> <div class="cart-content">
<div class="progress progress-striped active"> <div class="text-muted progress">{{ _("Loading") }}...</div>
<div class="progress-bar progress-bar-info" style="width: 100%;"></div>
</div>
<div id="cart-container" class="hide"> <div id="cart-container" class="hide">
<p class="pull-right"><button class="btn btn-success btn-place-order" type="button">Place Order</button></p> <p class="pull-right"><button class="btn btn-success btn-place-order" type="button">Place Order</button></p>
<div class="clearfix"></div> <div class="clearfix"></div>