]> git.koha-community.org Git - koha.git/commit
Bug 25723: (QA follow-up) Handle holiday and exception on same day
authorNick Clemens <nick@bywatersolutions.com>
Fri, 17 Jul 2020 12:34:18 +0000 (12:34 +0000)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 20 Jul 2020 15:45:31 +0000 (17:45 +0200)
commit223b603f08267f801860bf5deaaa1884e58eab1e
treee91a86aa6f4eb50e6ea5e59c478ff172ed308ad7
parent5851539424d04eda0da52ef8744925227dd6ce0f
Bug 25723: (QA follow-up) Handle holiday and exception on same day

When a holiday is entered, then exceptions generated on a range, there exists both a holiday and exception in
the special holidays table. We should cache the exception over the holiday instead of both

Also, !1 in perl returns '' rather than 0, so we should explicitly set the value

Add blank line to clear pod error from qa tools

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Re-introduce the blank line mentioned in the commit message, it was accidentally removed by automatic formatting
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
C4/Calendar.pm
Koha/Calendar.pm
t/Calendar.t