[Koha-cvs] koha bull/subscription-add.pl koha-tmpl/intrane... [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <address@hidden>   06/05/12 08:36:05

Modified files:
        bull           : subscription-add.pl 
        koha-tmpl/intranet-tmpl/default/en/bull: subscription-add.tmpl 
                                                 subscription-detail.tmpl 

Log message:
        adding the starting period even when adding a subscription : it fixes 
bug 1059 :
        Subscriptions must be entered in as Vol X No. 1 or issue calculation is 
incorrect
        
        - doc updated on the wiki
        - JOSHUA / KADOS / OWEN / KYLE: be carefull your templates have to be 
modified

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/bull/subscription-add.pl.diff?only_with_tag=rel_2_2&tr1=1.5.2.3&tr2=1.5.2.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl.diff?only_with_tag=rel_2_2&tr1=1.8.2.1&tr2=1.8.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl.diff?only_with_tag=rel_2_2&tr1=1.6.2.6&tr2=1.6.2.7&r1=text&r2=text

Patches:
Index: koha/bull/subscription-add.pl
diff -u koha/bull/subscription-add.pl:1.5.2.3 
koha/bull/subscription-add.pl:1.5.2.4
--- koha/bull/subscription-add.pl:1.5.2.3       Sun Feb  5 21:59:21 2006
+++ koha/bull/subscription-add.pl       Fri May 12 08:36:05 2006
@@ -149,25 +149,28 @@
        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 $biblionumber = $query->param('biblionumber');
        my $notes = $query->param('notes');
        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,
+                                       
$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
+                                       
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
+                                       
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
                                        $numberingmethod, $status, $notes
                                );
        print 
$query->redirect("/cgi-bin/koha/bull/subscription-detail.pl?subscriptionid=$subscriptionid");
Index: koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl
diff -u 
koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:1.8.2.1 
koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:1.8.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:1.8.2.1  
Fri Mar 25 16:48:33 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl  Fri May 
12 08:36:05 2006
@@ -162,19 +162,21 @@
                                <td><input type="text" name="every3" 
value="<!-- TMPL_VAR name="every3" -->"></td>
                        </tr>
                        <tr>
+                               <!-- TMPL_IF name="mod" -->
+                                       <td class="bull">The loop is for 
instance</td>
+                               <!-- TMPL_ELSE -->
+                                       <td class="bull">Starting period</td>
+                               <!-- /TMPL_IF -->
+                               <td><input type="text" name="innerloop1" 
value="<!-- TMPL_VAR name="innerloop1" -->"></td>
+                               <td><input type="text" name="innerloop2" 
value="<!-- TMPL_VAR name="innerloop2" -->"></td>
+                               <td><input type="text" name="innerloop3" 
value="<!-- TMPL_VAR name="innerloop3" -->"></td>
+                       </tr>
+                       <tr>
                                <td class="bull">When more than</td>
                                <td><input type="text" name="whenmorethan1" 
value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
                                <td><input type="text" name="whenmorethan2" 
value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
                                <td><input type="text" name="whenmorethan3" 
value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
                        </tr>
-                       <!-- TMPL_IF name="mod" -->
-                       <tr>
-                               <td class="bull">The loop is for instance</td>
-                               <td><input type="text" name="innerloop1" 
value="<!-- TMPL_VAR name="innerloop1" -->"></td>
-                               <td><input type="text" name="innerloop2" 
value="<!-- TMPL_VAR name="innerloop2" -->"></td>
-                               <td><input type="text" name="innerloop3" 
value="<!-- TMPL_VAR name="innerloop3" -->"></td>
-                       </tr>
-                       <!-- /TMPL_IF -->
                        <tr>
                                <td class="bull">Set back to</td>
                                <td><input type="text" name="setto1" 
value="<!-- TMPL_VAR name="setto1" -->"></td>
Index: koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
diff -u 
koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:1.6.2.6 
koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:1.6.2.7
--- 
koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:1.6.2.6   
    Fri Sep  9 10:11:38 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl       
Fri May 12 08:36:05 2006
@@ -118,13 +118,16 @@
                                <td><!-- TMPL_VAR name="every3" --></td>
                        </tr>
                        <tr>
+                               <td class="bull">Starting period</td>
+                               <td><!-- TMPL_IF name="innerloop1" --><!-- 
TMPL_VAR name="innerloop1" --><!-- /TMPL_IF --></td>
+                               <td><!-- TMPL_IF name="innerloop2" --><!-- 
TMPL_VAR name="innerloop2" --><!-- /TMPL_IF --></td>
+                               <td><!-- TMPL_IF name="innerloop3" --><!-- 
TMPL_VAR name="innerloop3" --><!-- /TMPL_IF --></td>
+                       </tr>
+                       <tr>
                                <td class="bull">When more than</td>
-                               <td><!-- TMPL_VAR name="whenmorethan1" --> <!-- 
TMPL_IF name="innerloop1" --><br/>
-                                       <i>(is <!-- TMPL_VAR name="innerloop1" 
-->)</i><!-- /TMPL_IF --></td>
-                               <td><!-- TMPL_VAR name="whenmorethan2" --> <!-- 
TMPL_IF name="innerloop2" --><br/>
-                                       <i>(is <!-- TMPL_VAR name="innerloop2" 
-->)</i><!-- /TMPL_IF --></td>
-                               <td><!-- TMPL_VAR name="whenmorethan3" --> <!-- 
TMPL_IF name="innerloop3" --><br/>
-                                       <i>(is <!-- TMPL_VAR name="innerloop3" 
-->)</i><!-- /TMPL_IF --></td>
+                               <td><!-- TMPL_VAR name="whenmorethan1" --></td>
+                               <td><!-- TMPL_VAR name="whenmorethan2" --></td>
+                               <td><!-- TMPL_VAR name="whenmorethan3" --></td>
                        </tr>
                        <tr>
                                <td class="bull">Set back to</td>