Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug fix : 2361 Location was lost on subscription update

Browse source 
Location is now defaulted to the location of the librarian
When updating subscription, subscription branchcode is taken into account.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Henri-Damien LAURENT 2008-08-06 14:59:58 +02:00 committed by Joshua Ferraro
parent 666023d88f
commit 111298c5b9
1 changed files with 51 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
serials/subscription-add.pl
View file

@ -72,23 +72,6 @@ foreach my $thisletter (keys %$letters) {
} }
$template->param(letterloop => \@letterloop); $template->param(letterloop => \@letterloop);
my $onlymine=C4::Context->preference('IndependantBranches') &&
C4::Context->userenv &&
C4::Context->userenv->{flags}!=1 &&
C4::Context->userenv->{branch};
my $branches = GetBranches($onlymine);
my @branchloop;
for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
my $selected = 1 if $thisbranch eq C4::Context->userenv->{'branch'};
my %row =(value => $thisbranch,
selected => $selected,
branchname => $branches->{$thisbranch}->{'branchname'},
);
push @branchloop, \%row;
}
$template->param(branchloop => \@branchloop,
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
);
my $subscriptionid; my $subscriptionid;
my $subs; my $subs;
my $firstissuedate; my $firstissuedate;
@ -154,6 +137,24 @@ if ($op eq 'mod' || $op eq 'dup' || $op eq 'modsubscription') {
} }
} }
my $onlymine=C4::Context->preference('IndependantBranches') &&
C4::Context->userenv &&
C4::Context->userenv->{flags}!=1 &&
C4::Context->userenv->{branch};
my $branches = GetBranches($onlymine);
my @branchloop;
for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
my $selected = 1 if ($thisbranch eq C4::Context->userenv->{'branch'});
my $selected = 1 if (defined($subs) && $thisbranch eq $subs->{'branchcode'});
my %row =(value => $thisbranch,
selected => $selected,
branchname => $branches->{$thisbranch}->{'branchname'},
);
push @branchloop, \%row;
}
$template->param(branchloop => \@branchloop,
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
);
my $count = 0; my $count = 0;
# prepare template variables common to all $op conditions: # prepare template variables common to all $op conditions:
$template->param( 'dateformat_' . C4::Context->preference('dateformat') => 1 , $template->param( 'dateformat_' . C4::Context->preference('dateformat') => 1 ,