Merge branch 'FINERACT-37' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/525e8bec Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/525e8bec Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/525e8bec Branch: refs/heads/develop Commit: 525e8becb49ee59551a53e2552e144897439ecca Parents: e20ec29 b478064 Author: Nazeer Hussain Shaik <nazeer.sh...@confluxtechnologies.com> Authored: Tue Oct 18 11:24:58 2016 +0530 Committer: Nazeer Hussain Shaik <nazeer.sh...@confluxtechnologies.com> Committed: Tue Oct 18 11:24:58 2016 +0530 ---------------------------------------------------------------------- .../api/WorkingDaysApiConstants.java | 6 +-- .../workingdays/data/WorkingDayValidator.java | 6 ++- .../workingdays/data/WorkingDaysData.java | 11 ++++-- .../workingdays/domain/WorkingDays.java | 15 ++++++- .../WorkingDaysReadPlatformServiceImpl.java | 8 ++-- .../domain/DefaultScheduledDateGenerator.java | 41 +++++++++++++++----- .../V320__add_holiday_payment_reschedule.sql | 20 ++++++++++ 7 files changed, 86 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/525e8bec/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/WorkingDays.java ----------------------------------------------------------------------
