From 748d9e138f89208d903eed93448bee68f19e4fde Mon Sep 17 00:00:00 2001
From: Muciojad <muciojad@gmail.com>
Date: Mon, 12 Jan 2015 15:56:54 +0100
Subject: [PATCH] MIFOSX-1833 & MIFOSX-1590

1833 - In the Add journal entry - Drop down accounts should be sorted with respect to gl code
Sorted.
1590 - Moving icons on Accounting Menu page distracting - Resolved, icons are static now.
---
 app/views/accounting/accounting.html           | 4 ++--
 app/views/accounting/journalentry_posting.html | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/accounting/accounting.html b/app/views/accounting/accounting.html
index 0c5eff0f68..47dc1366fd 100755
--- a/app/views/accounting/accounting.html
+++ b/app/views/accounting/accounting.html
@@ -2,7 +2,7 @@
     <div class="col-sm-6 col-md-6">
         <div class="list-group">
             <a class="list-group-item" href="#/freqposting" has-permission='CREATE_JOURNALENTRY'>
-                <h4 class="list-group-item-heading"><i class="icon-repeat icon-large icon-spin"></i>&nbsp;&nbsp;{{
+                <h4 class="list-group-item-heading"><i class="icon-repeat icon-large"></i>&nbsp;&nbsp;{{
                     'label.heading.frequentpostings' | translate}}</h4>
 
                 <p class="list-group-item-text">{{'label.thesearepredefinedpostings' | translate}}</p>
@@ -48,7 +48,7 @@ <h4 class="list-group-item-heading"><i class="icon-large icon-lock"></i>&nbsp;&n
             <p class="list-group-item-text">{{ 'label.listsallaccountingrules' | translate}}</p>
         </a>
         <a class="list-group-item" href="#/run_periodic_accrual" has-permission='EXECUTE_PERIODICACCRUALACCOUNTING'>
-            <h4 class="list-group-item-heading"><i class="icon-cog icon-spin icon-large"></i>&nbsp;&nbsp;{{
+            <h4 class="list-group-item-heading"><i class="icon-cog icon-large"></i>&nbsp;&nbsp;{{
                 'label.heading.execute.periodic.accounting' | translate}}</h4>
 
             <p class="list-group-item-text">{{ 'label.execute.periodic.accounting' | translate}}</p>
diff --git a/app/views/accounting/journalentry_posting.html b/app/views/accounting/journalentry_posting.html
index f507b667ab..09539a94b5 100644
--- a/app/views/accounting/journalentry_posting.html
+++ b/app/views/accounting/journalentry_posting.html
@@ -36,16 +36,16 @@
 	                <h4><strong>{{ 'label.input.debit' | translate }}</strong>&nbsp;<a ng-click="addDebitAccount()">&nbsp;<i class="icon-plus icon-white"></i></a></h4>
 	                <div ng-repeat="dbAccount in formData.dbAccounts" class="form-inline paddedbottom10">
 	                    <select chosen="glAccounts" ng-model="dbAccount.select"
-                                ng-options="(debitAccount.name +'('+ debitAccount.glCode +')') for debitAccount in glAccounts" class="form-control">
+                                ng-options="(debitAccount.name +'('+ debitAccount.glCode +')') for debitAccount in glAccounts | orderBy:'glCode'" class="form-control">
                             <option class="displaynone" value="">{{'label.selectdebit' | translate}}</option>
                         </select>&nbsp;&nbsp;
 	                    <input type="text" class="input-small form-control" ng-model="dbAccount.debitAmount">
 	                    &nbsp;<a ng-click="removeDebitAccount($index)">&nbsp;<i class="icon-remove icon-white"></i></a>
 	                </div>
 	            	<h4><strong>{{ 'label.input.credit' | translate }}</strong>&nbsp;<a ng-click="addCrAccount()">&nbsp;<i class="icon-plus icon-white"></i></a></h4>
-	                <div ng-repeat="crAccount in formData.crAccounts" class="form-inline paddedbottom10">
+	                <div ng-repeat="crAccount in formData.crAccounts " class="form-inline paddedbottom10">
 						<select chosen="glAccounts" ng-model="crAccount.select"
-						        ng-options="(creditAccount.name + '('+ creditAccount.glCode + ')') for creditAccount in glAccounts" class="form-control">
+						        ng-options="(creditAccount.name + '('+ creditAccount.glCode + ')') for creditAccount in glAccounts | orderBy:'glCode'" class="form-control">
 						    <option class="displaynone" value="">{{'label.selectcredit' | translate}}</option>
 						</select>&nbsp;&nbsp;
 	                  	<input type="text" class="input-small form-control" ng-model="crAccount.crAmount">&nbsp;