Merge branch 'MIFOSX-1613' of git://github.com/pramodn02/mifosx into pramodn02-MIFOSX-1613

Conflicts:
	api-docs/apiLive.htm
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/data/LoanProductData.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProduct.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java

api-docs/apiLive.htm

@@ -11467,6 +11467,13 @@ An enumeration that indicates the type of transaction processing strategy to be
 							be overdue before being classified as a NPA (non performing asset)
 							</td>
 						</tr>
+						<tr class=alt>
+							<td>accountMovesOutOfNPAOnlyOnArrearsCompletion</td>
+						</tr>
+						<tr>
+							<td class=fielddesc>Optional: Boolean - if provided as true,  Loan Account moves out of NPA state only when all arrears are cleared
+							</td>
+						</tr>
 						<tr class=alt>
 							<td>accountingRule</td>
 						</tr>
@@ -11528,6 +11535,12 @@ An enumeration that indicates the type of transaction processing strategy to be
 						<tr>
 							<td class=fielddesc>Specifies rest frequency start date for interest recalculation.<br>
 						</tr>
+						<tr class=alt>
+							<td>isArrearsBasedOnOriginalSchedule</td>
+						</tr>
+						<tr>
+							<td class=fielddesc>If Specified as true, arrears will be identified based on original schedule.<br>
+						</tr>
 					</table>
 				</div>
 			</div>
@@ -11642,7 +11655,8 @@ GET https://DomainName/api/v1/loanproducts
 		    "id":1,
 			"code":"interestRecalculationFrequencyType.same.as.repayment.period",
 			"value":"Same as repayment period"
-		}
+		},
+		"isArrearsBasedOnOriginalSchedule" : true
     },
     "accountingRule": {
       "id": 2,
@@ -12772,7 +12786,7 @@ GET https://DomainName/api/v1/loanproducts/{productId}
 							numberOfRepaymentVariationsForBorrowerCycle,
 							interestRateVariationsForBorrowerCycle,
 							multiDisburseLoan,maxTrancheCount,
-							outstandingLoanBalance,overdueDaysForNPA,holdGuaranteeFunds, principalThresholdForLastInstalment
+							outstandingLoanBalance,overdueDaysForNPA,holdGuaranteeFunds, principalThresholdForLastInstalment, accountMovesOutOfNPAOnlyOnArrearsCompletion
 							</td>
 						</tr>
 					</table>
@@ -12806,6 +12820,14 @@ GET https://DomainName/api/v1/loanproducts/{productId}
 						</tr>
 					</table>
 					<table class=matrixHeading>
+						<tr class="matrixHeadingBG">
+							<td><div class="mifosXHeading2">Additional Optional Fields if interest recalculation is enabled(true) </div></td>
+						</tr>
+						<tr class=alt>
+							<td>isArrearsBasedOnOriginalSchedule</td>
+						</tr>
+					</table>
+					<table class=matrixHeading>						
 						<tr class="matrixHeadingBG">
 							<td><div class="mifosXHeading2">Additional Optional Fields if interest recalculation is enabled(true) and recalculationRestFrequencyType is not same as repayment period</div></td>
 						</tr>