[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/serials/su... [rel_3_0]

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Henri-Damien LAURENT <hdl>      06/11/27 13:07:32

Modified files:
        koha-tmpl/intranet-tmpl/prog/en/serials: 
                                                 subscription-detail.tmpl 
        serials        : subscription-add.pl 

Log message:
        adding Duplicate subscription.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.8&r2=1.3.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/serials/subscription-add.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.7&r2=1.6.2.8

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl,v
retrieving revision 1.3.2.8
retrieving revision 1.3.2.9
diff -u -b -r1.3.2.8 -r1.3.2.9
--- koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl    23 Nov 
2006 15:18:30 -0000      1.3.2.8
+++ koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl    27 Nov 
2006 13:07:32 -0000      1.3.2.9
@@ -137,6 +137,7 @@
     <h1>Subscription</h1>
     <div id="action">
         <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->">Edit</a>
+        <a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->">Duplicate Subscription</a>
         <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->&amp;serstatus=1">Receive</a>
         <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- 
TMPL_VAR name="biblionumber" -->">Biblio</a>
         <a href="/cgi-bin/koha/serials/serials-collection.pl?biblionumber=<!-- 
TMPL_VAR name="biblionumber" -->">Serial issues</a>

Index: serials/subscription-add.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/subscription-add.pl,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -u -b -r1.6.2.7 -r1.6.2.8
--- serials/subscription-add.pl 21 Nov 2006 10:45:54 -0000      1.6.2.7
+++ serials/subscription-add.pl 27 Nov 2006 13:07:32 -0000      1.6.2.8
@@ -74,7 +74,7 @@
             'issues', 'weeks', 'months'
         ); 
 my @sub_type_data;
-if ($op eq 'mod') {
+if ($op eq 'mod'||$op eq 'dup') {
     my $subscriptionid = $query->param('subscriptionid');
 #     warn "irregularity :$irregularity numberpattern : $numberpattern, 
callnumber :$callnumber, firstacquidate :$firstacquidate";
     my $subs = &GetSubscription($subscriptionid);
@@ -84,15 +84,15 @@
     $subs->{'enddate'}=format_date($subs->{enddate});
     $subs->{'letter'}='' unless($subs->{'letter'});
 
-    if($monthlength > 0){
-        $sublength = $monthlength;
-        $sub_on = $subscription_types[2];
-    } elsif ($weeklength>0){
+    if($subs->{numberlength} > 0){
+        $sublength = $subs->{numberlength};
+        $sub_on = $subscription_types[0];
+    } elsif ($subs->{weeklength}>0){
         $sublength = $weeklength;
         $sub_on = $subscription_types[1];
     } else {
-        $sublength = $numberlength;
-        $sub_on = $subscription_types[0];
+        $sublength = $subs->{monthlength};
+        $sub_on = $subscription_types[2];
     }
     while (@subscription_types) {
         my $sub_type = shift @subscription_types;