diff --git a/app/global-translations/locale-es.json b/app/global-translations/locale-es.json index 866c2161..cdf9d99d 100644 --- 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 index 4e288fd4..8363910d 100644 --- 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 index e63075e5..57cfe881 100644 --- a/app/views/accounting/accounting_coa.html +++ b/app/views/accounting/accounting_coa.html @@ -30,30 +30,30 @@ {{coadata.name}} {{coadata.glCode}} - {{coadata.type.value}} + {{coadata.type.value | translate}} {{coadata.disabled}} {{coadata.manualEntriesAllowed}} - {{coadata.usage.value}} + {{coadata.usage.value | translate}} -
+
- + - + - +
{{ 'label.heading.glcode' | translate }}{{coadata.glCode}}{{coadata.glCode | translate}}
{{ 'label.heading.acctype' | translate }}{{coadata.type.value}}{{coadata.type.value | translate}}
{{ 'label.heading.accountusage' | translate }}{{coadata.usage.value}}{{coadata.usage.value | translate}}