BUGFIX 2106 - repeatable holidays always on sunday. Also removing an old, unused...

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/tools/holidays.pl b/tools/holidays.pl
index 21e791c..f1a9861 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -27,7 +27,7 @@ use C4::Calendar;
 
 my $input = new CGI;
 
-my $branch=C4::Context->preference('defaultbranch') || $input->param('branch');
+my $branch= $input->param('branch') || C4::Context->userenv->{'branch'};
 
 
 
@@ -47,7 +47,7 @@ my $onlymine=(C4::Context->preference('IndependantBranches') &&
               C4::Context->userenv &&
               C4::Context->userenv->{flags} !=1  &&
               C4::Context->userenv->{branch}?1:0);
-if ( C4::Context->preference("IndependantBranches") ) { 
+if ( $onlymine ) { 
     $branch = C4::Context->userenv->{'branch'};
 }
 my $branches = GetBranches($onlymine);

diff --git a/tools/newHolidays.pl b/tools/newHolidays.pl
index 71dd839..d8a51e1 100755 (executable)
--- a/tools/newHolidays.pl
+++ b/tools/newHolidays.pl
@@ -27,10 +27,14 @@ if ($description) {
 } else {
        $description = '';
 }
-
 my $calendar = C4::Calendar->new(branchcode => $branchcode);
 
 if ($input->param('newOperation') eq 'weekday') {
+       unless ( $weekday && ($weekday ne '') ) { 
+               # was dow calculated by javascript?  original code implies it was supposed to be.
+               # if not, we need it.
+               $weekday = &Date::Calc::Day_of_Week($year, $month, $day) % 7 unless($weekday);
+       }
        $calendar->insert_week_day_holiday(weekday => $weekday,
                                                                   title => $title,
                                                                   description => $description);