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

(-)a/admin/smart-rules.pl (+2 lines)
Lines 260-265 elsif ($op eq 'add') { Link Here
260
    my $maxissueqty = strip_non_numeric( scalar $input->param('maxissueqty') );
260
    my $maxissueqty = strip_non_numeric( scalar $input->param('maxissueqty') );
261
    my $maxonsiteissueqty = strip_non_numeric( scalar $input->param('maxonsiteissueqty') );
261
    my $maxonsiteissueqty = strip_non_numeric( scalar $input->param('maxonsiteissueqty') );
262
    my $renewalsallowed  = $input->param('renewalsallowed');
262
    my $renewalsallowed  = $input->param('renewalsallowed');
263
    my $unseen_renewals_allowed  = $input->param('unseen_renewals_allowed');
263
    my $renewalperiod    = $input->param('renewalperiod');
264
    my $renewalperiod    = $input->param('renewalperiod');
264
    my $norenewalbefore  = $input->param('norenewalbefore');
265
    my $norenewalbefore  = $input->param('norenewalbefore');
265
    $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
266
    $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
Lines 306-311 elsif ($op eq 'add') { Link Here
306
        hardduedate                   => $hardduedate,
307
        hardduedate                   => $hardduedate,
307
        hardduedatecompare            => $hardduedatecompare,
308
        hardduedatecompare            => $hardduedatecompare,
308
        renewalsallowed               => $renewalsallowed,
309
        renewalsallowed               => $renewalsallowed,
310
        unseen_renewals_allowed       => $unseen_renewals_allowed,
309
        renewalperiod                 => $renewalperiod,
311
        renewalperiod                 => $renewalperiod,
310
        norenewalbefore               => $norenewalbefore,
312
        norenewalbefore               => $norenewalbefore,
311
        auto_renew                    => $auto_renew,
313
        auto_renew                    => $auto_renew,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-2 / +12 lines)
Lines 112-117 Link Here
112
                <th>Max. suspension duration (day)</th>
112
                <th>Max. suspension duration (day)</th>
113
                <th>Suspension charging interval</th>
113
                <th>Suspension charging interval</th>
114
                <th>Renewals allowed (count)</th>
114
                <th>Renewals allowed (count)</th>
115
                [% IF Koha.Preference('UnseenRenewals') %]
116
                <th>Unseen renewals allowed (count)</th>
117
                [% END %]
115
                <th>Renewal period</th>
118
                <th>Renewal period</th>
116
                <th>No renewal before</th>
119
                <th>No renewal before</th>
117
                <th>Automatic renewal</th>
120
                <th>Automatic renewal</th>
Lines 151-156 Link Here
151
                        [% SET maxsuspensiondays = all_rules.$c.$i.maxsuspensiondays %]
154
                        [% SET maxsuspensiondays = all_rules.$c.$i.maxsuspensiondays %]
152
                        [% SET suspension_chargeperiod = all_rules.$c.$i.suspension_chargeperiod %]
155
                        [% SET suspension_chargeperiod = all_rules.$c.$i.suspension_chargeperiod %]
153
                        [% SET renewalsallowed = all_rules.$c.$i.renewalsallowed %]
156
                        [% SET renewalsallowed = all_rules.$c.$i.renewalsallowed %]
157
                        [% SET unseenrenewalsallowed = all_rules.$c.$i.unseen_renewals_allowed %]
154
                        [% SET renewalperiod = all_rules.$c.$i.renewalperiod %]
158
                        [% SET renewalperiod = all_rules.$c.$i.renewalperiod %]
155
                        [% SET norenewalbefore = all_rules.$c.$i.norenewalbefore %]
159
                        [% SET norenewalbefore = all_rules.$c.$i.norenewalbefore %]
156
                        [% SET auto_renew = all_rules.$c.$i.auto_renew %]
160
                        [% SET auto_renew = all_rules.$c.$i.auto_renew %]
Lines 164-170 Link Here
164
                        [% SET article_requests = all_rules.$c.$i.article_requests %]
168
                        [% SET article_requests = all_rules.$c.$i.article_requests %]
165
                        [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]
169
                        [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]
166
170
167
                        [% SET show_rule = note || maxissueqty || maxonsiteissueqty || issuelength || daysmode || lengthunit || hardduedate || hardduedatecompare || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || renewalperiod || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || rentaldiscount %]
171
                        [% SET show_rule = note || maxissueqty || maxonsiteissueqty || issuelength || daysmode || lengthunit || hardduedate || hardduedatecompare || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || unseenrenewalsallowed || renewalperiod || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || rentaldiscount %]
168
                        [% IF show_rule %]
172
                        [% IF show_rule %]
169
                            [% SET row_count = row_count + 1 %]
173
                            [% SET row_count = row_count + 1 %]
170
                            <tr row_countd="row_[% row_count | html %]">
174
                            <tr row_countd="row_[% row_count | html %]">
Lines 258-263 Link Here
258
                                    <td>[% maxsuspensiondays | html %]</td>
262
                                    <td>[% maxsuspensiondays | html %]</td>
259
                                    <td>[% suspension_chargeperiod | html %]</td>
263
                                    <td>[% suspension_chargeperiod | html %]</td>
260
                                    <td>[% renewalsallowed | html %]</td>
264
                                    <td>[% renewalsallowed | html %]</td>
265
                                    [% IF Koha.Preference('UnseenRenewals') %]
266
                                        <td>[% unseenrenewalsallowed | html %]</td>
267
                                    [% END %]
261
                                    <td>[% renewalperiod | html %]</td>
268
                                    <td>[% renewalperiod | html %]</td>
262
                                    <td>[% norenewalbefore | html %]</td>
269
                                    <td>[% norenewalbefore | html %]</td>
263
                                    <td>
270
                                    <td>
Lines 406-411 Link Here
406
                    <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>
413
                    <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>
407
                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>
414
                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>
408
                    <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>
415
                    <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>
416
                    <td><input type="text" name="unseen_renewals_allowed" id="unseen_renewals_allowed" size="2" /></td>
409
                    <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
417
                    <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
410
                    <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
418
                    <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
411
                    <td>
419
                    <td>
Lines 475-480 Link Here
475
                      <th>Max. suspension duration (day)</th>
483
                      <th>Max. suspension duration (day)</th>
476
                      <th>Suspension charging interval</th>
484
                      <th>Suspension charging interval</th>
477
                      <th>Renewals allowed (count)</th>
485
                      <th>Renewals allowed (count)</th>
486
                      [% IF Koha.Preference('UnseenRenewals') %]
487
                      <th>Unseen renewals allowed (count)</th>
488
                      [% END %]
478
                      <th>Renewal period</th>
489
                      <th>Renewal period</th>
479
                      <th>No renewal before</th>
490
                      <th>No renewal before</th>
480
                      <th>Automatic renewal</th>
491
                      <th>Automatic renewal</th>
481
- 

Return to bug 24083