X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Fsubscription-detail.pl;h=aa3179d01220824eacd7724e8e2201bec92dcb13;hb=537880591a051fbece62e355c0f13caef6993662;hp=94242ec9e23489d7e23ac226324329c5f80f0bf5;hpb=fa4cead90956d3a8ebf0da470176663fbc5dc1d7;p=koha.git

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 94242ec9e2..aa3179d012 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -64,24 +64,6 @@ my ($user, $sessionID, $flags);
 ($user, $cookie, $sessionID, $flags)
     = checkauth($query, 0, {catalogue => 1}, "intranet");
 
-my $weekarrayjs='';
-my $count = 0;
-my ($year, $month, $day) = Today;
-my $firstday = Day_of_Year($year,$month,$day);
-my ($wkno,$yr) = Week_of_Year($year,$month,$day); # week starting monday
-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 ($y,$m,$d) =  Add_Delta_Days($year,1,1, $count - 1);#Date_NthDayOfYear($year,$count);
-            # padding Add_Delta_Days;
-            my $output  = sprintf("%04d-%02d-%02d",$y , $m, $d );
-            $weekarrayjs .= "'Wk $wkno: ".format_date($output)."',";
-            $wkno++;
-    }
-chop($weekarrayjs);
-
 # COMMENT hdl : IMHO, we should think about passing more and more data hash to template->param rather than duplicating code a new coding Guideline ?
 
 $subs->{startdate}      = format_date($subs->{startdate});
@@ -90,14 +72,9 @@ $subs->{histstartdate}  = format_date($subs->{histstartdate});
 $subs->{enddate}        = format_date($subs->{enddate});
 $subs->{histenddate}    = format_date($subs->{histenddate});
 $subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
-# Done in Serials.pm
-# $subs->{'donotedit'}=(C4::Context->preference('IndependantBranches') && 
-#         C4::Context->userenv && 
-#         C4::Context->userenv->{flags} !=1  && 
-#         C4::Context->userenv->{branch} && $subs->{branchcode} &&
-#         (C4::Context->userenv->{branch} ne $subs->{branchcode}));
 
 $template->param($subs);
+$template->param(biblionumber_for_new_subscription => $subs->{bibnum});
 
 $template->param(
 	subscriptionid => $subscriptionid,
@@ -105,13 +82,17 @@ $template->param(
     serialslist => \@serialslist,
     totalissues => $totalissues,
     hemisphere => $hemisphere,
+    cannotedit =>(C4::Context->preference('IndependantBranches') && 
+                C4::Context->userenv && 
+                C4::Context->userenv->{flags} % 2 !=1  && 
+                C4::Context->userenv->{branch} && $subs->{branchcode} &&
+                (C4::Context->userenv->{branch} ne $subs->{branchcode})),
+    "periodicity".($subs->{periodicity}?$subs->{periodicity}:'0') => 1,
+    "arrival".$subs->{dow} => 1,
+    "numberpattern".$subs->{numberpattern} => 1,
+    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+    intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), 
+    irregular_issues => scalar(split(/,/,$subs->{irregularity})),
     );
-$template->param(
-            "periodicity".($subs->{periodicity}?$subs->{periodicity}:'0') => 1,
-            "arrival".$subs->{dow} => 1,
-            "numberpattern".$subs->{numberpattern} => 1,
-            intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-            intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), 
-            );
 
 output_html_with_http_headers $query, $cookie, $template->output;