[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:36:47

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

Log message:
        Bug FIXING :
        manualhistory wouldnot be passed if unchecked.
        Duplicating subscription without copying subscription history.

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

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -b -r1.3.2.6 -r1.3.2.7
--- koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl       17 Nov 
2006 10:53:03 -0000      1.3.2.6
+++ koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl       27 Nov 
2006 13:36:46 -0000      1.3.2.7
@@ -805,7 +805,7 @@
                     <option value="11">1/2 years</option>
                 <!-- /TMPL_IF -->
                 </select>
-                Manual History :<input type="checkbox" name="manualhist" 
value="0" />
+                Manual History :<input type="checkbox" name="manualhist" 
value="1" />
             </td>
         </tr>
         <tr>

Index: serials/subscription-add.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/subscription-add.pl,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -b -r1.6.2.8 -r1.6.2.9
--- serials/subscription-add.pl 27 Nov 2006 13:07:32 -0000      1.6.2.8
+++ serials/subscription-add.pl 27 Nov 2006 13:36:46 -0000      1.6.2.9
@@ -109,7 +109,8 @@
     $template->param(
             $op => 1,
             subtype => address@hidden,
-            history => 
($subs->{recievedlist}||$subs->{missinglist}||$subs->{opacnote}||$subs->{librariannote})
+            sublength =>$sublength,
+            history => ($op eq 'mod' && 
($subs->{recievedlist}||$subs->{missinglist}||$subs->{opacnote}||$subs->{librariannote}))
             );
     $template->param(
                 "periodicity".$subs->{'periodicity'} => 1,
@@ -205,7 +206,7 @@
                                        
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
                                        
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
                                        $numberingmethod, $status, 
$notes,$letter,$firstacquidate,$irregularity,
-                    $numberpattern, $callnumber, $hemisphere,$manualhistory
+                    $numberpattern, $callnumber, 
$hemisphere,($manualhistory?$manualhistory:0)
                                );
 
     print 
$query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");