]> 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)
committerLucas Gass <lucas@bywatersolutions.com>
Mon, 27 Jul 2020 17:40:25 +0000 (17:40 +0000)
commit9b51c5eb98e8d1130322fbb71a1aefdbb58119ed
tree51ad086535515848c2497d1f8e778274d72d3be0
parent221403e3a0ce329342ad5fb2f5b9a6c5b7ecf7a7
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>
(cherry picked from commit 223b603f08267f801860bf5deaaa1884e58eab1e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
C4/Calendar.pm
Koha/Calendar.pm
t/Calendar.t