Merge branch 'FINERACT-183' into develop

This commit is contained in:
Nazeer Hussain Shaik
2016-06-22 11:46:23 +05:30
@@ -303,7 +303,12 @@ public class SavingsProduct extends AbstractPersistable<Long> {
this.withHoldTax = withHoldTax; this.withHoldTax = withHoldTax;
this.taxGroup = taxGroup; this.taxGroup = taxGroup;
this.isDormancyTrackingActive = isDormancyTrackingActive; if(isDormancyTrackingActive == null) {
this.isDormancyTrackingActive = Boolean.FALSE ;
}else {
this.isDormancyTrackingActive = isDormancyTrackingActive;
}
this.daysToInactive = daysToInactive; this.daysToInactive = daysToInactive;
this.daysToDormancy = daysToDormancy; this.daysToDormancy = daysToDormancy;
this.daysToEscheat = daysToEscheat; this.daysToEscheat = daysToEscheat;
@@ -590,7 +595,7 @@ public class SavingsProduct extends AbstractPersistable<Long> {
this.daysToEscheat = newValue; this.daysToEscheat = newValue;
} }
if(!this.isDormancyTrackingActive){ if(this.isDormancyTrackingActive == null || !this.isDormancyTrackingActive){
this.daysToInactive = null; this.daysToInactive = null;
this.daysToDormancy = null; this.daysToDormancy = null;
this.daysToEscheat = null; this.daysToEscheat = null;