Merge branch 'MIFOSX-1068' of git://github.com/Nayan/mifosx into Nayan-MIFOSX-1068

Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
This commit is contained in:
Vishwas Babu A J
2014-11-13 21:35:54 +05:30
15 changed files with 552 additions and 164 deletions
+9
View File
@@ -8023,6 +8023,15 @@ Request Body:
<td>approvedOnDate</td>
</tr>
</table>
</br>
<table class=matrixHeading>
<tr class="matrixHeadingBG">
<td><div class="mifosXHeading2">Optional Fields</div></td>
</tr>
<tr class=alt>
<td>approvedLoanAmount</td>
</tr>
</table>
</div>
<div class="method-example">
<code class="method-declaration">