View | Details | Raw Unified | Return to bug 24083
Collapse All | Expand All

(-)a/admin/smart-rules.pl (+2 lines)
Lines 230-235 elsif ($op eq 'add') { Link Here
230
    my $maxissueqty  = $input->param('maxissueqty');
230
    my $maxissueqty  = $input->param('maxissueqty');
231
    my $maxonsiteissueqty  = $input->param('maxonsiteissueqty');
231
    my $maxonsiteissueqty  = $input->param('maxonsiteissueqty');
232
    my $renewalsallowed  = $input->param('renewalsallowed');
232
    my $renewalsallowed  = $input->param('renewalsallowed');
233
    my $unseen_renewals_allowed  = $input->param('unseen_renewals_allowed');
233
    my $renewalperiod    = $input->param('renewalperiod');
234
    my $renewalperiod    = $input->param('renewalperiod');
234
    my $norenewalbefore  = $input->param('norenewalbefore');
235
    my $norenewalbefore  = $input->param('norenewalbefore');
235
    $norenewalbefore = undef if $norenewalbefore =~ /^\s*$/;
236
    $norenewalbefore = undef if $norenewalbefore =~ /^\s*$/;
Lines 276-281 elsif ($op eq 'add') { Link Here
276
        chargeperiod                  => $chargeperiod,
277
        chargeperiod                  => $chargeperiod,
277
        chargeperiod_charge_at        => $chargeperiod_charge_at,
278
        chargeperiod_charge_at        => $chargeperiod_charge_at,
278
        renewalsallowed               => $renewalsallowed,
279
        renewalsallowed               => $renewalsallowed,
280
        unseen_renewals_allowed       => $unseen_renewals_allowed,
279
        renewalperiod                 => $renewalperiod,
281
        renewalperiod                 => $renewalperiod,
280
        norenewalbefore               => $norenewalbefore,
282
        norenewalbefore               => $norenewalbefore,
281
        auto_renew                    => $auto_renew,
283
        auto_renew                    => $auto_renew,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-1 / +8 lines)
Lines 96-101 Link Here
96
                <th>Max. suspension duration (day)</th>
96
                <th>Max. suspension duration (day)</th>
97
                <th>Suspension charging interval</th>
97
                <th>Suspension charging interval</th>
98
                <th>Renewals allowed (count)</th>
98
                <th>Renewals allowed (count)</th>
99
                [% IF Koha.Preference('UnseenRenewals') %]
100
                <th>Unseen renewals allowed (count)</th>
101
                [% END %]
99
                <th>Renewal period</th>
102
                <th>Renewal period</th>
100
                <th>No renewal before</th>
103
                <th>No renewal before</th>
101
                <th>Automatic renewal</th>
104
                <th>Automatic renewal</th>
Lines 200-205 Link Here
200
                            <td>[% rule.maxsuspensiondays | html %]</td>
203
                            <td>[% rule.maxsuspensiondays | html %]</td>
201
                            <td>[% rule.suspension_chargeperiod | html %]</td>
204
                            <td>[% rule.suspension_chargeperiod | html %]</td>
202
							<td>[% rule.renewalsallowed | html %]</td>
205
							<td>[% rule.renewalsallowed | html %]</td>
206
                            [% IF Koha.Preference('UnseenRenewals') %]
207
                            <td>[% rule.unseen_renewals_allowed | html %]</td>
208
                            [% END %]
203
                            <td>[% rule.renewalperiod | html %]</td>
209
                            <td>[% rule.renewalperiod | html %]</td>
204
                            <td>[% rule.norenewalbefore | html %]</td>
210
                            <td>[% rule.norenewalbefore | html %]</td>
205
                            <td>
211
                            <td>
Lines 312-317 Link Here
312
                    <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>
318
                    <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>
313
                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>
319
                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>
314
                    <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>
320
                    <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>
321
                    <td><input type="text" name="unseen_renewals_allowed" id="unseen_renewals_allowed" size="2" /></td>
315
                    <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
322
                    <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
316
                    <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
323
                    <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
317
                    <td>
324
                    <td>
Lines 378-383 Link Here
378
                      <th>Max. suspension duration (day)</th>
385
                      <th>Max. suspension duration (day)</th>
379
                      <th>Suspension charging interval</th>
386
                      <th>Suspension charging interval</th>
380
                      <th>Renewals allowed (count)</th>
387
                      <th>Renewals allowed (count)</th>
388
                      <th>Unseen renewals allowed (count)</th>
381
                      <th>Renewal period</th>
389
                      <th>Renewal period</th>
382
                      <th>No renewal before</th>
390
                      <th>No renewal before</th>
383
                      <th>Automatic renewal</th>
391
                      <th>Automatic renewal</th>
384
- 

Return to bug 24083