artin/community-app
1
0
Fork 0
mirror of https://github.com/openMF/community-app.git synced 2026-02-06 13:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

#MIFOSX-1005 Improvements around accounting screens

Browse Source
This commit is contained in:
Madhukar 2014-03-20 17:30:40 +05:30
parent 65473f7f85
commit fb0170faa9
11 changed files with 86 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/global-translations/locale-en.json
View File

@ -729,6 +729,8 @@
"label.input.additionalfilter": "Additional filter",
"label.input.transactionid": "Transaction ID",
"label.input.entryid":"Entry ID",
"label.input.filterbyAccountGlcodeAccounttype":"Filter by Account/GL code/Accounttype",
"#journalEntryType code ": ".............",
"journalEntryType.credit": "Credit",
"journalEntrytType.debit": "Debit",
@ -826,6 +828,10 @@
"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.",
"#tool tip for accounting":"..",
"label.tooltip.click.plus.button.to.add.credit.entry":"Click on + button to add credit entry",
"label.tooltip.click.plus.button.to.add.debit.entry":"Click on + button to add debit entry",
"-------------": "------------",
"#Reporting": "....",

4
app/scripts/controllers/accounting/AccountingClosureController.js
View File

@ -19,6 +19,10 @@
scope.accountClosures = data;
});
scope.routeTo = function (id) {
location.path('/view_close_accounting/' + id);
};
scope.submit = function () {
var reqDate = dateFilter(scope.first.date, scope.df);
this.formData.locale = scope.optlang.code;

8
app/scripts/controllers/accounting/SearchTransactionController.js
View File

@ -37,32 +37,26 @@
if (scope.formData.transactionId) {
params.transactionId = scope.formData.transactionId;
}
;
if (scope.formData.glAccount) {
params.glAccountId = scope.formData.glAccount.id;
}
;
if (scope.formData.officeId) {
params.officeId = scope.formData.officeId;
}
;
if (scope.formData.manualEntriesOnly) {
if (scope.formData.manualEntriesOnly == true || scope.formData.manualEntriesOnly == false) {
params.manualEntriesOnly = scope.formData.manualEntriesOnly;
}
;
if (scope.date.first) {
params.fromDate = reqFirstDate;
}
;
if (scope.date.second) {
params.toDate = reqSecondDate;
}
;
resourceFactory.journalEntriesResource.search(params, callback);
};

2
app/scripts/controllers/accounting/ViewTransactionController.js
View File

@ -3,10 +3,12 @@
ViewTransactionController: function (scope, routeParams, resourceFactory, location, route, $modal) {
scope.flag = false;
scope.manualEntry = false;
resourceFactory.journalEntriesResource.get({transactionId: routeParams.transactionId}, function (data) {
scope.transactionNumber = routeParams.transactionId;
scope.transactions = data.pageItems;
for (var i in data.pageItems) {
scope.manualEntry = data.pageItems[i].manualEntry;
if (data.pageItems[i].reversed == false) {
scope.flag = true;
}

2
app/views/accounting/accounting_coa.html
View File

@ -19,7 +19,7 @@
<div ng-hide="isTreeView">
<input ng-model="filterText" type="text" class="span marginbottom0px"
placeholder="{{'label.input.filterbyname' | translate}}">
placeholder="{{'label.input.filterbyAccountGlcodeAccounttype' | translate}}">
<table class="table">
<thead>
<tr class="graybg">

10
app/views/accounting/accounts_closure.html
View File

@ -28,11 +28,11 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="accountClosure in accountClosures">
<td><a href="#/view_close_accounting/{{accountClosure.id}}">{{accountClosure.officeName}}</a></td>
<td>{{accountClosure.closingDate | DateFormat}}</td>
<td>{{accountClosure.comments}}</td>
<td>{{accountClosure.createdByUsername}}</td>
<tr class="pointer-main" ng-repeat="accountClosure in accountClosures">
<td class="pointer" data-ng-click="routeTo(accountClosure.id)">{{accountClosure.officeName}}</td>
<td class="pointer" data-ng-click="routeTo(accountClosure.id)">{{accountClosure.closingDate | DateFormat}}</td>
<td class="pointer" data-ng-click="routeTo(accountClosure.id)">{{accountClosure.comments}}</td>
<td class="pointer" data-ng-click="routeTo(accountClosure.id)">{{accountClosure.createdByUsername}}</td>
</tr>
</tbody>
</table>

10
app/views/accounting/freqposting.html
View File

@ -51,10 +51,12 @@
<table width="100%">
<tr>
<td width="50%">
<strong>{{ 'label.input.credit' | translate }}</strong>
<strong>{{ 'label.input.credit' | translate }}</strong>&nbsp;
<a tooltip="{{'label.tooltip.click.plus.button.to.add.credit.entry' | translate}}"><i class="icon-question-sign icon-white"></i></a>
</td>
<td width="50%">
<strong>{{ 'label.input.debit' | translate }}</strong>
<strong>{{ 'label.input.debit' | translate }}</strong>&nbsp;
<a tooltip="{{'label.tooltip.click.plus.button.to.add.debit.entry' | translate}}"><i class="icon-question-sign icon-white"></i></a>
</td>
</tr>
<tr>
@ -77,7 +79,7 @@
<div ng-repeat="crAccount in formData.crAccounts">
<input type="text" class="input-small" ng-model="crAccount.crGlName" readonly>
<input id="credits[{{$index}}]" type="text" class="input-small"
ng-model="crAccount.crAmount">{{allowDebitEntries}}
ng-model="crAccount.crAmount">
<a ng-click="removeCrAccount($index)">&nbsp;<i class="icon-remove icon-white"></i></a>
</div>
</td>
@ -128,7 +130,7 @@
<label class="control-label">{{ 'label.input.comments' | translate }}</label>
<div class="controls">
<input type="text" ng-model="formData.comments">
<textarea type="text" rows="2" name="comments" ng-model="formData.comments"></textarea>
</div>
</div>
<div class="offset3">

8
app/views/accounting/journalentry_posting.html
View File

@ -37,12 +37,12 @@
<div class="controls">
<table width="100%">
<h4><strong>{{ 'label.input.credit' | translate }}</strong></h4>
<h4><strong>{{ 'label.input.credit' | translate }}</strong>&nbsp;<a tooltip="{{'label.tooltip.click.plus.button.to.add.credit.entry' | translate}}"><i class="icon-question-sign icon-white"></i></a></h4>
<tr>
<td>
<div>
<select chosen="glAccounts" ng-model="formData.creditAccountTemplate"
ng-options="creditAccount.name for creditAccount in glAccounts">
ng-options="(creditAccount.name + '('+ creditAccount.glCode + ')') for creditAccount in glAccounts">
<option style="display:none" value="">{{'label.selectcredit' | translate}}</option>
</select>
&nbsp; <input type="text" class="input-small" name="creditamount"
@ -68,12 +68,12 @@
</tr>
</table>
<table width="100%">
<h4><strong>{{ 'label.input.debit' | translate }}</strong></h4>
<h4><strong>{{ 'label.input.debit' | translate }}</strong>&nbsp;<a tooltip="{{'label.tooltip.click.plus.button.to.add.debit.entry' | translate}}"><i class="icon-question-sign icon-white"></i></a></h4>
<tr>
<td>
<div>
<select chosen="glAccounts" ng-model="formData.debitAccountTemplate"
ng-options="debitAccount.name for debitAccount in glAccounts">
ng-options="(debitAccount.name +'('+ debitAccount.glCode +')') for debitAccount in glAccounts">
<option style="display:none" value="">{{'label.selectdebit' | translate}}</option>
</select>
&nbsp; <input type="text" class="input-small" name="debitamount"

59
app/views/accounting/search_transaction.html
View File

@ -7,7 +7,7 @@
</div>
<br>
<div class="row-fluid">
<div class="row-fluid" ng-show="isCollapsed" >
<span class="input-append grpinputicons">
<input ng-model="formData.transactionId" type="text"
placeholder="{{'label.input.searchbytransaction' | translate}}"/>
@ -16,46 +16,33 @@
class="icon-search icon-white"></i></a></span>
</span>
</div>
<div collapse="isCollapsed" class="blockoverlay" width="100%" style="overflow-y: scroll">
<br/><!-- The span is displaying the first line of the hiding div, making the first line of div as blank solved my problem -->
<div>
<label>{{'label.input.accountname' | translate}}</label>
<input ng-autofocus="true" ng-model="formData.glAccount" type="text" placeholder="Account Name"
autocomplete="off"
typeahead="glAccount as glAccount.name for glAccount in glAccounts | filter:$viewValue | limitTo:8"/>
<div class="control-group">
<label class="control-label">{{ 'label.input.office' | translate }}</label>
<div class="controls">
<select ng-model="formData.officeId" ng-options="office.id as office.name for office in offices"
value="{{office.id}}">
<div ng-hide="isCollapsed" width="100%">
<table>
<tr>
<td>
<input ng-autofocus="true" ng-model="formData.glAccount" type="text" placeholder="{{'label.input.accountname' | translate}}" autocomplete="off" typeahead="glAccount as (glAccount.name + '(' + glAccount.glCode + ')') for glAccount in glAccounts | filter:$viewValue | limitTo:8"/>
</td>
<td>
<select ng-model="formData.officeId" ng-options="office.id as office.name for office in offices" value="{{office.id}}">
<option style="display:none" value="">{{'label.selectoffice' | translate}}</option>
</select>
</div>
</div>
<div class="control-group">
<label class="control-label">{{ 'label.input.additionalfilter' | translate }}</label>
<div class="controls">
<select ng-model="formData.manualEntriesOnly"
ng-options="filter.value as filter.option for filter in filters" value="{{filter.value}}">
</td>
<td>
<select ng-model="formData.manualEntriesOnly" ng-options="filter.value as filter.option for filter in filters" value="{{filter.value}}">
<option style="display:none" value="">{{'label.selectfilter' | translate}}</option>
</select>
</div>
</div>
<label>{{ 'label.input.fromdate' | translate }}</label>
<input class="date-disable" type="text" datepicker-pop="dd MMMM yyyy" ng-model="date.first" is-open="opened"
min="minDate" max="'2020-06-22'" date-disabled="disabled(date, mode)" readonly/>
<label>{{ 'label.input.todate' | translate }}</label>
<input class="date-disable" type="text" datepicker-pop="dd MMMM yyyy" ng-model="date.second"
is-open="opened1" min="minDate" max="'2020-06-22'" date-disabled="disabled(date, mode)"
readonly/><br>
<span><a ng-click="searchTransaction()" class="btn btn-primary control" has-permission='READ_JOURNALENTRY'><i
class="icon-search icon-white"></i>{{'label.button.advancesearch' | translate}}</a></span>
</div>
</td>
<td>
<input class="input-small" type="text" datepicker-pop="dd MMMM yyyy" ng-model="date.first" is-open="opened" min="minDate" max="'2020-06-22'" placeholder="{{ 'label.input.fromdate' | translate }}" />
</td>
<td>
<input class="input-small" type="text" datepicker-pop="dd MMMM yyyy" ng-model="date.second" is-open="opened1" min="minDate" max="'2020-06-22'" placeholder="{{ 'label.input.todate' | translate }}" />
</td>
</tr>
</table>
<center><a ng-click="searchTransaction()" class="btn btn-primary control" has-permission='READ_JOURNALENTRY'><i class="icon-search icon-white"></i>{{'label.button.advancesearch' | translate}}</a></center>
</div>
<br>
<div ng-show="displayResults" class="row-fluid">
<table class="table">
<thead>

20
app/views/accounting/view_acc_rule.html
View File

@ -28,8 +28,24 @@
</script>
<div class="row paddedleft">
<h3>{{rule.name}}</h3>
<label>{{ 'label.heading.office' | translate }}&nbsp;{{rule.officeName}}</label>
<label>{{ 'label.heading.description' | translate }}&nbsp;{{rule.description}}</label>
<table class="table table-bordered">
<tr>
<th class="table-bold-acc">{{ 'label.heading.office' | translate }}</th>
<td><span class="padded-td">{{rule.officeName}}</span></td>
</tr>
<tr>
<th class="table-bold-acc">{{ 'label.heading.description' | translate }}</th>
<td><span class="padded-td">{{rule.description}}</span></td>
</tr>
<tr>
<th class="table-bold-acc">{{ 'label.input.allowMultipleCreditEntries' | translate }}</th>
<td><span class="padded-td">{{rule.allowMultipleCreditEntries}}</span></td>
</tr>
<tr>
<th class="table-bold-acc">{{ 'label.input.allowMultipleDebitEntries' | translate }}</th>
<td><span class="padded-td">{{rule.allowMultipleDebitEntries}}</span></td>
</tr>
</table>
<hr/>
<table width="100%">
<thead>

20
app/views/accounting/view_transactions.html
View File

@ -6,9 +6,9 @@
</ul>
</div>
<div class="row-fluid">
<h3><strong>{{ 'label.heading.transactionnumber' | translate }}&nbsp;<b>{{transactionNumber}}</b></strong></h3>
<h3><strong>{{ 'label.heading.transactionnumber' | translate }}&nbsp;-&nbsp;<b>{{transactionNumber}}</b></strong></h3>
<div class="pull-right">
<div class="pull-right" ng-show="manualEntry">
<span class="required" data-ng-show="!flag"><strong>{{ 'label.transactionisreversedonce' | translate
}}</strong></span>
@ -85,12 +85,25 @@
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
</div>
</script>
<table class="width100">
<tr>
<td class="width14"><label>{{'label.input.office' | translate}}</label></td>
<td class="width36">{{transactions[0].officeName}}</td>
<td class="width19"><label>{{'label.input.transactiondate' | translate}}</label></td>
<td class="width31">{{transactions[0].transactionDate | DateFormat}}</td>
</tr>
<tr>
<td class="width14"><label>{{'label.createdby' | translate}}</label></td>
<td class="width36">{{transactions[0].createdByUserName}}</td>
<td class="width19"><label>{{'label.createdon' | translate}}</label></td>
<td class="width31">{{transactions[0].createdDate | DateFormat}}</td>
</tr>
</table>
<div class="row-fluid">
<table class="table">
<thead>
<tr class="graybg">
<th>{{'label.heading.entryid' | translate}}</th>
<th>{{'label.heading.transactiondate' | translate}}</th>
<th>{{'label.heading.type' | translate}}</th>
<th>{{'label.heading.account' | translate}}</th>
<th>{{'label.heading.debit' | translate}}</th>
@ -100,7 +113,6 @@
<tbody>
<tr class="pointer-main" ng-repeat="transaction in transactions">
<td class="pointer" data-ng-click="showTransaction(transaction)">{{transaction.id}}</td>
<td class="pointer" data-ng-click="showTransaction(transaction)">{{transaction.transactionDate | DateFormat}}</td>
<td class="pointer" data-ng-click="showTransaction(transaction)">{{transaction.glAccountType.value}}</td>
<td class="pointer" data-ng-click="showTransaction(transaction)">{{transaction.glAccountName}}({{transaction.glAccountCode}})</td>
<td class="pointer" data-ng-click="showTransaction(transaction)">