Merge pull request #1592 from nazeer1100126/develop_glaccounts

showing gl account types and usage in locale specific language
openMF · Jun 30, 2016 · dc7e2bf · dc7e2bf
2 parents cf076ed + c8da548
commit dc7e2bf
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/app/global-translations/locale-es.json b/app/global-translations/locale-es.json
@@ -929,6 +929,14 @@
 	"accountType.expense": "Gastos",
 	"accountUsage.detail": "Detalle",
 	"accountUsage.header": "Encabezado",
+	"ASSET": "Activos",
+	"LIABILITY": "Pasivos",
+	"EQUITY": "Acciones",
+	"INCOME": "Ingresos",
+	"EXPENSE": "Gastos",
+	"DETAIL": "Detalle",
+	"HEADER": "Encabezado",
+	"Accounting":"Contabilidad",
 	"validation.msg.accounttransfer.fromOfficeId.cannot.be.blank": "De la oficina es obligatorio.",
 	"validation.msg.accounttransfer.fromClientId.cannot.be.blank": "Del cliente es obligatorio.",
 	"validation.msg.accounttransfer.fromAccountId.cannot.be.blank": "De la cuenta de ahorros es obligatorio.",
@@ -3446,7 +3454,8 @@
 	"Savings Transaction Receipt": "Recibo de Transacción de Ahorro",
 	"Staff Assignment History": "La historia de asignación de personal",
 	"Balance Sheet": "Hoja de balance",
-	"GeneralLedgerReport": "GeneralLedgerReport",
+	"GeneralLedgerReport": "Informe General Ledger",
+	"Savings Accounts Dormancy Report":"Las cuentas de ahorro Informe de latencia",
 	"Income Statement": "Cuenta de resultados",
 	"Progress Report": "Informe de progreso",
 	"Trial Balance": "Balance de comprobación",

diff --git a/app/scripts/controllers/accounting/AccCoaController.js b/app/scripts/controllers/accounting/AccCoaController.js
@@ -1,6 +1,6 @@
 (function (module) {
     mifosX.controllers = _.extend(module, {
-        AccCoaController: function (scope,$rootScope, resourceFactory, location) {
+        AccCoaController: function (scope,$rootScope, translate, resourceFactory, location) {
 
 			$rootScope.tempNodeID = -100; // variable used to store nodeID (from directive), so it(nodeID) is available for detail-table
 
@@ -42,14 +42,19 @@
 
             resourceFactory.accountCoaResource.getAllAccountCoas(function (data) {
                 scope.coadatas = scope.deepCopy(data);
-
+                scope.ASSET = translate('ASSET') ;
+                scope.LIABILITY = translate('LIABILITY') ;
+                scope.EQUITY = translate('EQUITY') ;
+                scope.INCOME = translate('INCOME') ;
+                scope.EXPENSE = translate('EXPENSE') ;
+                scope.Accounting = translate('Accounting') ;
 
-                var assetObject = {id: -1, name: "ASSET", parentId: -999, children: []};
-                var liabilitiesObject = {id: -2, name: "LIABILITY", parentId: -999, children: []};
-                var equitiyObject = {id: -3, name: "EQUITY", parentId: -999, children: []};
-                var incomeObject = {id: -4, name: "INCOME", parentId: -999, children: []};
-                var expenseObject = {id: -5, name: "EXPENSE", parentId: -999, children: []};
-                var rootObject = {id: -999, name: "Accounting", children: []};
+                var assetObject = {id: -1, name: scope.ASSET, parentId: -999, children: []};
+                var liabilitiesObject = {id: -2, name: scope.LIABILITY, parentId: -999, children: []};
+                var equitiyObject = {id: -3, name: scope.EQUITY, parentId: -999, children: []};
+                var incomeObject = {id: -4, name: scope.INCOME, parentId: -999, children: []};
+                var expenseObject = {id: -5, name: scope.EXPENSE, parentId: -999, children: []};
+                var rootObject = {id: -999, name: scope.Accounting, children: []};
                 var rootArray = [rootObject, assetObject, liabilitiesObject, equitiyObject, incomeObject, expenseObject];
 
                 var idToNodeMap = {};
@@ -104,7 +109,7 @@
 
         }
     });
-    mifosX.ng.application.controller('AccCoaController', ['$scope','$rootScope', 'ResourceFactory', '$location', mifosX.controllers.AccCoaController]).run(function ($log) {
+    mifosX.ng.application.controller('AccCoaController', ['$scope','$rootScope', '$translate', 'ResourceFactory', '$location', mifosX.controllers.AccCoaController]).run(function ($log) {
         $log.info("AccCoaController initialized");
     });
 }(mifosX.controllers || {}));
diff --git a/app/views/accounting/accounting_coa.html b/app/views/accounting/accounting_coa.html
@@ -30,30 +30,30 @@ <h3 class="bolder col-md-12">{{'label.heading.chartofaccounts' | translate}}
             <tr class="pointer-main" ng-repeat="coadata in coadatas | orderBy:'type.value' | SearchFilter:filterText">
                 <td class="pointer" data-ng-click="routeTo(coadata.id)">{{coadata.name}}</td>
                 <td class="pointer" data-ng-click="routeTo(coadata.id)">{{coadata.glCode}}</td>
-                <td class="pointer" data-ng-click="routeTo(coadata.id)">{{coadata.type.value}}</td>
+                <td class="pointer" data-ng-click="routeTo(coadata.id)">{{coadata.type.value | translate}}</td>
                 <td class="pointer" data-ng-click="routeTo(coadata.id)">{{coadata.disabled}}</td>
                 <td class="pointer" data-ng-click="routeTo(coadata.id)">{{coadata.manualEntriesAllowed}}</td>
-                <td class="pointer" data-ng-click="routeTo(coadata.id)">{{coadata.usage.value}}</td>
+                <td class="pointer" data-ng-click="routeTo(coadata.id)">{{coadata.usage.value | translate}}</td>
             </tr>
             </tbody>
         </table>
     </div>
-    <div ng-show="isTreeView"  >
+    <div ng-show="isTreeView">
 		<div ng-show="$root.tempNodeID >= 0" class="col-md-6 divscrollable" >
 
 				<table class="table table-bordered table-striped">
 					<tr>
 						<td>{{ 'label.heading.glcode' | translate }}</td>
-						<td ng-repeat="coadata in coadatas" ng-show="coadata.id == $root.tempNodeID">{{coadata.glCode}}</td>
+						<td ng-repeat="coadata in coadatas" ng-show="coadata.id == $root.tempNodeID">{{coadata.glCode | translate}}</td>
 					</tr>
 	            <tr>
 	                <td>{{ 'label.heading.acctype' | translate }}</td>
-	                <td ng-repeat="coadata in coadatas" ng-show="coadata.id == $root.tempNodeID">{{coadata.type.value}}</td>
+	                <td ng-repeat="coadata in coadatas" ng-show="coadata.id == $root.tempNodeID">{{coadata.type.value | translate}}</td>
 	            </tr>
 
 	            <tr>
 	                <td>{{ 'label.heading.accountusage' | translate }}</td>
-	                <td ng-repeat="coadata in coadatas" ng-show="coadata.id == $root.tempNodeID">{{coadata.usage.value}}</td>
+	                <td ng-repeat="coadata in coadatas" ng-show="coadata.id == $root.tempNodeID">{{coadata.usage.value | translate}}</td>
 	            </tr>
 
 	            <tr>