Bug 5549 : circ/returns needs to import DateUtils
[koha.git] / serials / subscription-add.pl
index 69493ab..9acee7b 100755 (executable)
@@ -1,7 +1,5 @@
 #!/usr/bin/perl
 
-# Copyright 2000-2003 Katipo Communications
-#
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
 # 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
-
-# $Id$
-
-=head1 NAME
-
-subscription-add.pl
-
-=head1 DESCRIPTION
-
-this script add a subscription into the database.
-
-=head1 PARAMETERS
-
-=over 4
-
-=item op
-op use to know the operation to do on this template.
- * mod : to modify an existing subscription
- * addsubscription : to add a subscription
-
-Note that if op = mod or addsubscription there are a lot of other params.
-
-
-=back
-
-=cut
-
+# 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.
 
 use strict;
+use warnings;
+
 use CGI;
+use Date::Calc qw(Today Day_of_Year Week_of_Year Add_Delta_Days);
 use C4::Koha;
+use C4::Biblio;
 use C4::Auth;
-use C4::Date;
-use C4::Serials;
-use C4::Bookfund;
-use C4::Interface::CGI::Output;
+use C4::Dates qw/format_date format_date_in_iso/;
+use C4::Acquisition;
+use C4::Output;
 use C4::Context;
+use C4::Branch; # GetBranches
+use C4::Serials;
 use C4::Letters;
-use C4::Members;
-use DateTime;
-my $query = new CGI;
-my $op = $query->param('op');
+use Carp;
+
+#use Smart::Comments;
+
+my $query = CGI->new;
+my $op = $query->param('op') || '';
 my $dbh = C4::Context->dbh;
-my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
-    $publisheddate,$dow,$irregularity, $numberpattern, $numberlength, $weeklength, $monthlength, $sublength,
-    $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
-    $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
-    $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
-    $numberingmethod, $status, $biblionumber,
-    $title, $notes, $letter,$callnumber,$hemisphere);
+my $sub_length;
+
+my @budgets;
+
+# Permission needed if it is a modification : edit_subscription
+# Permission needed otherwise (nothing or dup) : create_subscription
+my $permission = ($op eq "modify") ? "edit_subscription" : "create_subscription";
 
-    my @budgets;
 my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-add.tmpl",
-                query => $query,
-                type => "intranet",
-                authnotrequired => 0,
-                flagsrequired => {catalogue => 1},
-                debug => 1,
-                });
+                               query => $query,
+                               type => "intranet",
+                               authnotrequired => 0,
+                               flagsrequired => {serials => $permission},
+                               debug => 1,
+                               });
+
 
-my $weekarrayjs='';
-my $count = 0;
-my $today=get_today();
- my $dateobj=DATE_obj($today);
-  my $year=$dateobj->year;
-  my $month=$dateobj->month;
-  my $day=$dateobj->day_of_month;
-my $firstday = $dateobj->day_of_year;
-my $wkno = $dateobj->week_number;
-my $weekno = $wkno;
-for(my $i=$firstday;$i<($firstday+365);$i=$i+7){
-        $count = $i;
-        if($wkno > 52){$year++; $wkno=1;}
-        if($count>365){$count=$i-365;}    
-     my $newdate=DateTime->from_day_of_year(year=>$year,day_of_year=>$count);
-        $weekarrayjs .= "'Wk $wkno: ".format_date($newdate->ymd)."',";
-        $wkno++;    
-}
-chop($weekarrayjs);
-# warn $weekarrayjs;
 
 my $sub_on;
 my @subscription_types = (
             'issues', 'weeks', 'months'
-        ); 
+        );
 my @sub_type_data;
-if ($op eq 'mod') {
+
+my $subs;
+my $firstissuedate;
+my $nextexpected;
+
+if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') {
+
     my $subscriptionid = $query->param('subscriptionid');
-    my $subs = &GetSubscription($subscriptionid);
-    $auser = $subs->{'user'};
-    $librarian = $subs->{'librarian'};
-    $cost = $subs->{'cost'};
-    $aqbooksellerid = $subs->{'aqbooksellerid'};
-    $aqbooksellername = $subs->{'aqbooksellername'};
-    $bookfundid = $subs->{'bookfundid'};
-    $aqbudgetid = $subs->{'aqbudgetid'};
-    defined $aqbudgetid or $aqbudgetid='';
-    $startdate = $subs->{'startdate'};
-   $publisheddate = $subs->{'publisheddate'};
-    $periodicity = $subs->{'periodicity'};
-    $dow = $subs->{'dow'};
-        $irregularity = $subs->{'irregularity'};
-        $numberpattern = $subs->{'numberpattern'};
-    $numberlength = $subs->{'numberlength'};
-    $weeklength = $subs->{'weeklength'};
-    $monthlength = $subs->{'monthlength'};
-       if($monthlength > 0){
-           $sublength = $monthlength;
-           $sub_on = $subscription_types[2];
-       } elsif ($weeklength>0){
-           $sublength = $weeklength;
-           $sub_on = $subscription_types[1];
-       } else {
-           $sublength = $numberlength;
-           $sub_on = $subscription_types[0];
-       }
-        
+    $subs = GetSubscription($subscriptionid);
+## FIXME : Check rights to edit if mod. Could/Should display an error message.
+    if ($subs->{'cannotedit'} && $op eq 'modify'){
+      carp "Attempt to modify subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
+      print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
+    }
+    $firstissuedate = $subs->{firstacquidate};  # in iso format.
+    for (qw(startdate firstacquidate histstartdate enddate histenddate)) {
+        next unless defined $subs->{$_};
+       # TODO : Handle date formats properly.
+         if ($subs->{$_} eq '0000-00-00') {
+            $subs->{$_} = ''
+       } else {
+            $subs->{$_} = format_date($subs->{$_});
+        }
+         }
+      if (!defined $subs->{letter}) {
+          $subs->{letter}= q{};
+      }
+    letter_loop($subs->{'letter'}, $template);
+    $nextexpected = GetNextExpected($subscriptionid);
+    $nextexpected->{'isfirstissue'} = $nextexpected->{planneddate}->output('iso') eq $firstissuedate ;
+    $subs->{nextacquidate} = $nextexpected->{planneddate}->output()  if($op eq 'modify');
+    unless($op eq 'modsubscription') {
+               foreach my $length_unit qw(numberlength weeklength monthlength){
+                       if ($subs->{$length_unit}){
+                               $sub_length=$subs->{$length_unit};
+                               $sub_on=$length_unit;
+                               last;
+                       }
+               }
+
+        $template->param( %{$subs} );
+        $template->param("dow".$subs->{'dow'} => 1) if defined $subs->{'dow'};
+        $template->param(
+                    $op => 1,
+                    "subtype_$sub_on" => 1,
+                    sublength =>$sub_length,
+                    history => ($op eq 'modify'),
+                    "periodicity".$subs->{'periodicity'} => 1,
+                    "numberpattern".$subs->{'numberpattern'} => 1,
+                    firstacquiyear => substr($firstissuedate,0,4),
+                    );
+    }
+}
+
+my $onlymine=C4::Context->preference('IndependantBranches') &&
+             C4::Context->userenv &&
+             C4::Context->userenv->{flags} % 2 !=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 = 0;
+    $selected = 1 if (defined($subs) && $thisbranch eq $subs->{'branchcode'});
+    push @{$branchloop}, {
+        value => $thisbranch,
+        selected => $selected,
+        branchname => $branches->{$thisbranch}->{'branchname'},
+    };
+}
+
+my $locations_loop = GetAuthorisedValues("LOC",$subs->{'location'});
 
+$template->param(branchloop => $branchloop,
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+    locations_loop=>$locations_loop,
+);
+# prepare template variables common to all $op conditions:
+$template->param(  'dateformat_' . C4::Context->preference('dateformat') => 1 );
+if ($op!~/^mod/) {
+    letter_loop(q{}, $template);
+}
+
+if ($op eq 'addsubscription') {
+    redirect_add_subscription();
+} elsif ($op eq 'modsubscription') {
+    redirect_mod_subscription();
+} else {
         while (@subscription_types) {
            my $sub_type = shift @subscription_types;
            my %row = ( 'name' => $sub_type );
-           if ( $sub_on eq $sub_type ) {
+           if ( defined $sub_on and $sub_on eq $sub_type ) {
             $row{'selected'} = ' selected';
            } else {
             $row{'selected'} = '';
            }
            push( @sub_type_data, \%row );
         }
-    $add1 = $subs->{'add1'};
-    $every1 = $subs->{'every1'};
-    $whenmorethan1 = $subs->{'whenmorethan1'};
-    $setto1 = $subs->{'setto1'};
-    $lastvalue1 = $subs->{'lastvalue1'};
-    $innerloop1 = $subs->{'innerloop1'};
-    $add2 = $subs->{'add2'};
-    $every2 = $subs->{'every2'};
-    $whenmorethan2 = $subs->{'whenmorethan2'};
-    $setto2 = $subs->{'setto2'};
-    $lastvalue2 = $subs->{'lastvalue2'};
-    $innerloop2 = $subs->{'innerloop2'};
-    $add3 = $subs->{'add3'};
-    $every3 = $subs->{'every3'};
-    $whenmorethan3 = $subs->{'whenmorethan3'};
-    $setto3 = $subs->{'setto3'};
-    $lastvalue3 = $subs->{'lastvalue3'};
-    $innerloop3 = $subs->{'innerloop3'};
-    $numberingmethod = $subs->{'numberingmethod'};
-    $status = $subs->{status};
-    $biblionumber = $subs->{'biblionumber'};
-    $title = $subs->{'title'},
-           $callnumber = $subs->{'callnumber'};
-           $hemisphere = $subs->{'hemisphere'};
-    $notes = $subs->{'notes'};
-    $letter = $subs->{'letter'};
-    defined $letter or $letter='';
-    $template->param(
-        $op => 1,
-        user => $auser,
-        librarian => $librarian,
-        aqbooksellerid => $aqbooksellerid,
-        aqbooksellername => $aqbooksellername,
-        cost => $cost,
-        aqbudgetid => $aqbudgetid,
-        bookfundid => $bookfundid,
-        startdate => format_date($startdate),    
-         publisheddate => format_date($publisheddate),    
-        periodicity => $periodicity,
-        numberpattern=>$numberpattern,
-        dow => $dow,
-        numberlength => $numberlength,
-        weeklength => $weeklength,
-        monthlength => $monthlength,
-       sublength=>$sublength,
-        add1 => $add1,
-        every1 => $every1,
-        whenmorethan1 => $whenmorethan1,
-        setto1 => $setto1,
-        lastvalue1 => $lastvalue1,
-        innerloop1 => $innerloop1,
-        add2 => $add2,
-        every2 => $every2,
-        whenmorethan2 => $whenmorethan2,
-        setto2 => $setto2,
-        lastvalue2 => $lastvalue2,
-        innerloop2 => $innerloop2,
-        add3 => $add3,
-        every3 => $every3,
-        whenmorethan3 => $whenmorethan3,
-        setto3 => $setto3,
-        lastvalue3 => $lastvalue3,
-        innerloop3 => $innerloop3,
-        numberingmethod => $numberingmethod,
-        status => $status,
-        biblionumber => $biblionumber,
-        title => $title,
-               callnumber => $callnumber,
-        notes => $notes,
-        letter => $letter,
-        subscriptionid => $subscriptionid,
-        weekarrayjs => $weekarrayjs,
-               weekno => $weekno,
-               hemisphere => $hemisphere,
-        "periodicity$periodicity" => 1,
-        "dow$dow" => 1,
-        "numberpattern$numberpattern" => 1,
+    $template->param(subtype => \@sub_type_data);
+
+    letter_loop( '', $template ) if ($op ne 'modsubscription' && $op ne 'dup' && $op ne 'modify');
+
+    my $new_biblionumber = $query->param('biblionumber_for_new_subscription');
+    if (defined $new_biblionumber) {
+        my $bib = GetBiblioData($new_biblionumber);
+        if (defined $bib) {
+            $template->param(bibnum      => $new_biblionumber);
+            $template->param(bibliotitle => $bib->{title});
+        }
+    }
+       output_html_with_http_headers $query, $cookie, $template->output;
+}
+
+sub letter_loop {
+    my ($selected_letter, $templte) = @_;
+    my $letters = GetLetters('serial');
+    my $letterloop;
+    foreach my $thisletter (keys %{$letters}) {
+        push @{$letterloop}, {
+            value => $thisletter,
+            selected => $thisletter eq $selected_letter,
+            lettername => $letters->{$thisletter},
+        };
+    }
+    $templte->param(letterloop => $letterloop);
+    return;
+}
+
+sub _get_sub_length {
+    my ($type, $length) = @_;
+    return
+        (
+            $type eq 'numberlength' ? $length : 0,
+            $type eq 'weeklength'   ? $length : 0,
+            $type eq 'monthlength'  ? $length : 0,
         );
 }
 
-my @letterlist = GetLetterList('serial');
-for (my $i=0;$i<=$#letterlist;$i++) {
-    $letterlist[$i]->{'selected'} =1 if $letterlist[$i]->{'code'} eq $letter;
+sub redirect_add_subscription {
+    my $auser          = $query->param('user');
+    my $branchcode     = $query->param('branchcode');
+    my $aqbooksellerid = $query->param('aqbooksellerid');
+    my $cost           = $query->param('cost');
+    my $aqbudgetid     = $query->param('aqbudgetid');
+    my $periodicity    = $query->param('periodicity');
+    my $dow            = $query->param('dow');
+    my @irregularity   = $query->param('irregularity_select');
+    my $numberpattern  = $query->param('numbering_pattern');
+    my $graceperiod    = $query->param('graceperiod') || 0;
+
+    my ( $numberlength, $weeklength, $monthlength )
+        = _get_sub_length( $query->param('subtype'), $query->param('sublength') );
+    my $add1              = $query->param('add1');
+    my $every1            = $query->param('every1');
+    my $whenmorethan1     = $query->param('whenmorethan1');
+    my $setto1            = $query->param('setto1');
+    my $lastvalue1        = $query->param('lastvalue1');
+    my $innerloop1        = $query->param('innerloop1');
+    my $add2              = $query->param('add2');
+    my $every2            = $query->param('every2');
+    my $whenmorethan2     = $query->param('whenmorethan2');
+    my $setto2            = $query->param('setto2');
+    my $innerloop2        = $query->param('innerloop2');
+    my $lastvalue2        = $query->param('lastvalue2');
+    my $add3              = $query->param('add3');
+    my $every3            = $query->param('every3');
+    my $whenmorethan3     = $query->param('whenmorethan3');
+    my $setto3            = $query->param('setto3');
+    my $lastvalue3        = $query->param('lastvalue3');
+    my $innerloop3        = $query->param('innerloop3');
+    my $numberingmethod   = $query->param('numberingmethod');
+    my $status            = 1;
+    my $biblionumber      = $query->param('biblionumber');
+    my $callnumber        = $query->param('callnumber');
+    my $notes             = $query->param('notes');
+    my $internalnotes     = $query->param('internalnotes');
+    my $hemisphere        = $query->param('hemisphere') || 1;
+    my $letter            = $query->param('letter');
+    my $manualhistory     = $query->param('manualhist');
+    my $serialsadditems   = $query->param('serialsadditems');
+    my $staffdisplaycount = $query->param('staffdisplaycount');
+    my $opacdisplaycount  = $query->param('opacdisplaycount');
+    my $location          = $query->param('location');
+    my $startdate = format_date_in_iso( $query->param('startdate') );
+    my $enddate = format_date_in_iso( $query->param('enddate') );
+    my $firstacquidate  = format_date_in_iso($query->param('firstacquidate'));
+    my $histenddate = format_date_in_iso($query->param('histenddate'));
+    my $histstartdate = format_date_in_iso($query->param('histstartdate'));
+    my $recievedlist = $query->param('recievedlist');
+    my $missinglist = $query->param('missinglist');
+    my $opacnote = $query->param('opacnote');
+    my $librariannote = $query->param('librariannote');
+       my $subscriptionid = NewSubscription($auser,$branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
+                                       $startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
+                                       $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
+                                       $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
+                                       $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
+                                       $numberingmethod, $status, $notes,$letter,$firstacquidate,join(",",@irregularity),
+                    $numberpattern, $callnumber, $hemisphere,($manualhistory?$manualhistory:0),$internalnotes,
+                    $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate
+                               );
+    ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
+
+    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
+    return;
 }
-$template->param(letters => \@letterlist);
 
-if ($op eq 'addsubscription') {
-  my @irregular = $query->param('irregular');
-        my $irregular_count = @irregular;
-        for(my $i =0;$i<$irregular_count;$i++){
-            $irregularity .=$irregular[$i]."|";
-        }
-        $irregularity =~ s/\|$//;
-        
+sub redirect_mod_subscription {
+    my $subscriptionid = $query->param('subscriptionid');
+         my @irregularity = $query->param('irregularity_select');
     my $auser = $query->param('user');
-    my $aqbooksellerid = $query->param('aqbooksellerid');
+    my $librarian => $query->param('librarian'),
+    my $branchcode = $query->param('branchcode');
     my $cost = $query->param('cost');
+    my $aqbooksellerid = $query->param('aqbooksellerid');
+    my $biblionumber = $query->param('biblionumber');
     my $aqbudgetid = $query->param('aqbudgetid');
-    my $startdate = $query->param('startdate');
-     my $publisheddate = $query->param('publisheddate');
-    my $callnumber=$query->param('callnumber');          
+    my $startdate = format_date_in_iso($query->param('startdate'));
+    my $nextacquidate = $query->param('nextacquidate') ?
+                            format_date_in_iso($query->param('nextacquidate')):
+                            format_date_in_iso($query->param('startdate'));
+    my $enddate = format_date_in_iso($query->param('enddate'));
     my $periodicity = $query->param('periodicity');
     my $dow = $query->param('dow');
-       my $numberlength = 0;
-       my $weeklength = 0;
-       my $monthlength = 0;
-        my $numberpattern = $query->param('numbering_pattern');
-        my $sublength = $query->param('sublength');
-        my $subtype = $query->param('subtype');
-        if ($subtype eq 'months'){
-           $monthlength = $sublength;
-       } elsif ($subtype eq 'weeks'){
-           $weeklength = $sublength;
-       } else {
-           $numberlength = $sublength;
-       }
-
 
-       my $add1 = $query->param('add1');
-       my $every1 = $query->param('every1');
-       my $whenmorethan1 = $query->param('whenmorethan1');
-       my $setto1 = $query->param('setto1');
-       my $lastvalue1 = $query->param('lastvalue1');
-       my $add2 = $query->param('add2');
-       my $every2 = $query->param('every2');
-       my $whenmorethan2 = $query->param('whenmorethan2');
-       my $setto2 = $query->param('setto2');
-       my $lastvalue2 = $query->param('lastvalue2');
-       my $add3 = $query->param('add3');
-       my $every3 = $query->param('every3');
-       my $whenmorethan3 = $query->param('whenmorethan3');
-       my $setto3 = $query->param('setto3');
-       my $lastvalue3 = $query->param('lastvalue3');
-       my $numberingmethod = $query->param('numberingmethod');
-       my $status = 1;
-    my $biblionumber = $query->param('biblionumber');
+    my ($numberlength, $weeklength, $monthlength)
+        = _get_sub_length( $query->param('subtype'), $query->param('sublength') );
+    my $numberpattern = $query->param('numbering_pattern');
+    my $add1 = $query->param('add1');
+    my $every1 = $query->param('every1');
+    my $whenmorethan1 = $query->param('whenmorethan1');
+    my $setto1 = $query->param('setto1');
+    my $lastvalue1 = $query->param('lastvalue1');
+    my $innerloop1 = $query->param('innerloop1');
+    my $add2 = $query->param('add2');
+    my $every2 = $query->param('every2');
+    my $whenmorethan2 = $query->param('whenmorethan2');
+    my $setto2 = $query->param('setto2');
+    my $lastvalue2 = $query->param('lastvalue2');
+    my $innerloop2 = $query->param('innerloop2');
+    my $add3 = $query->param('add3');
+    my $every3 = $query->param('every3');
+    my $whenmorethan3 = $query->param('whenmorethan3');
+    my $setto3 = $query->param('setto3');
+    my $lastvalue3 = $query->param('lastvalue3');
+    my $innerloop3 = $query->param('innerloop3');
+    my $numberingmethod = $query->param('numberingmethod');
+    my $status = 1;
+    my $callnumber = $query->param('callnumber');
     my $notes = $query->param('notes');
+    my $internalnotes = $query->param('internalnotes');
+    my $hemisphere = $query->param('hemisphere');
     my $letter = $query->param('letter');
-            my $hemisphere = $query->param('hemisphere') || 1;
+    my $manualhistory = $query->param('manualhist');
+    my $serialsadditems = $query->param('serialsadditems');
+    # subscription history
+    my $histenddate = format_date_in_iso($query->param('histenddate'));
+    my $histstartdate = format_date_in_iso($query->param('histstartdate'));
+    my $recievedlist = $query->param('recievedlist');
+    my $missinglist = $query->param('missinglist');
+    my $opacnote = $query->param('opacnote');
+    my $librariannote = $query->param('librariannote');
+       my $staffdisplaycount = $query->param('staffdisplaycount');
+       my $opacdisplaycount = $query->param('opacdisplaycount');
+    my $graceperiod     = $query->param('graceperiod') || 0;
+    my $location = $query->param('location');
+       #  If it's  a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
+    if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
+        ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso'));
+        # if we have not received any issues yet, then we also must change the firstacquidate for the subs.
+        $firstissuedate = $nextacquidate if($nextexpected->{isfirstissue});
+    }
 
-    my $subscriptionid = NewSubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
-                    $startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
-                    $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
-                    $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
-                    $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
-                    $numberingmethod, $status, $notes, $letter,$irregularity,$hemisphere,$callnumber,$numberpattern,$publisheddate    );
+        ModSubscription(
+            $auser,           $branchcode,   $aqbooksellerid, $cost,
+            $aqbudgetid,      $startdate,    $periodicity,    $firstissuedate,
+            $dow,             join(q{,},@irregularity), $numberpattern,  $numberlength,
+            $weeklength,      $monthlength,  $add1,           $every1,
+            $whenmorethan1,   $setto1,       $lastvalue1,     $innerloop1,
+            $add2,            $every2,       $whenmorethan2,  $setto2,
+            $lastvalue2,      $innerloop2,   $add3,           $every3,
+            $whenmorethan3,   $setto3,       $lastvalue3,     $innerloop3,
+            $numberingmethod, $status,       $biblionumber,   $callnumber,
+            $notes,           $letter,       $hemisphere,     $manualhistory,$internalnotes,
+            $serialsadditems, $staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$subscriptionid
+        );
+        ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
     print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
-} else {
-     while (@subscription_types) {
-           my $sub_type = shift @subscription_types;
-           my %row = ( 'name' => $sub_type );
-           if ( $sub_on eq $sub_type ) {
-            $row{'selected'} = ' selected';
-           } else {
-            $row{'selected'} = '';
-           }
-           push( @sub_type_data, \%row );
-        }    
-    $template->param(subtype => \@sub_type_data,
-                weekarrayjs => $weekarrayjs,
-                weekno => $weekno,
-       );
-    output_html_with_http_headers $query, $cookie, $template->output;
+    return;
 }