mirror of
https://github.com/openMF/community-app.git
synced 2026-02-06 13:51:55 +00:00
Adding UI for Financial Activities
This commit is contained in:
parent
05c465aee2
commit
75400252ea
@ -693,6 +693,17 @@
|
||||
"label.heading.debitaccount":"Debit Account",
|
||||
"label.heading.creditaccount":"Credit Account",
|
||||
"label.heading.createclosure":"Create Closure",
|
||||
"label.heading.financialactivity.accountmappings":"Accounts Linked to Financial Activities",
|
||||
"label.listof.financialactivity.accountmappings":"List of Financial Activity and GL Account Mappings",
|
||||
"label.heading.financial.account.type":"Financial Account Type",
|
||||
"label.heading.financial.account.name":"Account Name",
|
||||
"label.heading.transferredfrom": "Transferred From",
|
||||
"label.heading.createdby":"Created By",
|
||||
"label.heading.entryid":"Entry ID",
|
||||
"label.heading.add.financial.activity.mapping":"Add Financial Activity Mapping",
|
||||
"label.heading.financialactivity":"Financial Activity",
|
||||
"label.heading.viewfinancialmapping":"View Financial Activity Mapping",
|
||||
"label.heading.edit.financial.activity.mapping":"Edit Financial Activity Mapping",
|
||||
|
||||
"#Menu Links": "..",
|
||||
"label.menu.filterbyoffice": "Filter by office",
|
||||
@ -713,10 +724,11 @@
|
||||
"label.anchor.viewclosure": "View Closure",
|
||||
"label.anchor.viewtransaction": "View Transaction",
|
||||
"label.anchor.viewaccounttransferdetails": "View Account Transfer Details",
|
||||
"label.heading.transferredfrom": "Transferred From",
|
||||
"label.heading.createdby":"Created By",
|
||||
"label.heading.entryid":"Entry ID",
|
||||
"label.anchor.accounttransfers":"Account Transfers",
|
||||
"label.anchor.financialactivity.accountmappings":"Financial Activity Mappings",
|
||||
"label.anchor.addfinancialmapping":"Add Financial Activity Mapping",
|
||||
"label.anchor.viewfinancialmapping":"View Financial Activity Mapping",
|
||||
"label.anchor.editfinancialmapping":"Edit Financial Activity Mapping",
|
||||
|
||||
"#Inputs": "..",
|
||||
"label.input.accountingrulename": "Accounting rule name",
|
||||
@ -760,6 +772,7 @@
|
||||
"label.button.createclosure": "Create Closure",
|
||||
"label.button.reverse": "Reverse",
|
||||
"label.button.redirecttonewtrx":"Redirect to New Transaction",
|
||||
"label.button.define.new.financial.mapping":"Define New Mapping",
|
||||
|
||||
"#Misc Labels": "..",
|
||||
"label.thesearepredefinedpostings": "These are predefined postings",
|
||||
@ -780,6 +793,7 @@
|
||||
"label.norepaymentsanddisbursalareavailable":"No repayments and disbursal are available for selected Group and meeting date",
|
||||
"label.transactionisreversedonce":"This transaction was reversed",
|
||||
"label.transactionreverse":"Transaction reversed successfully. A new journal entry has been created to reverse this transaction",
|
||||
"assetTransfer":"Assest Transfer",
|
||||
|
||||
"#Enumeration & Error Messages": "..",
|
||||
"accountType.loan": "Loan Account",
|
||||
@ -845,6 +859,7 @@
|
||||
"validation.msg.GLJournalEntry.debits[5].amount.cannot.be.blank": "Amount for the sixth debit cannot be blank",
|
||||
"error.msg.glclosure.invalid.accounting.closed": "Accounting Closure for this branch has already been defined for a later date `{{params[0].value}}`.",
|
||||
"error.msg.glclosure.invalid.delete": "An accounting closure for this branch exists at a later date `{{params[0].value}}`, please delete the same first.",
|
||||
"error.msg.financialActivityAccount.exists.for.office":"Financial activity account already defined",
|
||||
|
||||
"#tool tip for accounting":"..",
|
||||
"label.tooltip.click.plus.button.to.add.credit.entry":"Click on + button to add credit entry",
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
(function (module) {
|
||||
mifosX.controllers = _.extend(module, {
|
||||
AccCreateOfficeGLAccountController: function (scope, resourceFactory, location) {
|
||||
scope.liabilityOptions = [];
|
||||
scope.officeOptions = [];
|
||||
|
||||
resourceFactory.officeToGLAccountMappingTemplateResource.get(function (data) {
|
||||
scope.liabilityOptions = data.accountingMappingOptions.liabilityAccountOptions || [];
|
||||
|
||||
});
|
||||
|
||||
|
||||
scope.submit = function () {
|
||||
resourceFactory.officeToGLAccountMappingResource.create(this.formData, function (data) {
|
||||
location.path('/viewofficeglmapping/' + data.resourceId);
|
||||
});
|
||||
};
|
||||
}
|
||||
});
|
||||
mifosX.ng.application.controller('AccCreateOfficeGLAccountController', ['$scope', 'ResourceFactory', '$location', mifosX.controllers.AccCreateOfficeGLAccountController]).run(function ($log) {
|
||||
$log.info("AccCreateOfficeGLAccountController initialized");
|
||||
});
|
||||
}(mifosX.controllers || {}));
|
||||
@ -1,24 +0,0 @@
|
||||
(function (module) {
|
||||
mifosX.controllers = _.extend(module, {
|
||||
AccEditOfficeGLAccountController: function (scope, resourceFactory, location,routeParams) {
|
||||
scope.liabilityOptions = [];
|
||||
scope.officeOptions = [];
|
||||
scope.formData = {};
|
||||
resourceFactory.officeToGLAccountMappingResource.withTemplate({mappingId: routeParams.mappingId},function (data) {
|
||||
scope.mapping = data;
|
||||
scope.liabilityOptions = data.accountingMappingOptions.liabilityAccountOptions || [];
|
||||
scope.formData.liabilityTransferInSuspenseAccountId = data.glAccountData.id;
|
||||
});
|
||||
|
||||
|
||||
scope.submit = function () {
|
||||
resourceFactory.officeToGLAccountMappingResource.update({mappingId: routeParams.mappingId},this.formData, function (data) {
|
||||
location.path('/viewofficeglmapping/' + data.resourceId);
|
||||
});
|
||||
};
|
||||
}
|
||||
});
|
||||
mifosX.ng.application.controller('AccEditOfficeGLAccountController', ['$scope', 'ResourceFactory', '$location','$routeParams', mifosX.controllers.AccEditOfficeGLAccountController]).run(function ($log) {
|
||||
$log.info("AccEditOfficeGLAccountController initialized");
|
||||
});
|
||||
}(mifosX.controllers || {}));
|
||||
@ -0,0 +1,32 @@
|
||||
(function (module) {
|
||||
mifosX.controllers = _.extend(module, {
|
||||
AddFinancialMappingController: function (scope, resourceFactory, location) {
|
||||
scope.formData = {};
|
||||
|
||||
resourceFactory.officeToGLAccountMappingResource.get({mappingId:'template'}, function (data) {
|
||||
scope.formData.financialActivityId = 100;
|
||||
scope.glAccountOptions = data.glAccountOptions;
|
||||
scope.financialActivityOptions = data.financialActivityOptions;
|
||||
scope.accountOptions = scope.glAccountOptions.assetAccountOptions;
|
||||
});
|
||||
|
||||
scope.updateActivityOptions = function(activityId){
|
||||
if(activityId === 100){
|
||||
scope.accountOptions = scope.glAccountOptions.assetAccountOptions;
|
||||
}else if(activityId === 200){
|
||||
scope.accountOptions = scope.glAccountOptions.liabilityAccountOptions;
|
||||
}
|
||||
};
|
||||
|
||||
scope.submit = function () {
|
||||
resourceFactory.officeToGLAccountMappingResource.create(this.formData, function (data) {
|
||||
location.path('/viewfinancialactivitymapping/' + data.resourceId);
|
||||
});
|
||||
};
|
||||
|
||||
}
|
||||
});
|
||||
mifosX.ng.application.controller('AddFinancialMappingController', ['$scope', 'ResourceFactory', '$location', mifosX.controllers.AddFinancialMappingController]).run(function ($log) {
|
||||
$log.info("AddFinancialMappingController initialized");
|
||||
});
|
||||
}(mifosX.controllers || {}));
|
||||
@ -0,0 +1,33 @@
|
||||
(function (module) {
|
||||
mifosX.controllers = _.extend(module, {
|
||||
EditFinancialActivityMappingController: function (scope, resourceFactory, location,routeParams) {
|
||||
scope.formData = {};
|
||||
scope.accountOptions = [];
|
||||
resourceFactory.officeToGLAccountMappingResource.withTemplate({mappingId: routeParams.mappingId},function (data) {
|
||||
scope.mapping = data;
|
||||
scope.glAccountOptions = data.glAccountOptions;
|
||||
scope.formData.financialActivityId = data.financialActivityData.id;
|
||||
scope.formData.glAccountId = data.glAccountData.id;
|
||||
scope.financialActivityOptions = data.financialActivityOptions;
|
||||
scope.updateActivityOptions(scope.formData.financialActivityId);
|
||||
});
|
||||
|
||||
scope.updateActivityOptions = function(activityId){
|
||||
if(activityId === 100){
|
||||
scope.accountOptions = scope.glAccountOptions.assetAccountOptions;
|
||||
}else if(activityId === 200){
|
||||
scope.accountOptions = scope.glAccountOptions.liabilityAccountOptions;
|
||||
}
|
||||
};
|
||||
|
||||
scope.submit = function () {
|
||||
resourceFactory.officeToGLAccountMappingResource.update({mappingId: routeParams.mappingId},this.formData, function (data) {
|
||||
location.path('/viewfinancialactivitymapping/' + data.resourceId);
|
||||
});
|
||||
};
|
||||
}
|
||||
});
|
||||
mifosX.ng.application.controller('EditFinancialActivityMappingController', ['$scope', 'ResourceFactory', '$location','$routeParams', mifosX.controllers.EditFinancialActivityMappingController]).run(function ($log) {
|
||||
$log.info("EditFinancialActivityMappingController initialized");
|
||||
});
|
||||
}(mifosX.controllers || {}));
|
||||
@ -0,0 +1,17 @@
|
||||
(function (module) {
|
||||
mifosX.controllers = _.extend(module, {
|
||||
FinancialActivityMappingsController: function (scope, resourceFactory, location) {
|
||||
|
||||
resourceFactory.officeToGLAccountMappingResource.getAll(function (data) {
|
||||
scope.mappings = data;
|
||||
});
|
||||
|
||||
scope.routeTo = function (resourceId){
|
||||
location.path('/viewfinancialactivitymapping/' + resourceId);
|
||||
};
|
||||
}
|
||||
});
|
||||
mifosX.ng.application.controller('FinancialActivityMappingsController', ['$scope', 'ResourceFactory', '$location', mifosX.controllers.FinancialActivityMappingsController]).run(function ($log) {
|
||||
$log.info("FinancialActivityMappingsController initialized");
|
||||
});
|
||||
}(mifosX.controllers || {}));
|
||||
@ -1,13 +1,10 @@
|
||||
(function (module) {
|
||||
mifosX.controllers = _.extend(module, {
|
||||
AccViewOfficeGLAccountController: function (scope, resourceFactory, routeParams, location, $modal) {
|
||||
scope.liabilityOptions = [];
|
||||
scope.formData = {};
|
||||
ViewFinancialActivityController: function (scope, resourceFactory, routeParams, location, $modal) {
|
||||
resourceFactory.officeToGLAccountMappingResource.get({mappingId: routeParams.mappingId},function (data) {
|
||||
scope.mapping = data;
|
||||
});
|
||||
|
||||
|
||||
scope.deletemapping = function () {
|
||||
$modal.open({
|
||||
templateUrl: 'deletemapping.html',
|
||||
@ -18,7 +15,7 @@
|
||||
$scope.delete = function () {
|
||||
resourceFactory.officeToGLAccountMappingResource.delete({mappingId: routeParams.mappingId}, {}, function (data) {
|
||||
$modalInstance.close('delete');
|
||||
location.path('/listofficeglmapping');
|
||||
location.path('/financialactivityaccountmappings');
|
||||
});
|
||||
};
|
||||
$scope.cancel = function () {
|
||||
@ -27,7 +24,7 @@
|
||||
};
|
||||
}
|
||||
});
|
||||
mifosX.ng.application.controller('AccViewOfficeGLAccountController', ['$scope', 'ResourceFactory', '$routeParams', '$location', '$modal', mifosX.controllers.AccViewOfficeGLAccountController]).run(function ($log) {
|
||||
$log.info("AccViewOfficeGLAccountController initialized");
|
||||
mifosX.ng.application.controller('ViewFinancialActivityController', ['$scope', 'ResourceFactory', '$routeParams', '$location', '$modal', mifosX.controllers.ViewFinancialActivityController]).run(function ($log) {
|
||||
$log.info("ViewFinancialActivityController initialized");
|
||||
});
|
||||
}(mifosX.controllers || {}));
|
||||
@ -103,6 +103,10 @@ define(['Q', 'underscore', 'mifosX'], function (Q) {
|
||||
'accounting/AccCreateRuleController',
|
||||
'accounting/AccEditRuleController',
|
||||
'accounting/ViewAccRuleController',
|
||||
'accounting/FinancialActivityMappingsController',
|
||||
'accounting/AddFinancialMappingController',
|
||||
'accounting/ViewFinancialActivityController',
|
||||
'accounting/EditFinancialActivityMappingController',
|
||||
'system/CodeController',
|
||||
'system/EditCodeController',
|
||||
'system/ViewCodeController',
|
||||
@ -197,10 +201,7 @@ define(['Q', 'underscore', 'mifosX'], function (Q) {
|
||||
'main/ProfileController',
|
||||
'main/ViewMakerCheckerTaskController',
|
||||
'main/AdHocQuerySearchController',
|
||||
'accounting/AccOGMController',
|
||||
'accounting/AccCreateOfficeGLAccountController',
|
||||
'accounting/AccEditOfficeGLAccountController',
|
||||
'accounting/AccViewOfficeGLAccountController'
|
||||
'accounting/AccOGMController'
|
||||
],
|
||||
filters: [
|
||||
'StatusLookup',
|
||||
|
||||
@ -613,17 +613,17 @@
|
||||
.when('/advsearch', {
|
||||
templateUrl: 'views/search/advsearch.html'
|
||||
})
|
||||
.when('/createofficeglmapping', {
|
||||
templateUrl: 'views/accounting/createofficeglaccount.html'
|
||||
.when('/editfinancialactivitymapping/:mappingId', {
|
||||
templateUrl: 'views/accounting/edit_financial_activity_mapping.html'
|
||||
})
|
||||
.when('/editofficeglmapping/:mappingId', {
|
||||
templateUrl: 'views/accounting/editofficeglaccount.html'
|
||||
.when('/viewfinancialactivitymapping/:mappingId', {
|
||||
templateUrl: 'views/accounting/view_financial_activity.html'
|
||||
})
|
||||
.when('/viewofficeglmapping/:mappingId', {
|
||||
templateUrl: 'views/accounting/viewofficeglaccount.html'
|
||||
.when('/financialactivityaccountmappings', {
|
||||
templateUrl: 'views/accounting/financial_accounting_mapping.html'
|
||||
})
|
||||
.when('/listofficeglmapping', {
|
||||
templateUrl: 'views/accounting/accounting_office_mapping.html'
|
||||
.when('/addfinancialmapping', {
|
||||
templateUrl: 'views/accounting/add_financial_accounting_mapping.html'
|
||||
});
|
||||
$locationProvider.html5Mode(false);
|
||||
};
|
||||
|
||||
@ -366,6 +366,7 @@
|
||||
}),
|
||||
officeToGLAccountMappingResource: defineResource(apiVer + "/financialactivityaccounts/:mappingId", {mappingId: '@mappingId'}, {
|
||||
get: {method: 'GET', params: {mappingId: '@mappingId'}},
|
||||
getAll: {method: 'GET', params: {}, isArray: true},
|
||||
withTemplate: {method: 'GET', params: {mappingId: '@mappingId', template: 'true'}},
|
||||
search: {method: 'GET', params: {}},
|
||||
create: {method: 'POST', params: {}},
|
||||
|
||||
@ -20,11 +20,11 @@
|
||||
|
||||
<p class="list-group-item-text">{{ 'label.advancesearchoptionforjournalentries' | translate}}</p>
|
||||
</a>
|
||||
<a class="list-group-item" href="#/listofficeglmapping" has-permission='READ_OFFICEGLACCOUNT'>
|
||||
<a class="list-group-item" href="#/financialactivityaccountmappings" has-permission='READ_FINANCIALACTIVITYACCOUNT'>
|
||||
<h4 class="list-group-item-heading"><i class="icon-map icon-large"></i> {{
|
||||
'label.heading.officeglaccounts' | translate}}</h4>
|
||||
'label.heading.financialactivity.accountmappings' | translate}}</h4>
|
||||
|
||||
<p class="list-group-item-text">{{ 'label.listofofficeglaccounts' | translate}}</p>
|
||||
<p class="list-group-item-text">{{ 'label.listof.financialactivity.accountmappings' | translate}}</p>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
<div ng-controller="AccViewOfficeGLAccountController">
|
||||
<div class="paddedbottom10">
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
|
||||
<li><a href="#/listofficeglmapping">{{'label.anchor.officeglaccount' | translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.viewofficeglaccount' | translate}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<legend>{{ 'label.heading.viewofficeglaccount' | translate }}</legend>
|
||||
<div>
|
||||
<div class="pull-right">
|
||||
<div class="btn-group">
|
||||
<a href="#/editofficeglmapping/{{mapping.id}}" class="btn btn-primary" has-permission='UPDATE_OFFICEGLACCOUNT'><i
|
||||
class="icon-edit icon-white"></i>{{'label.button.edit' | translate}}</a>
|
||||
<a class="btn btn-danger" ng-click="deletemapping()" has-permission='DELETE_OFFICEGLACCOUNT'><i
|
||||
class="icon-trash icon-white"></i>{{'label.button.delete' | translate}}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/ng-template" id="deletemapping.html">
|
||||
<div class="modal-header silver">
|
||||
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
|
||||
</div>
|
||||
<div class="modal-body ">
|
||||
<api-validate></api-validate>
|
||||
<br>
|
||||
<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 paddedleft">
|
||||
<h3>{{rule.name}}</h3>
|
||||
<table class="table table-bordered">
|
||||
<tr>
|
||||
<th class="table-bold-acc">Financial Activity</th>
|
||||
<td><span class="padded-td">Liability Transfer</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="table-bold-acc">{{ 'label.heading.trasnferaccpuntsuspence' | translate }}</th>
|
||||
<td><span class="padded-td">{{mapping.glAccountData.name}}</span></td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
<hr/>
|
||||
</div>
|
||||
</div>
|
||||
48
app/views/accounting/add_financial_accounting_mapping.html
Normal file
48
app/views/accounting/add_financial_accounting_mapping.html
Normal file
@ -0,0 +1,48 @@
|
||||
<div class="col-md-12">
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
|
||||
<li><a href="#/financialactivityaccountmappings">{{'label.anchor.financialactivity.accountmappings' |
|
||||
translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.addfinancialmapping' | translate}}</li>
|
||||
</ul>
|
||||
<form name="createfinancialmappingform" novalidate="" class="form-horizontal well"
|
||||
ng-controller="AddFinancialMappingController"
|
||||
rc-submit="submit()">
|
||||
<api-validate></api-validate>
|
||||
<fieldset>
|
||||
<legend>{{'label.heading.add.financial.activity.mapping' | translate}}</legend>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{'label.input.accounttype' | translate}}<span
|
||||
class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<select id="financialActivityId" ng-model="formData.financialActivityId" class="form-control"
|
||||
ng-options="activityOption.id as activityOption.mappedGLAccountType for activityOption in financialActivityOptions"
|
||||
value="{{activityOption.id}}"
|
||||
ng-change="updateActivityOptions(formData.financialActivityId)">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{'label.input.account' | translate}}<span
|
||||
class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<select chosen="accountOptions" id="glAccountId" ng-model="formData.glAccountId"
|
||||
class="form-control"
|
||||
ng-options="account.id as (account.name +'('+ account.glCode +')') for account in accountOptions"
|
||||
value="{{account.id}}">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-offset-2">
|
||||
<a id="cancel" href="#/financialactivityaccountmappings" class="btn btn-default">{{'label.button.cancel'
|
||||
| translate}}</a>
|
||||
<button id="save" type="submit" class="btn btn-primary" has-permission='CREATE_FINANCIALACTIVITYACCOUNT'>
|
||||
{{'label.button.save' | translate}}
|
||||
</button>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
@ -1,29 +0,0 @@
|
||||
<div>
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
|
||||
<li><a href="#/listofficeglmapping">{{'label.anchor.officeglaccount' | translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.createofficeglaccount' | translate}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<form name="createofficeglform" novalidate="" class="form-horizontal well" ng-controller="AccCreateOfficeGLAccountController"
|
||||
ng-submit="submit()">
|
||||
<api-validate></api-validate>
|
||||
<legend>{{ 'label.heading.createofficeglaccount' | translate }}</legend>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.trasnferaccpuntsuspence' | translate }}<span class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<select id="liabilityTransferInSuspenseAccountId" ng-model="formData.liabilityTransferInSuspenseAccountId" class="form-control"
|
||||
ng-options="liabilityTransfer.id as liabilityTransfer.name for liabilityTransfer in liabilityOptions" value="{{liabilityTransfer.id}}"
|
||||
required="required">
|
||||
<option class="displaynone" value="">{{'label.selectone' | translate}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-offset-3">
|
||||
<a id="cancel" href="#/listofficeglmapping" class="btn btn-default">{{ 'label.button.cancel' | translate }}</a>
|
||||
<button id="save" type="submit" class="btn btn-primary" has-permission='CREATE_OFFICEGLACCOUNT'>{{ 'label.button.save' | translate }}</button>
|
||||
</div>
|
||||
</form>
|
||||
46
app/views/accounting/edit_financial_activity_mapping.html
Normal file
46
app/views/accounting/edit_financial_activity_mapping.html
Normal file
@ -0,0 +1,46 @@
|
||||
<div ng-controller="EditFinancialActivityMappingController">
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
|
||||
<li><a href="#/financialactivityaccountmappings">{{'label.anchor.financialactivity.accountmappings' | translate}}</a></li>
|
||||
<li><a href="#/viewfinancialactivitymapping/{{mapping.id}}">{{'label.anchor.viewfinancialmapping' | translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.editfinancialmapping' | translate}}</li>
|
||||
</ul>
|
||||
<form name="editfinancialmappingform" novalidate="" class="form-horizontal well" rc-submit="submit()">
|
||||
<api-validate></api-validate>
|
||||
<fieldset>
|
||||
<legend>{{'label.heading.edit.financial.activity.mapping' | translate}}</legend>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{'label.input.accounttype' | translate}}<span
|
||||
class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<select id="financialActivityId" ng-model="formData.financialActivityId" class="form-control"
|
||||
ng-options="activityOption.id as activityOption.mappedGLAccountType for activityOption in financialActivityOptions"
|
||||
value="{{activityOption.id}}"
|
||||
ng-change="updateActivityOptions(formData.financialActivityId)">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{'label.input.account' | translate}}<span
|
||||
class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<select chosen="accountOptions" id="glAccountId" ng-model="formData.glAccountId"
|
||||
class="form-control"
|
||||
ng-options="account.id as (account.name +'('+ account.glCode +')') for account in accountOptions"
|
||||
value="{{account.id}}">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-offset-2">
|
||||
<a id="cancel" href="#/viewfinancialactivitymapping/{{mapping.id}}" class="btn btn-default">{{'label.button.cancel'
|
||||
| translate}}</a>
|
||||
<button id="save" type="submit" class="btn btn-primary" has-permission='UPDATE_FINANCIALACTIVITYACCOUNT'>
|
||||
{{'label.button.save' | translate}}
|
||||
</button>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
@ -1,30 +0,0 @@
|
||||
<div>
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
|
||||
<li><a href="#/listofficeglmapping">{{'label.anchor.officeglaccount' | translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.editofficeglaccount' | translate}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<form name="createofficeglform" novalidate="" class="form-horizontal well" ng-controller="AccEditOfficeGLAccountController"
|
||||
ng-submit="submit()">
|
||||
<api-validate></api-validate>
|
||||
<legend>{{ 'label.heading.editofficeglaccount' | translate }}</legend>
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.trasnferaccpuntsuspence' | translate }}<span class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<select id="liabilityTransferInSuspenseAccountId" ng-model="formData.liabilityTransferInSuspenseAccountId" class="form-control"
|
||||
ng-options="liabilityTransfer.id as liabilityTransfer.name for liabilityTransfer in liabilityOptions" value="{{liabilityTransfer.id}}"
|
||||
required="required">
|
||||
<option class="displaynone" value="">{{'label.selectone' | translate}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-offset-3">
|
||||
<a id="cancel" href="#/viewofficeglmapping/{{mapping.id}}" class="btn btn-default">{{ 'label.button.cancel' | translate }}</a>
|
||||
<button id="save" type="submit" class="btn btn-primary" has-permission='UPDATE_OFFICEGLACCOUNT'>{{ 'label.button.save' | translate }}</button>
|
||||
</div>
|
||||
</form>
|
||||
26
app/views/accounting/financial_accounting_mapping.html
Normal file
26
app/views/accounting/financial_accounting_mapping.html
Normal file
@ -0,0 +1,26 @@
|
||||
<div ng-controller="FinancialActivityMappingsController">
|
||||
<div class="paddedbottom10">
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.financialactivity.accountmappings' | translate}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<a href="#/addfinancialmapping" class="btn btn-primary" has-permission='CREATE_FINANCIALACTIVITYACCOUNT'>
|
||||
<i class="icon-plus icon-white"></i>{{'label.button.define.new.financial.mapping' | translate}}</a>
|
||||
</div>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.financial.account.type' | translate}}</th>
|
||||
<th>{{'label.heading.financial.account.name' | translate}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr class="pointer-main" ng-repeat="mapping in mappings">
|
||||
<td class="pointer" data-ng-click="routeTo(mapping.id)">{{mapping.financialActivityData.mappedGLAccountType}}</td>
|
||||
<td class="pointer" data-ng-click="routeTo(mapping.id)">{{mapping.glAccountData.name}}({{mapping.glAccountData.glCode}})</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
43
app/views/accounting/view_financial_activity.html
Normal file
43
app/views/accounting/view_financial_activity.html
Normal file
@ -0,0 +1,43 @@
|
||||
<div ng-controller="ViewFinancialActivityController">
|
||||
<div class="paddedbottom10">
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
|
||||
<li><a href="#/financialactivityaccountmappings">{{'label.anchor.financialactivity.accountmappings' | translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.viewfinancialmapping' | translate}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<legend>{{ 'label.heading.viewfinancialmapping' | translate }}</legend>
|
||||
<div>
|
||||
<div class="pull-right">
|
||||
<div class="btn-group">
|
||||
<a href="#/editfinancialactivitymapping/{{mapping.id}}" class="btn btn-primary"
|
||||
has-permission='UPDATE_FINANCIALACTIVITYACCOUNT'><i
|
||||
class="icon-edit icon-white"></i>{{'label.button.edit' | translate}}</a>
|
||||
<a class="btn btn-danger" ng-click="deletemapping()" has-permission='DELETE_FINANCIALACTIVITYACCOUNT'><i
|
||||
class="icon-trash icon-white"></i>{{'label.button.delete' | translate}}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/ng-template" id="deletemapping.html">
|
||||
<div class="modal-header silver">
|
||||
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
|
||||
</div>
|
||||
<div class="modal-body ">
|
||||
<api-validate></api-validate>
|
||||
<br>
|
||||
<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>
|
||||
<table class="table table-bordered">
|
||||
<tr>
|
||||
<th class="table-bold-acc">{{'label.heading.financialactivity' | translate}}</th>
|
||||
<td><span class="padded-td">{{mapping.financialActivityData.name | translate }}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="table-bold-acc">{{ 'label.heading.financial.account.name' | translate }}</th>
|
||||
<td><span class="padded-td">{{mapping.glAccountData.name}}({{mapping.glAccountData.glCode}})</span></td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
</div>
|
||||
@ -1,46 +0,0 @@
|
||||
<div ng-controller="AccViewOfficeGLAccountController">
|
||||
<div class="paddedbottom10">
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
|
||||
<li><a href="#/listofficeglmapping">{{'label.anchor.officeglaccount' | translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.viewofficeglaccount' | translate}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<legend>{{ 'label.heading.viewofficeglaccount' | translate }}</legend>
|
||||
<div>
|
||||
<div class="pull-right">
|
||||
<div class="btn-group">
|
||||
<a href="#/editofficeglmapping/{{mapping.id}}" class="btn btn-primary" has-permission='UPDATE_OFFICEGLACCOUNT'><i
|
||||
class="icon-edit icon-white"></i>{{'label.button.edit' | translate}}</a>
|
||||
<a class="btn btn-danger" ng-click="deletemapping()" has-permission='DELETE_OFFICEGLACCOUNT'><i
|
||||
class="icon-trash icon-white"></i>{{'label.button.delete' | translate}}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/ng-template" id="deletemapping.html">
|
||||
<div class="modal-header silver">
|
||||
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
|
||||
</div>
|
||||
<div class="modal-body ">
|
||||
<api-validate></api-validate>
|
||||
<br>
|
||||
<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 paddedleft">
|
||||
<h3>{{rule.name}}</h3>
|
||||
<table class="table table-bordered">
|
||||
<tr>
|
||||
<th class="table-bold-acc">Financial Activity</th>
|
||||
<td><span class="padded-td">Liability Transfer</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="table-bold-acc">{{ 'label.heading.trasnferaccpuntsuspence' | translate }}</th>
|
||||
<td><span class="padded-td">{{mapping.glAccountData.name}}</span></td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
<hr/>
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Reference in New Issue
Block a user