gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
tipaul 2006-05-12 08:36:05 +00:00
parent a31bb5a24e
commit 0d6cc3dbcc
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bull/subscription-add.pl
View File

@ -149,25 +149,28 @@ if ($op eq 'addsubscription') {
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");

18
koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl
View File

@ -161,20 +161,22 @@
<td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
<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>

15
koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
View File

@ -117,14 +117,17 @@
<td><!-- TMPL_VAR name="every2" --></td>
<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>