From 009f42c514aba29050a3be5f1120b23520617825 Mon Sep 17 00:00:00 2001
From: Safiyu <dheensafiyu@gmail.com>
Date: Fri, 6 Dec 2013 15:03:42 +0530
Subject: [PATCH] fixed issue #515 & #514

loan product
---
 app/global-translations/locale-en.json        |   2 +
 app/views/accounting/view_acc_rule.html       |   2 +-
 .../accounting/view_close_accounting.html     |   2 +-
 app/views/accounting/viewglaccounting.html    |   2 +-
 app/views/administration/viewuser.html        |   2 +-
 app/views/centers/viewcenter.html             |   4 +-
 app/views/clients/viewclient.html             |   4 +-
 app/views/loans/viewloanaccountdetails.html   |  11 +-
 app/views/loans/viewloancharge.html           |   2 +-
 app/views/loans/viewloancollateral.html       |  18 +-
 app/views/products/createloanproduct.html     | 489 +++++++++---------
 .../products/productmix/viewproductmix.html   |   2 +-
 app/views/products/viewcharge.html            |   2 +-
 app/views/system/viewcheckerinbox.html        |   4 +-
 app/views/system/viewcode.html                |   4 +-
 app/views/system/viewdatatable.html           |   2 +-
 app/views/system/viewdatatableentry.html      |   2 +-
 app/views/system/viewreport.html              |   2 +-
 app/views/templates/viewtemplate.html         |   2 +-
 19 files changed, 282 insertions(+), 276 deletions(-)

diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json
index 62dafa41..de46f005 100644
--- a/app/global-translations/locale-en.json
+++ b/app/global-translations/locale-en.json
@@ -908,6 +908,7 @@
     "label.heading.onprincipalpayment":"On Principal Payment",
     "label.heading.oninterestpayment":"On Interest Payment",
     "label.heading.editloanaccounttransaction":"Edit Transaction",
+    "label.heading.viewcollateral":"View Collateral",
 
     "#Anchors": "..",
     "label.anchor.viewloanaccount": "View Loan Account",
@@ -984,6 +985,7 @@
     "label.button.writeoff": "Write-Off",
     "label.button.close-rescheduled": "Close (as Rescheduled)",
     "label.button.assignloanofficer":"Assign Loan Officer",
+    "label.button.details":"Details",
 
     "#Misc Labels": "..",
     "label.selectpurpose": "Select purpose",
diff --git a/app/views/accounting/view_acc_rule.html b/app/views/accounting/view_acc_rule.html
index bca0f211..44186bdf 100644
--- a/app/views/accounting/view_acc_rule.html
+++ b/app/views/accounting/view_acc_rule.html
@@ -18,7 +18,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/accounting/view_close_accounting.html b/app/views/accounting/view_close_accounting.html
index 84f64aea..db9ba26f 100644
--- a/app/views/accounting/view_close_accounting.html
+++ b/app/views/accounting/view_close_accounting.html
@@ -13,7 +13,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/accounting/viewglaccounting.html b/app/views/accounting/viewglaccounting.html
index 4cdff221..64c8b62d 100644
--- a/app/views/accounting/viewglaccounting.html
+++ b/app/views/accounting/viewglaccounting.html
@@ -20,7 +20,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/administration/viewuser.html b/app/views/administration/viewuser.html
index 442f3850..b6cf5ccc 100644
--- a/app/views/administration/viewuser.html
+++ b/app/views/administration/viewuser.html
@@ -34,7 +34,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/centers/viewcenter.html b/app/views/centers/viewcenter.html
index 0101e025..8383a7e2 100644
--- a/app/views/centers/viewcenter.html
+++ b/app/views/centers/viewcenter.html
@@ -43,7 +43,7 @@
             <div class="modal-header silver">
                 <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
             </div>
-            <div class="modal-body modal-middle">
+            <div class="modal-body ">
                 <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                 <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
             </div>
@@ -52,7 +52,7 @@
             <div class="modal-header silver">
                 <h3 class="bolder">{{'label.heading.unassignstaff' | translate}}</h3>
             </div>
-            <div class="modal-body modal-middle">
+            <div class="modal-body ">
                 <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                 <button class="btn btn-primary" ng-click="unassign()">{{'label.button.confirm' | translate}}</button>
             </div>
diff --git a/app/views/clients/viewclient.html b/app/views/clients/viewclient.html
index 9856b26a..a65eb372 100644
--- a/app/views/clients/viewclient.html
+++ b/app/views/clients/viewclient.html
@@ -40,7 +40,7 @@
                       <div class="modal-header silver">
                           <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
                       </div>
-                      <div class="modal-body modal-middle">
+                      <div class="modal-body ">
                           <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                           <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
                       </div>
@@ -49,7 +49,7 @@
                       <div class="modal-header silver">
                           <h3 class="bolder">{{'label.heading.unassignstaff' | translate}}</h3>
                       </div>
-                      <div class="modal-body modal-middle">
+                      <div class="modal-body ">
                           <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                           <button class="btn btn-primary" ng-click="unassign()">{{'label.button.confirm' | translate}}</button>
                       </div>
diff --git a/app/views/loans/viewloanaccountdetails.html b/app/views/loans/viewloanaccountdetails.html
index f662671c..3d8ca3ea 100644
--- a/app/views/loans/viewloanaccountdetails.html
+++ b/app/views/loans/viewloanaccountdetails.html
@@ -184,7 +184,7 @@
             <div class="modal-header silver">
                 <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
             </div>
-            <div class="modal-body modal-middle">
+            <div class="modal-body ">
                 <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                 <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
             </div>
@@ -379,15 +379,16 @@
               <th>{{'label.heading.type' | translate}}</th>
               <th>{{'label.heading.description' | translate}}</th>
               <th>{{'label.heading.value' | translate}}</th>
+              <th></th>
             </thead>
             <tbody>
               <tr ng-repeat="collateral in loandetails.collateral">
                 <td>
-                  <a ng-show="loandetails.status.pendingApproval" href="#/loan/{{loandetails.id}}/viewcollateral/{{collateral.id}}">{{collateral.type.name}}</a>
-                  <a ng-hide="loandetails.status.pendingApproval">{{collateral.type.name}}</a>
+                  {{collateral.type.name}}
                 </td>
                 <td>{{collateral.description}}</td>
                 <td>{{collateral.value}}</td>
+                <td><a ng-show="loandetails.status.pendingApproval" style="text-decoration:none;" class="btn-primary" href="#/loan/{{loandetails.id}}/viewcollateral/{{collateral.id}}">{{'label.button.details' | translate}}</a></td>
               </tr>
             </tbody>
           </table>
@@ -496,9 +497,9 @@
         <tab heading="{{loandatatable.registeredTableName}}" ng-repeat="loandatatable in loandatatables" select="dataTableChange(loandatatable)">
           <div>
             <span data-ng-show="choice">
-                <a ng-show="datatabledetails.isData" class="btn btn-danger pull-right" ng-click="deleteAll(loandatatable.registeredTableName, loandetails.id)"><i class="icon-trash icon-white"></i>{{'button.deleteall' | translate}}</a>
+                <a ng-show="datatabledetails.isData" class="btn btn-danger pull-right" ng-click="deleteAll(loandatatable.registeredTableName, loandetails.id)"><i class="icon-trash icon-white"></i>{{'label.button.deleteall' | translate}}</a>
                 <span ng-show="!datatabledetails.isData || datatabledetails.isMultirow" class="pull-right ">
-                  <a href="#/makedatatableentry/{{loandatatable.registeredTableName}}/{{loandetails.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'button.add' | translate}}</a>
+                  <a href="#/makedatatableentry/{{loandatatable.registeredTableName}}/{{loandetails.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'label.button.add' | translate}}</a>
                 </span></br>
             </span>
             <table ng-show="datatabledetails.isData" class="table">
diff --git a/app/views/loans/viewloancharge.html b/app/views/loans/viewloancharge.html
index 2b5bd9cd..ecf08bb9 100644
--- a/app/views/loans/viewloancharge.html
+++ b/app/views/loans/viewloancharge.html
@@ -9,7 +9,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/loans/viewloancollateral.html b/app/views/loans/viewloancollateral.html
index 4e000d6f..20d2077a 100644
--- a/app/views/loans/viewloancollateral.html
+++ b/app/views/loans/viewloancollateral.html
@@ -4,24 +4,24 @@
 			<li><a href="#/viewloanaccount/{{loanId}}">{{'label.anchor.viewloanaccount' | translate}}</a><span class="divider">/</span></li>
 			<li class="active">{{ 'label.anchor.viewcollateral' | translate}}({{collateral.type.name}})</li>
 		</ul>
-		<div class="pull-right">
-			<div class="btn-group">
-				<a href="#/loan/{{loanId}}/editcollateral/{{collateralId}}" class="btn btn-primary"><i class="icon-edit icon-white"></i> {{'label.button.edit' | translate}}</a>
-				<button type="button" ng-click="deleteCollateral()" class="btn btn-danger"><i class="icon-trash icon-white"></i>{{'label.button.delete' | translate}}</button>
-			</div>
-		</div>
 	</div>
     <script type="text/ng-template" id="deletecollateral.html">
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
     </script>
-	<div class="row-fluid">
-		<h3>{{'label.input.viewcollateral' | translate}}</h3>
+	<div class="well">
+        <div class="pull-right">
+            <div class="btn-group">
+                <a href="#/loan/{{loanId}}/editcollateral/{{collateralId}}" class="btn btn-primary"><i class="icon-edit icon-white"></i> {{'label.button.edit' | translate}}</a>
+                <button type="button" ng-click="deleteCollateral()" class="btn btn-danger"><i class="icon-trash icon-white"></i>{{'label.button.delete' | translate}}</button>
+            </div>
+        </div>
+		<h3>{{'label.heading.viewcollateral' | translate}}</h3>
 		<table width="100%">
 			<tr>
 				<td width="20%">{{'label.heading.name' | translate}}</td>
diff --git a/app/views/products/createloanproduct.html b/app/views/products/createloanproduct.html
index 37f5cd87..8c7fc3b1 100644
--- a/app/views/products/createloanproduct.html
+++ b/app/views/products/createloanproduct.html
@@ -11,7 +11,7 @@
 <div class="control-group">
     <table width="100%">
         <tr class="control-group">
-            <td width="12%">
+            <td width="11%">
                 <label class="control-label"><h4>{{ 'label.heading.details' | translate }}</h4></label>
             </td>
             <td class="blockquoteresult">
@@ -506,10 +506,11 @@
 <tr class="span2"></tr>
 
 <tr class="control-group">
-    <td width="11%"></td>
-    <td width="80%">
+    <td>
+        <label class="control-label"><h4>{{ 'label.heading.accounting' | translate }}</h4></label>
+    </td>
+    <td class="blockquoteresult">
         <table>
-            <tr class="span2"></tr>
             <tr>
                 <td width="30%"></td>
                 <td>
@@ -522,257 +523,259 @@
                 </td>
             </tr>
         </table>
-    </td>
-</tr>
+        <div ng-show="formData.accountingRule==2">
+            <table width="50%">
+                <tr>
+                    <td>
+                        <hr/>
+                        <h3>{{ 'label.heading.assets' | translate }}</h3>
+                    </td>
+                </tr>
+                <tr class="control-group">
+                    <td>
+                        <label class="control-label">{{ 'label.input.fundsource' | translate }}&nbsp;</label>
+                        <select id="fundSourceAccountId" ng-model="formData.fundSourceAccountId"
+                                ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
+                                value="{{assetAccount.id}}">
+                        </select>
+                    </td>
+                </tr>
+                <tr class="control-group">
+                    <td>
+                        <label class="control-label">{{ 'label.input.loanportfolio' | translate }}&nbsp;</label>
+                        <select id="loanPortfolioAccountId" ng-model="formData.loanPortfolioAccountId"
+                                ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
+                                value="{{assetAccount.id}}">
+                        </select>
+                    </td>
+                    <td>
+                    </td>
+                </tr>
+                <tr class="control-group">
+                    <td>
+                        <label class="control-label">{{ 'label.input.transfersinsuspense' | translate }}&nbsp;</label>
+                        <select id="transfersInSuspenseAccountId" ng-model="formData.transfersInSuspenseAccountId"
+                                ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
+                                value="{{assetAccount.id}}">
+                        </select>
+                    </td>
+                    <td>
+                    </td>
+                </tr>
+            </table>
+            <table width="50%">
+                <tr>
+                    <td>
+                        <hr/>
+                        <h3>{{ 'label.heading.income' | translate }}</h3>
+                    </td>
+                </tr>
+                <tr class="control-group">
+                    <td>
+                        <label class="control-label">{{ 'label.input.incomefrominterest' | translate }}&nbsp;</label>
+                        <select id="interestOnLoanAccountId" ng-model="formData.interestOnLoanAccountId"
+                                ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
+                                value="{{incomeAccount.id}}">
+                        </select>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr class="control-group">
+                    <td>
+                        <label class="control-label">{{ 'label.input.incomefromfees' | translate }}&nbsp;</label>
+                        <select id="incomeFromFeeAccountId" ng-model="formData.incomeFromFeeAccountId"
+                                ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
+                                value="{{incomeAccount.id}}">
+                        </select>
+                    </td>
+                    <td>
+                    </td>
+                </tr>
+                <tr class="control-group">
+                    <td>
+                        <label class="control-label">{{ 'label.input.incomefrompenalties' | translate }}&nbsp;</label>
+                        <select id="incomeFromPenaltyAccountId" ng-model="formData.incomeFromPenaltyAccountId"
+                                ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
+                                value="{{incomeAccount.id}}">
+                        </select>
+                    </td>
+                    <td>
+                    </td>
+                </tr>
+            </table>
+            <table width="50%">
+                <tr>
+                    <td>
+                        <hr/>
+                        <h3>{{ 'label.heading.expenses' | translate }}</h3>
+                    </td>
+                </tr>
+                <tr class="control-group">
+                    <td>
+                        <label class="control-label">{{ 'label.input.loseswrittenoff' | translate }}&nbsp;</label>
+                        <select id="writeOffAccountId" ng-model="formData.writeOffAccountId"
+                                ng-options="expenseAccount.id as expenseAccount.name for expenseAccount in expenseAccountOptions"
+                                value="{{expenseAccount.id}}">
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <hr/>
+                        <h3>{{ 'label.heading.liabilities' | translate }}</h3>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">{{ 'label.input.overpaymentliability' | translate }}&nbsp;</label>
+                        <select id="overpaymentLiabilityAccountId" ng-model="formData.overpaymentLiabilityAccountId"
+                                ng-options="liability.id as liability.name for liability in liabilityOptions"
+                                value="{{liability.id}}">
+                        </select>
+                    </td>
+                </tr>
+                <tr class="span2"></tr>
+            </table>
+            <table>
+                <tr class="control-group">
+                    <td>
+                        <h4>{{'label.heading.advancedaccountingrules' | translate}}[<a
+                                ng-click="showOrHide(showOrHideValue)">{{showOrHideValue}}</a>]</h4></br>
+                    </td>
+                </tr>
+                <tr class="control-group">
+                    <td>
+                        <table style="margin-left: -20px;width: 750px;" ng-show="showOrHideValue == 'hide'">
+                            <tr>
+                                <td>{{'label.heading.configurefundsourcesforpaymentchannels' | translate}}</td>
+                                <td></td>
+                            </tr>
+                            <tr>
+                                <td><a class="btn btn-primary" ng-click="addConfigureFundSource()">{{ 'label.button.add' |
+                                    translate }}</a></td>
+                            </tr>
+                            <tr>
+                                <td data-ng-show="frFlag">
+                                    <table class="table advacctable">
+                                        <tr class="graybg">
+                                            <th>{{'label.heading.paymenttype' | translate}}</th>
 
-<tr ng-show="formData.accountingRule==2" class="control-group">
-    <td>
-        <label class="control-label"><h4>{{ 'label.heading.accounting' | translate }}</h4></label>
-    </td>
-    <td class="blockquoteresult">
-        <table width="50%">
-            <tr>
-                <td>
-                    <hr class="marginbottom">
-                </td>
-            </tr>
-            <tr class="control-group">
-                <td>
-                    <label class="control-label">{{ 'label.input.fundsource' | translate }}&nbsp;</label>
-                    <select id="fundSourceAccountId" ng-model="formData.fundSourceAccountId"
-                            ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
-                            value="{{assetAccount.id}}">
-                    </select>
-                </td>
-            </tr>
-            <tr class="control-group">
-                <td>
-                    <label class="control-label">{{ 'label.input.loanportfolio' | translate }}&nbsp;</label>
-                    <select id="loanPortfolioAccountId" ng-model="formData.loanPortfolioAccountId"
-                            ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
-                            value="{{assetAccount.id}}">
-                    </select>
-                </td>
-                <td>
-                </td>
-            </tr>
-            <tr class="control-group">
-                <td>
-                    <label class="control-label">{{ 'label.input.transfersinsuspense' | translate }}&nbsp;</label>
-                    <select id="transfersInSuspenseAccountId" ng-model="formData.transfersInSuspenseAccountId"
-                            ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
-                            value="{{assetAccount.id}}">
-                    </select>
-                </td>
-                <td>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <hr class="marginbottom">
-                </td>
-            </tr>
-        </table>
-        <table width="50%">
-            <tr class="control-group">
-                <td>
-                    <label class="control-label">{{ 'label.input.incomefrominterest' | translate }}&nbsp;</label>
-                    <select id="interestOnLoanAccountId" ng-model="formData.interestOnLoanAccountId"
-                            ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
-                            value="{{incomeAccount.id}}">
-                    </select>
-                </td>
-                <td></td>
-            </tr>
-            <tr class="control-group">
-                <td>
-                    <label class="control-label">{{ 'label.input.incomefromfees' | translate }}&nbsp;</label>
-                    <select id="incomeFromFeeAccountId" ng-model="formData.incomeFromFeeAccountId"
-                            ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
-                            value="{{incomeAccount.id}}">
-                    </select>
-                </td>
-                <td>
-                </td>
-            </tr>
-            <tr class="control-group">
-                <td>
-                    <label class="control-label">{{ 'label.input.incomefrompenalties' | translate }}&nbsp;</label>
-                    <select id="incomeFromPenaltyAccountId" ng-model="formData.incomeFromPenaltyAccountId"
-                            ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
-                            value="{{incomeAccount.id}}">
-                    </select>
-                </td>
-                <td>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <hr class="marginbottom">
-                </td>
-            </tr>
-        </table>
-        <table width="50%">
-            <tr class="control-group">
-                <td>
-                    <label class="control-label">{{ 'label.input.loseswrittenoff' | translate }}&nbsp;</label>
-                    <select id="writeOffAccountId" ng-model="formData.writeOffAccountId"
-                            ng-options="expenseAccount.id as expenseAccount.name for expenseAccount in expenseAccountOptions"
-                            value="{{expenseAccount.id}}">
-                    </select>
-                    <hr/>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label class="control-label">{{ 'label.input.overpaymentliability' | translate }}&nbsp;</label>
-                    <select id="overpaymentLiabilityAccountId" ng-model="formData.overpaymentLiabilityAccountId"
-                            ng-options="liability.id as liability.name for liability in liabilityOptions"
-                            value="{{liability.id}}">
-                    </select>
-                </td>
-            </tr>
-            <tr class="span2"></tr>
-        </table>
-        <table>
-            <tr class="control-group">
-                <td>
-                    <h4>{{'label.heading.advancedaccountingrules' | translate}}[<a
-                            ng-click="showOrHide(showOrHideValue)">{{showOrHideValue}}</a>]</h4></br>
-                </td>
-            </tr>
-            <tr class="control-group">
-                <td>
-                    <table style="margin-left: -20px;width: 750px;" ng-show="showOrHideValue == 'hide'">
-                        <tr>
-                            <td>{{'label.heading.configurefundsourcesforpaymentchannels' | translate}}</td>
-                            <td></td>
-                        </tr>
-                        <tr>
-                            <td><a class="btn btn-primary" ng-click="addConfigureFundSource()">{{ 'label.button.add' |
-                                translate }}</a></td>
-                        </tr>
-                        <tr>
-                            <td data-ng-show="frFlag">
-                                <table class="table advacctable">
-                                    <tr class="graybg">
-                                        <th>{{'label.heading.paymenttype' | translate}}</th>
+                                            <th>{{'label.heading.fundsource' | translate}}</th>
 
-                                        <th>{{'label.heading.fundsource' | translate}}</th>
+                                            <th>{{'label.heading.actions' | translate}}</th>
+                                        </tr>
+                                        <tr ng-repeat="configureFundOption in configureFundOptions">
+                                            <td>
+                                                <select id="configureFundOptions[{{$index}}].paymentTypeId"
+                                                        ng-model="configureFundOption.paymentTypeId"
+                                                        ng-options="paymentType.id as paymentType.name for paymentType in configureFundOption.paymentTypeOptions"
+                                                        value="{{paymentType.id}}">
+                                                </select>
+                                            </td>
 
-                                        <th>{{'label.heading.actions' | translate}}</th>
-                                    </tr>
-                                    <tr ng-repeat="configureFundOption in configureFundOptions">
-                                        <td>
-                                            <select id="configureFundOptions[{{$index}}].paymentTypeId"
-                                                    ng-model="configureFundOption.paymentTypeId"
-                                                    ng-options="paymentType.id as paymentType.name for paymentType in configureFundOption.paymentTypeOptions"
-                                                    value="{{paymentType.id}}">
-                                            </select>
-                                        </td>
+                                            <td>
+                                                <select id="configureFundOptions[{{$index}}].fundSourceAccountId"
+                                                        ng-model="configureFundOption.fundSourceAccountId"
+                                                        ng-options="assetAccount.id as assetAccount.name for assetAccount in configureFundOption.assetAccountOptions"
+                                                        value="{{assetAccount.id}}">
+                                                </select>
+                                            </td>
 
-                                        <td>
-                                            <select id="configureFundOptions[{{$index}}].fundSourceAccountId"
-                                                    ng-model="configureFundOption.fundSourceAccountId"
-                                                    ng-options="assetAccount.id as assetAccount.name for assetAccount in configureFundOption.assetAccountOptions"
-                                                    value="{{assetAccount.id}}">
-                                            </select>
-                                        </td>
+                                            <td>
+                                                <a ng-click="deleteFund($index)"><i class="icon-remove icon-white"></i></a>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>{{'label.heading.mapfeestoincomeaccounts' | translate}}</td>
+                                <td></td>
+                            </tr>
+                            <tr>
+                                <td><a class="btn btn-primary" ng-click="mapFees()">{{ 'label.button.add' | translate }}</a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td data-ng-show="fiFlag">
+                                    <table class="table advacctable">
+                                        <tr class="graybg">
+                                            <th>{{'label.heading.fees' | translate}}</th>
 
-                                        <td>
-                                            <a ng-click="deleteFund($index)"><i class="icon-remove icon-white"></i></a>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>{{'label.heading.mapfeestoincomeaccounts' | translate}}</td>
-                            <td></td>
-                        </tr>
-                        <tr>
-                            <td><a class="btn btn-primary" ng-click="mapFees()">{{ 'label.button.add' | translate }}</a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td data-ng-show="fiFlag">
-                                <table class="table advacctable">
-                                    <tr class="graybg">
-                                        <th>{{'label.heading.fees' | translate}}</th>
+                                            <th>{{'label.heading.incomeaccount' | translate}}</th>
 
-                                        <th>{{'label.heading.incomeaccount' | translate}}</th>
+                                            <th>{{'label.heading.actions' | translate}}</th>
+                                        </tr>
+                                        <tr ng-repeat="specificIncomeaccount in specificIncomeaccounts">
+                                            <td>
+                                                <select id="specificIncomeaccounts[{{$index}}].chargeId"
+                                                        ng-model="specificIncomeaccount.chargeId"
+                                                        ng-options="charge.id as charge.name for charge in specificIncomeaccount.chargeOptions"
+                                                        value="{{charge.id}}">
+                                                </select>
+                                            </td>
 
-                                        <th>{{'label.heading.actions' | translate}}</th>
-                                    </tr>
-                                    <tr ng-repeat="specificIncomeaccount in specificIncomeaccounts">
-                                        <td>
-                                            <select id="specificIncomeaccounts[{{$index}}].chargeId"
-                                                    ng-model="specificIncomeaccount.chargeId"
-                                                    ng-options="charge.id as charge.name for charge in specificIncomeaccount.chargeOptions"
-                                                    value="{{charge.id}}">
-                                            </select>
-                                        </td>
+                                            <td>
+                                                <select id="specificIncomeaccounts[{{$index}}].incomeAccountId"
+                                                        ng-model="specificIncomeaccount.incomeAccountId"
+                                                        ng-options="assetAccount.id as assetAccount.name for assetAccount in specificIncomeaccount.incomeAccountOptions"
+                                                        value="{{assetAccount.id}}">
+                                                </select>
+                                            </td>
 
-                                        <td>
-                                            <select id="specificIncomeaccounts[{{$index}}].incomeAccountId"
-                                                    ng-model="specificIncomeaccount.incomeAccountId"
-                                                    ng-options="assetAccount.id as assetAccount.name for assetAccount in specificIncomeaccount.incomeAccountOptions"
-                                                    value="{{assetAccount.id}}">
-                                            </select>
-                                        </td>
+                                            <td>
+                                                <a ng-click="deleteFee($index)"><i class="icon-remove icon-white"></i></a>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>{{'label.heading.mappenaltiestospecificincomeaccounts' | translate}}</td>
+                                <td></td>
+                            </tr>
+                            <tr>
+                                <td><a class="btn btn-primary" ng-click="mapPenalty()">{{ 'label.button.add' | translate
+                                    }}</a></td>
+                            </tr>
+                            <tr>
+                                <td data-ng-show="piFlag">
+                                    <table class="table advacctable">
+                                        <tr class="graybg">
+                                            <th>{{'label.heading.penalty' | translate}}</th>
 
-                                        <td>
-                                            <a ng-click="deleteFee($index)"><i class="icon-remove icon-white"></i></a>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>{{'label.heading.mappenaltiestospecificincomeaccounts' | translate}}</td>
-                            <td></td>
-                        </tr>
-                        <tr>
-                            <td><a class="btn btn-primary" ng-click="mapPenalty()">{{ 'label.button.add' | translate
-                                }}</a></td>
-                        </tr>
-                        <tr>
-                            <td data-ng-show="piFlag">
-                                <table class="table advacctable">
-                                    <tr class="graybg">
-                                        <th>{{'label.heading.penalty' | translate}}</th>
+                                            <th>{{'label.heading.incomeaccount' | translate}}</th>
 
-                                        <th>{{'label.heading.incomeaccount' | translate}}</th>
+                                            <th>{{'label.heading.actions' | translate}}</th>
+                                        </tr>
+                                        <tr ng-repeat="penaltySpecificIncomeaccount in penaltySpecificIncomeaccounts">
+                                            <td>
+                                                <select id="penaltySpecificIncomeaccounts[{{$index}}].chargeId"
+                                                        ng-model="penaltySpecificIncomeaccount.chargeId"
+                                                        ng-options="charge.id as charge.name for charge in penaltySpecificIncomeaccount.penaltyOptions"
+                                                        value="{{charge.id}}">
+                                                </select>
+                                            </td>
 
-                                        <th>{{'label.heading.actions' | translate}}</th>
-                                    </tr>
-                                    <tr ng-repeat="penaltySpecificIncomeaccount in penaltySpecificIncomeaccounts">
-                                        <td>
-                                            <select id="penaltySpecificIncomeaccounts[{{$index}}].chargeId"
-                                                    ng-model="penaltySpecificIncomeaccount.chargeId"
-                                                    ng-options="charge.id as charge.name for charge in penaltySpecificIncomeaccount.penaltyOptions"
-                                                    value="{{charge.id}}">
-                                            </select>
-                                        </td>
+                                            <td>
+                                                <select id="penaltySpecificIncomeaccounts[{{$index}}].incomeAccountId"
+                                                        ng-model="penaltySpecificIncomeaccount.incomeAccountId"
+                                                        ng-options="assetAccount.id as assetAccount.name for assetAccount in penaltySpecificIncomeaccount.incomeAccountOptions"
+                                                        value="{{assetAccount.id}}">
+                                                </select>
+                                            </td>
 
-                                        <td>
-                                            <select id="penaltySpecificIncomeaccounts[{{$index}}].incomeAccountId"
-                                                    ng-model="penaltySpecificIncomeaccount.incomeAccountId"
-                                                    ng-options="assetAccount.id as assetAccount.name for assetAccount in penaltySpecificIncomeaccount.incomeAccountOptions"
-                                                    value="{{assetAccount.id}}">
-                                            </select>
-                                        </td>
-
-                                        <td><a ng-click="deletePenalty($index)"><i
-                                                class="icon-remove icon-white"></i></a></td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
+                                            <td><a ng-click="deletePenalty($index)"><i
+                                                    class="icon-remove icon-white"></i></a></td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </div>
     </td>
 </tr>
 
diff --git a/app/views/products/productmix/viewproductmix.html b/app/views/products/productmix/viewproductmix.html
index f2422671..fa0f755b 100644
--- a/app/views/products/productmix/viewproductmix.html
+++ b/app/views/products/productmix/viewproductmix.html
@@ -26,7 +26,7 @@
                 <div class="modal-header silver">
                     <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
                 </div>
-                <div class="modal-body modal-middle">
+                <div class="modal-body ">
                     <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                     <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
                 </div>
diff --git a/app/views/products/viewcharge.html b/app/views/products/viewcharge.html
index b1e2b208..ffac6a70 100644
--- a/app/views/products/viewcharge.html
+++ b/app/views/products/viewcharge.html
@@ -31,7 +31,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/system/viewcheckerinbox.html b/app/views/system/viewcheckerinbox.html
index bb12747d..a894a524 100644
--- a/app/views/system/viewcheckerinbox.html
+++ b/app/views/system/viewcheckerinbox.html
@@ -56,7 +56,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
@@ -65,7 +65,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.approve' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="approve()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/system/viewcode.html b/app/views/system/viewcode.html
index 53554ae4..16565e4d 100644
--- a/app/views/system/viewcode.html
+++ b/app/views/system/viewcode.html
@@ -20,7 +20,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
@@ -29,7 +29,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/system/viewdatatable.html b/app/views/system/viewdatatable.html
index af485311..50a6c39c 100644
--- a/app/views/system/viewdatatable.html
+++ b/app/views/system/viewdatatable.html
@@ -18,7 +18,7 @@
                 <div class="modal-header silver">
                     <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
                 </div>
-                <div class="modal-body modal-middle">
+                <div class="modal-body ">
                     <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                     <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
                 </div>
diff --git a/app/views/system/viewdatatableentry.html b/app/views/system/viewdatatableentry.html
index b0ac85b5..6339181d 100644
--- a/app/views/system/viewdatatableentry.html
+++ b/app/views/system/viewdatatableentry.html
@@ -9,7 +9,7 @@
             <div class="modal-header silver">
                 <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
             </div>
-            <div class="modal-body modal-middle">
+            <div class="modal-body ">
                 <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                 <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
             </div>
diff --git a/app/views/system/viewreport.html b/app/views/system/viewreport.html
index 4b8237ff..2f53fe8f 100644
--- a/app/views/system/viewreport.html
+++ b/app/views/system/viewreport.html
@@ -16,7 +16,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/templates/viewtemplate.html b/app/views/templates/viewtemplate.html
index 9d5d918b..6507fd94 100644
--- a/app/views/templates/viewtemplate.html
+++ b/app/views/templates/viewtemplate.html
@@ -15,7 +15,7 @@
         <div class="modal-header silver">
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
-        <div class="modal-body modal-middle">
+        <div class="modal-body ">
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>