From eed1535c128fa148502d6034cf8901f65821f1cc Mon Sep 17 00:00:00 2001 From: Manoj Date: Mon, 8 Nov 2021 15:13:48 +0530 Subject: [PATCH] FINERACT-1410: Fix feature broken by PR1960 --- .../V374__adding_expenseliablity_to_paymentorfeetype.sql | 6 +++--- .../integrationtests/common/GlobalConfigurationHelper.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fineract-provider/src/main/resources/sql/migrations/core_db/V374__adding_expenseliablity_to_paymentorfeetype.sql b/fineract-provider/src/main/resources/sql/migrations/core_db/V374__adding_expenseliablity_to_paymentorfeetype.sql index 075976a9d..9946bb92a 100644 --- a/fineract-provider/src/main/resources/sql/migrations/core_db/V374__adding_expenseliablity_to_paymentorfeetype.sql +++ b/fineract-provider/src/main/resources/sql/migrations/core_db/V374__adding_expenseliablity_to_paymentorfeetype.sql @@ -1,4 +1,4 @@ --- + -- -- Licensed to the Apache Software Foundation (ASF) under one -- or more contributor license agreements. See the NOTICE file -- distributed with this work for additional information @@ -20,6 +20,6 @@ ALTER TABLE `c_configuration` ADD COLUMN `string_value` VARCHAR(100) NULL DEFAULT NULL AFTER `date_value`; -insert into c_configuration(name, string_value, enabled, description) values('account-mapping-for-payment-type', 'Asset', 0, 'Asset: default for asset, Use comma seperated values for Liability, Asset and Expense accounts'); +insert into c_configuration(name, string_value, enabled, description) values('account-mapping-for-payment-type', 'Asset', 1, 'Asset: default for asset, Use comma seperated values for Liability, Asset and Expense accounts'); -insert into c_configuration(name, string_value, enabled, description) values('account-mapping-for-charge', 'Income', 0, 'Income: default for Income, Use comma seperated values for Income, Liability and Expense accounts'); +insert into c_configuration(name, string_value, enabled, description) values('account-mapping-for-charge', 'Income', 1, 'Income: default for Income, Use comma seperated values for Income, Liability and Expense accounts'); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java index 394553913..c295ce5a4 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java @@ -366,7 +366,7 @@ public class GlobalConfigurationHelper { isAccountMappedForPayment.put("id", 35); isAccountMappedForPayment.put("name", "account-mapping-for-payment-type"); isAccountMappedForPayment.put("value", 0); - isAccountMappedForPayment.put("enabled", false); + isAccountMappedForPayment.put("enabled", true); isAccountMappedForPayment.put("trapDoor", false); isAccountMappedForPayment.put("string_value", "Asset"); defaults.add(isAccountMappedForPayment); @@ -375,7 +375,7 @@ public class GlobalConfigurationHelper { isAccountMappedForCharge.put("id", 36); isAccountMappedForCharge.put("name", "account-mapping-for-charge"); isAccountMappedForCharge.put("value", 0); - isAccountMappedForCharge.put("enabled", false); + isAccountMappedForCharge.put("enabled", true); isAccountMappedForCharge.put("trapDoor", false); isAccountMappedForCharge.put("string_value", "Income"); defaults.add(isAccountMappedForCharge);