FINERACT-708

2019-02-28 23:56:23 -08:00
parent dba938b076
commit e22216e0cb
1 changed files with 1 additions and 1 deletions
@@ -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());