MIFOSX-2180

mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/domain/Charge.java

@@ -92,7 +92,7 @@ public class Charge extends AbstractPersistable<Long> {
     private Integer feeFrequency;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "gl_account_id")
+    @JoinColumn(name = "income_or_liability_account_id")
     private GLAccount account;
 
     public static Charge fromJson(final JsonCommand command, final GLAccount account) {

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java

@@ -138,7 +138,7 @@ public class ClientChargeWritePlatformServiceJpaRepositoryImpl implements Client
 
         ClientTransaction clientTransaction = ClientTransaction.payCharge(client, client.getOffice(), paymentDetail, transactionDate,
                 chargePaid, clientCharge.getCurrency().getCode(), getAppUserIfPresent());
-        this.clientTransactionRepository.save(clientTransaction);
+        this.clientTransactionRepository.saveAndFlush(clientTransaction);
 
         // update charge paid by associations
         final ClientChargePaidBy chargePaidBy = ClientChargePaidBy.instance(clientTransaction, clientCharge, amountPaid);

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientTransactionWritePlatformServiceJpaRepositoryImpl.java

@@ -72,6 +72,7 @@ public class ClientTransactionWritePlatformServiceJpaRepositoryImpl implements C
         }
 
         // generate accounting entries
+        this.clientTransactionRepository.saveAndFlush(clientTransaction);
         generateAccountingEntries(clientTransaction);
 
         return new CommandProcessingResultBuilder() //