Fineract-614:

Updating Global Configurations
Fixing some rebase conflicts

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java

@@ -79,8 +79,8 @@ public class GlobalConfigurationHelper {
         ArrayList<HashMap> actualGlobalConfigurations = getAllGlobalConfigurations(requestSpec, responseSpec);
 
         // There are currently 27 global configurations.
-        Assert.assertEquals(27, expectedGlobalConfigurations.size());
-        Assert.assertEquals(27, actualGlobalConfigurations.size());
+        Assert.assertEquals(28, expectedGlobalConfigurations.size());
+        Assert.assertEquals(28, actualGlobalConfigurations.size());
 
         for (int i = 0; i < expectedGlobalConfigurations.size(); i++) {
 
@@ -324,6 +324,14 @@ public class GlobalConfigurationHelper {
         enableAddressDefault.put("trapDoor", false);
         defaults.add(enableAddressDefault);
 
+        HashMap<String, Object> enableSubRatesDefault = new HashMap<>();
+        enableSubRatesDefault.put("id", 32);
+        enableSubRatesDefault.put("name", "sub-rates");
+        enableSubRatesDefault.put("value", 0);
+        enableSubRatesDefault.put("enabled", false);
+        enableSubRatesDefault.put("trapDoor", false);
+        defaults.add(enableSubRatesDefault);
+
         return defaults;
     }
 

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java

@@ -45,6 +45,7 @@ import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java

@@ -743,7 +743,7 @@ public class LoanProductData implements Serializable {
                            final List<EnumOptionData> rescheduleStrategyTypeOptions, final List<EnumOptionData> interestRecalculationFrequencyTypeOptions,
                            final List<EnumOptionData> preCloseInterestCalculationStrategyOptions, final List<FloatingRateData> floatingRateOptions,
                            final List<EnumOptionData> interestRecalculationNthDayTypeOptions,
-                           final List<EnumOptionData> interestRecalculationDayOfWeekTypeOptions) {
+                           final List<EnumOptionData> interestRecalculationDayOfWeekTypeOptions, final boolean isRatesEnabled) {
         this.id = productData.id;
         this.name = productData.name;
         this.shortName = productData.shortName;