Merge pull request #583 from vishwasbabu/develop

minor issues in savings transfer

mifosng-db/migrations/core_db/V114__set_default_transfers_in_suspense_account_for_existing_savings_products.sql

@@ -0,0 +1,4 @@
+INSERT INTO `acc_product_mapping` (`gl_account_id`,`product_id`,`product_type`,`payment_type`,`charge_id`,`financial_account_type`)
+select mapping.gl_account_id,mapping.product_id,mapping.product_type,mapping.payment_type,mapping.charge_id, 10
+from acc_product_mapping mapping
+where mapping.financial_account_type = 1 and mapping.product_type=2;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsEnumerations.java

@@ -84,6 +84,24 @@ public class SavingsEnumerations {
                 optionData = new SavingsAccountTransactionEnumData(SavingsAccountTransactionType.ANNUAL_FEE.getValue().longValue(),
                         SavingsAccountTransactionType.ANNUAL_FEE.getCode(), "Annual fee");
             break;
+            case APPROVE_TRANSFER:
+                optionData = new SavingsAccountTransactionEnumData(SavingsAccountTransactionType.APPROVE_TRANSFER.getValue().longValue(),
+                        SavingsAccountTransactionType.APPROVE_TRANSFER.getCode(), "Transfer approved");
+            break;
+            case INITIATE_TRANSFER:
+                optionData = new SavingsAccountTransactionEnumData(SavingsAccountTransactionType.INITIATE_TRANSFER.getValue().longValue(),
+                        SavingsAccountTransactionType.INITIATE_TRANSFER.getCode(), "Transfer initiated");
+            break;
+            case REJECT_TRANSFER:
+                optionData = new SavingsAccountTransactionEnumData(SavingsAccountTransactionType.REJECT_TRANSFER.getValue().longValue(),
+                        SavingsAccountTransactionType.REJECT_TRANSFER.getCode(), "Transfer Rejected");
+            break;
+            case WITHDRAW_TRANSFER:
+                optionData = new SavingsAccountTransactionEnumData(SavingsAccountTransactionType.WITHDRAW_TRANSFER.getValue().longValue(),
+                        SavingsAccountTransactionType.WITHDRAW_TRANSFER.getCode(), "Transfer Withdrawn");
+            break;
+            default:
+            break;
         }
         return optionData;
     }

mifosng-provider/src/main/java/org/mifosplatform/portfolio/transfer/service/TransferWritePlatformServiceJpaRepositoryImpl.java

@@ -368,8 +368,7 @@ public class TransferWritePlatformServiceJpaRepositoryImpl implements TransferWr
                                     DateUtils.getLocalDateOfTenant());
                         break;
                         case REJECTION:
-                            this.savingsAccountWritePlatformService.withdrawSavingsTransfer(savingsAccount.getId(),
+                            this.savingsAccountWritePlatformService.rejectSavingsTransfer(savingsAccount.getId());
-                                    DateUtils.getLocalDateOfTenant());
                         break;
                         case WITHDRAWAL:
                             this.savingsAccountWritePlatformService.withdrawSavingsTransfer(savingsAccount.getId(),