X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fserials-recieve.pl;h=cc67949eacfa9339a868e7b90dcafcffa216a36a;hb=54d42771258681762b659a2685e2678dc6bd8ef6;hp=89e86be05222d4c77965ecead8af264edee1b731;hpb=8e41022b0d488dad005bf5d0f4388f1a74fb0df6;p=koha_gimpoz diff --git a/serials/serials-recieve.pl b/serials/serials-recieve.pl index 89e86be052..cc67949eac 100755 --- a/serials/serials-recieve.pl +++ b/serials/serials-recieve.pl @@ -13,9 +13,9 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. =head1 NAME @@ -28,7 +28,7 @@ serials-recieve.pl =item op op can be : - * modsubscriptionhistory :to modify the subscription history + * modsubscriptionhistory :to modify the subscription history * serialchangestatus :to modify the status of this subscription =item subscriptionid @@ -63,6 +63,7 @@ op can be : use strict; +use warnings; use CGI; use C4::Auth; use C4::Dates qw/format_date format_date_in_iso/; @@ -75,7 +76,7 @@ use C4::Serials; use C4::Branch; # GetBranches my $query = new CGI; -my $op = $query->param('op'); +my $op = $query->param('op') || q{}; my $dbh = C4::Context->dbh; my $subscriptionid = $query->param('subscriptionid'); # my $auser = $query->param('user'); @@ -125,7 +126,7 @@ if ($op eq 'serialchangestatus') { my $sth = $dbh->prepare("select status from serial where serialid=?"); for (my $i=0;$i<=$#serialids;$i++) { $sth->execute($serialids[$i]); - + my ($oldstatus) = $sth->fetchrow; if ($serialids[$i]) { ModSerialStatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),format_date_in_iso($publisheddates[$i]),$status[$i],$notes[$i]) unless ($hassubscriptionexpired && $oldstatus == 1); @@ -140,11 +141,11 @@ if ($op eq 'serialchangestatus') { my ($status2, @errors)= ItemizeSerials($serialids[$i],\%info); my $sth2 = $dbh->prepare("UPDATE subscriptionhistory SET lastbranch = ? WHERE subscriptionid = ?"); $sth2->execute($homebranches[$i],$subscriptionid); - $sth2->finish; + $sth2->finish; # remove from missing list if item being checked in is on it if ($status2 ==1){ removeMissingIssue($serialseqs[$i],$subscriptionid); - } + } } } else { # add a special issue @@ -185,7 +186,7 @@ my $subs = &GetSubscription($subscriptionid); my ($totalissues,@serialslist) = GetSerials($subscriptionid); my $count = @serialslist; for(my $i=0;$i<$count;$i++){ - warn "la : $i"; + #warn "la : $i"; $serialslist[$i]->{'callnumber'} = $subscription->{'callnumber'}; my $temp = rand(10000000); $serialslist[$i]->{'barcode'} = "TEMP" . sprintf("%.0f",$temp); @@ -217,7 +218,7 @@ if (C4::Context->preference("serialsadditems")){ } my $itemstatushash = GetItemStatus($fwk); my @itemstatusloop; - my $itemstatusloopcount=0; + my $itemstatusloopcount=0; foreach my $thisitemstatus (keys %$itemstatushash) { my %row =(itemval => $thisitemstatus, itemlib => $itemstatushash->{$thisitemstatus}, @@ -242,7 +243,7 @@ if (C4::Context->preference("serialsadditems")){ $data->{"branchloop"} = \@branchloop ; } # warn "Choice: $choice"; - $template->param(choice => $choice); + $template->param(choice => $choice); $template->param(serialadditems =>C4::Context->preference("serialsadditems"), branchloop => \@branchloop, ) ; @@ -271,7 +272,7 @@ $template->param( bibliotitle => $subs->{bibliotitle}, biblionumber => $subs->{biblionumber}, hassubscriptionexpired =>$hassubscriptionexpired, - abouttoexpire =>$abouttoexpire, + abouttoexpire =>$abouttoexpire, routing => $routing, missingseq => $manualissue, frommissing => $manualstatus,