Skip to content

Commit

Permalink
Merge branch 'develop' of git://github.com/Lajeo/community-app into L…
Browse files Browse the repository at this point in the history 
…ajeo-develop
  • Loading branch information
@vishwasbabu
vishwasbabu committed Jan 14, 2015
2 parents 7405c50 + f676c85 commit 2c02f00
Show file tree
Hide file tree
Showing 30 changed files with 111 additions and 104 deletions.
4 changes: 2 additions & 2 deletions app/views/accounting/freqposting.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <h4><strong>{{ 'label.input.debit' | translate }}</strong>&nbsp;
ng-options="debitAccount.name for debitAccount in rule.debitAccounts">
</select>

<input id="debits[{{$index}}]" type="text" class="input-sm form-control"
<input id="debits[{{$index}}]" type="text" class="input-sm form-control" number-format
ng-model="dbAccount.debitAmount">
<a ng-click="removeDebitAccount($index)">&nbsp;<i
class="icon-remove icon-white"></i></a>
Expand All @@ -67,7 +67,7 @@ <h4><strong>{{ 'label.input.credit' | translate }}</strong>&nbsp;
<select ng-init="crAccount.select = rule.creditAccounts[0]" class="input-sm form-control" ng-model="crAccount.select"
ng-options="creditAccount.name for creditAccount in formData.rule.creditAccounts">
</select>
<input id="credits[{{$index}}]" type="text" class="input-sm form-control"
<input id="credits[{{$index}}]" type="text" class="input-sm form-control" number-format
ng-model="crAccount.crAmount">
<a ng-click="removeCrAccount($index)">&nbsp;<i class="icon-remove icon-white"></i></a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/accounting/journalentry_posting.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h4><strong>{{ 'label.input.debit' | translate }}</strong>&nbsp;<a ng-click="add
ng-options="(debitAccount.name +'('+ debitAccount.glCode +')') for debitAccount in glAccounts" class="form-control">
<option class="displaynone" value="">{{'label.selectdebit' | translate}}</option>
</select>&nbsp;&nbsp;
<input type="text" class="input-small form-control" ng-model="dbAccount.debitAmount">
<input type="text" class="input-small form-control" number-format ng-model="dbAccount.debitAmount">
&nbsp;<a ng-click="removeDebitAccount($index)">&nbsp;<i class="icon-remove icon-white"></i></a>
</div>
<h4><strong>{{ 'label.input.credit' | translate }}</strong>&nbsp;<a ng-click="addCrAccount()">&nbsp;<i class="icon-plus icon-white"></i></a></h4>
Expand All @@ -48,7 +48,7 @@ <h4><strong>{{ 'label.input.credit' | translate }}</strong>&nbsp;<a ng-click="ad
ng-options="(creditAccount.name + '('+ creditAccount.glCode + ')') for creditAccount in glAccounts" class="form-control">
<option class="displaynone" value="">{{'label.selectcredit' | translate}}</option>
</select>&nbsp;&nbsp;
<input type="text" class="input-small form-control" ng-model="crAccount.crAmount">&nbsp;
<input type="text" class="input-small form-control" number-format ng-model="crAccount.crAmount">&nbsp;
<a ng-click="removeCrAccount($index)">&nbsp;<i class="icon-remove icon-white"></i></a>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/accounting/search_transaction.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@
</td>
<td class="pointer" data-ng-click="routeTo(transaction.transactionId)">
<div ng-show="transaction.entryType.value == 'DEBIT'">
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount}}
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount | number}}
</div>
</td>
<td class="pointer" data-ng-click="routeTo(transaction.transactionId)">
<div ng-show="transaction.entryType.value == 'CREDIT'">
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount}}
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount | number}}
</div>
</td>
</tr>
Expand Down
7 changes: 4 additions & 3 deletions app/views/accounting/view_transactions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ <h4><strong class="required">{{ 'label.heading.transactionnumber' | translate }}
<script type="text/ng-template" id="viewjournalentry.html">
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.viewjournalentry' | translate}}</h3>
<legend></legend>
<table class="modalwidth600">
<tr>
<td class="width31">{{'label.input.office' | translate}}</td>
Expand Down Expand Up @@ -47,7 +48,7 @@ <h3 class="bolder">{{'label.heading.viewjournalentry' | translate}}</h3>
</tr>
<tr>
<td>{{transaction.entryType.code | translate}}</td>
<td>{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount}}</td>
<td>{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount | number}}</td>
</tr>
<tr ng-show="transaction.referenceNumber">
<td>{{'label.input.referencenumber' | translate}}</td>
Expand Down Expand Up @@ -133,12 +134,12 @@ <h3 class="bolder">{{ 'label.heading.transactionnumber' | translate }}&nbsp;-&nb
<td class="pointer" data-ng-click="showTransaction(transaction)">{{transaction.glAccountName}}({{transaction.glAccountCode}})</td>
<td class="pointer" data-ng-click="showTransaction(transaction)">
<div ng-show="transaction.entryType.value == 'DEBIT'">
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount}}
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount | number}}
</div>
</td>
<td class="pointer" data-ng-click="showTransaction(transaction)">
<div ng-show="transaction.entryType.value == 'CREDIT'">
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount}}
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount | number}}
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion app/views/accounttransfers/create_standinginstruction.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="transferAmount">{{ 'label.input.amount' | translate }}</label>
<div class="col-sm-3">
<input type="text" id="transferAmount" name="transferAmount" ng-model="formData.amount" class="form-control"/>
<input type="text" id="transferAmount" name="transferAmount" number-format ng-model="formData.amount" class="form-control"/>
</div>
</div>
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion app/views/accounttransfers/edit_standinginstruction.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="transferAmount">{{ 'label.input.amount' | translate }}</label>
<div class="col-sm-3">
<input type="text" id="transferAmount" name="transferAmount" ng-model="formData.amount"/>
<input type="text" id="transferAmount" name="transferAmount" number-format ng-model="formData.amount"/>
</div>
</div>
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion app/views/accounttransfers/list_standinginstruction.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

</td>
<td>{{instruction.toAccount.accountNo}}({{instruction.toAccountType.value}})</td>
<td>{{instruction.instructionType.value}}/{{instruction.amount}}</td>
<td>{{instruction.instructionType.value}}/{{instruction.amount | number}}</td>
<td>{{instruction.validFrom | DateFormat}} to {{instruction.validTill | DateFormat}}</td>
<td class="select-row:selection">
<a title="{{'label.button.edit' | translate}}" has-permission='UPDATE_STANDINGINSTRUCTION' data-ng-show="instruction.status.value!='Deleted'" href="#/editstandinginstruction/{{instruction.id}}/list">{{'label.button.edit' | translate}}/</a>
Expand Down
2 changes: 1 addition & 1 deletion app/views/accounttransfers/list_transactions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<tbody>
<tr class="pointer-main" ng-repeat="transaction in transactions.currentPageItems">
<td>{{transaction.transferDate | DateFormat}}</td>
<td>{{transaction.transferAmount}}</td>
<td>{{transaction.transferAmount|number}}</td>
<td>{{transaction.transferDescription}}</td>
<td ng-show="transaction.reversed">{{'label.heading.yes' | translate}}</td>
<td ng-hide="transaction.reversed">{{'label.heading.no' | translate}}</td>
Expand Down
2 changes: 1 addition & 1 deletion app/views/accounttransfers/view_accounttransfer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h3>{{ 'label.heading.viewaccounttransferdetails' | translate}}</h3>
<table width="100%">
<tr>
<td width="20%">{{ 'label.heading.transactionamount' | translate }}</td>
<td width="70%">{{transferData.transferAmount}}</td>
<td width="70%">{{transferData.transferAmount | number}}</td>
</tr>
<tr>
<td>{{ 'label.heading.transactiondate' | translate }}</td>
Expand Down
2 changes: 1 addition & 1 deletion app/views/accounttransfers/view_standinginstruction.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</tr>
<tr>
<td>{{ 'label.input.amount' | translate }}</td>
<td>{{standinginstruction.amount}}</td>
<td>{{standinginstruction.amount}number}}</td>
</tr>
<tr>
<td>{{ 'label.heading.validfrom' | translate }}</td>
Expand Down
2 changes: 1 addition & 1 deletion app/views/clients/viewclient.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ <h4><strong>{{client.displayName}}</strong></h4>
</tr>
<tr>
<th>{{ 'label.totalsavings' | translate }}</th>
<td><span class="padded-td">{{client.ClientSummary.totalSavings}}</span></td>
<td><span class="padded-td">{{client.ClientSummary.totalSavings|number}}</span></td>
</tr>
<tr>
<th>{{ 'label.numofactivesavings' | translate }}</th>
Expand Down
16 changes: 8 additions & 8 deletions app/views/collection/collectionsheet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,14 @@ <h2><strong ng-show="val" class="display-save-message">{{'label.savecollectionsh

<span ng-repeat="loan in client.loans" ng-show="loanproduct.id == loan.productId">
<div class="col-md-7 paddinglr0px">
<input id="total" type="text" class="input-sm form-control"
<input id="total" type="text" class="input-sm form-control" number-format
ng-model="loan.totalDue"
ng-change="sumTotalDueCollection()">
</div>
<span ng-hide="loan.chargesDue" ng-init="loan.chargesDue = 0">
</span>
<div class="col-md-5 padd">
<input type="text" class="input-sm form-control" ng-model="loan.chargesDue"
<input type="text" class="input-sm form-control" number-format ng-model="loan.chargesDue"
ng-change="sumTotalDueCollection()">
</div>
</span>
Expand All @@ -191,7 +191,7 @@ <h2><strong ng-show="val" class="display-save-message">{{'label.savecollectionsh
<span ng-repeat="savings in client.savings"
ng-show="savingsproduct.id === savings.productId">
<div class="col-md-7">
<input id="dueAmount" number-format type="text" class="input-sm form-control"
<input id="dueAmount" number-format type="text" class="input-sm form-control" number-format
ng-model="savings.dueAmount"
ng-change="sumTotalDueCollection()">
</div>
Expand Down Expand Up @@ -220,14 +220,14 @@ <h2><strong ng-show="val" class="display-save-message">{{'label.savecollectionsh
<span ng-repeat="grouptotal in loanGroupsTotal"
ng-show="grouptotal.groupId === group.groupId && loanproduct.id === grouptotal.productId">
<input type="text" class="input-sm form-control"
ng-model="grouptotal.dueAmount" disabled="disabled">
number-format ng-model="grouptotal.dueAmount" disabled="disabled">
</span>
</td>
<td ng-repeat="savingsproduct in collectionsheetdata.savingsProducts">
<span ng-repeat="grouptotal in savingsGroupsTotal"
ng-show="grouptotal.groupId === group.groupId && savingsproduct.id === grouptotal.productId">
<input type="text" class="input-sm form-control"
ng-model="grouptotal.dueAmount" disabled="disabled">
number-format ng-model="grouptotal.dueAmount" disabled="disabled">
</span>
</td>
<td></td>
Expand All @@ -237,13 +237,13 @@ <h2><strong ng-show="val" class="display-save-message">{{'label.savecollectionsh
<tr>
<td style="height:30px" ng-repeat="loanproduct in collectionsheetdata.loanProducts">
<span ng-repeat="total in loansTotal" ng-show="loanproduct.id == total.productId">
<input type="text" class="input-sm form-control" ng-model="total.dueAmount"
<input type="text" class="input-sm form-control" number-format ng-model="total.dueAmount"
disabled="disabled">
</span>
</td>
<td style="height:30px" ng-repeat="savingsproduct in collectionsheetdata.savingsProducts">
<span ng-repeat="total in savingsTotal" ng-show="savingsproduct.id == total.productId">
<input type="text" class="input-sm form-control" ng-model="total.dueAmount"
<input type="text" class="input-sm form-control" number-format ng-model="total.dueAmount"
disabled="disabled">
</span>
</td>
Expand All @@ -262,7 +262,7 @@ <h2><strong ng-show="val" class="display-save-message">{{'label.savecollectionsh

<div class="templatekeys" style="background-color:#8585FF!important"
ng-repeat="loanDueTotalCollection in totalDueCollection">
{{loanDueTotalCollection.dueAmount}}&nbsp;&nbsp;
{{loanDueTotalCollection.dueAmount | number}}&nbsp;&nbsp;
{{loanDueTotalCollection.currencySymbol}}
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/views/collection/productivecollectionsheet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</span>
<span style="height:30px" ng-repeat="loanproduct in collectionsheetdata.loanProducts">
<span ng-repeat="total in grandTotal" ng-show="loanproduct.id == total.productId">
<input type="text" class="input-sm" ng-model="total.transactionAmount"
<input type="text" class="input-sm" number-format ng-model="total.transactionAmount"
disabled="disabled">
</span>
</span>
Expand Down Expand Up @@ -69,7 +69,7 @@
<td ng-repeat="loanproduct in collectionsheetdata.loanProducts">
<span ng-repeat="loan in client.loans" ng-show="loanproduct.id == loan.productId">
<input id="total" type="text" class="input-smaller" ng-model="loan.totalDue"
ng-change="bulkRepaymentTransactionAmountChange()">
number-format ng-change="bulkRepaymentTransactionAmountChange()">
</span>
</td>
<td>
Expand All @@ -88,7 +88,7 @@
<span ng-repeat="grouptotal in groupTotal" ng-show="grouptotal.groupId == group.groupId">
<span ng-repeat="loanProductArray in grouptotal.loanProductArrayDup"
ng-show="loanproduct.id == loanProductArray.productId">
<input type="text" class="input-smaller" ng-model="loanProductArray.transactionAmount"
<input type="text" class="input-smaller" number-format ng-model="loanProductArray.transactionAmount"
disabled="disabled">
</span>
</span>
Expand Down
Loading

0 comments on commit 2c02f00

Please sign in to comment.