Merge pull request apache#532 from vishwasbabu/develop

FINERACT-708
swagatikapanda123 · Mar 1, 2019 · a2adc77 · a2adc77
2 parents f115436 + e22216e
commit a2adc77
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...t-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java b/...t-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
@@ -134,7 +134,7 @@ public class LoanCharge extends AbstractPersistableCustom<Long> {
 
     public static LoanCharge createNewFromJson(final Loan loan, final Charge chargeDefinition, final JsonCommand command) {
         final LocalDate dueDate = command.localDateValueOfParameterNamed("dueDate");
-        if (dueDate == null) {
+        if (chargeDefinition.getChargeTimeType().equals(ChargeTimeType.SPECIFIED_DUE_DATE.getValue()) && dueDate == null) {
             final String defaultUserMessage = "Loan charge is missing due date.";
             throw new LoanChargeWithoutMandatoryFieldException("loanCharge", "dueDate", defaultUserMessage, chargeDefinition.getId(),
                     chargeDefinition.getName());