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

(-)a/admin/smart-rules.pl (+2 lines)
Lines 264-269 elsif ($op eq 'add') { Link Here
264
    my $maxissueqty  = $input->param('maxissueqty');
264
    my $maxissueqty  = $input->param('maxissueqty');
265
    my $maxonsiteissueqty  = $input->param('maxonsiteissueqty');
265
    my $maxonsiteissueqty  = $input->param('maxonsiteissueqty');
266
    my $renewalsallowed  = $input->param('renewalsallowed');
266
    my $renewalsallowed  = $input->param('renewalsallowed');
267
    my $unseen_renewals_allowed  = $input->param('unseen_renewals_allowed');
267
    my $renewalperiod    = $input->param('renewalperiod');
268
    my $renewalperiod    = $input->param('renewalperiod');
268
    my $norenewalbefore  = $input->param('norenewalbefore');
269
    my $norenewalbefore  = $input->param('norenewalbefore');
269
    $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
270
    $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
Lines 314-319 elsif ($op eq 'add') { Link Here
314
        hardduedate                   => $hardduedate,
315
        hardduedate                   => $hardduedate,
315
        hardduedatecompare            => $hardduedatecompare,
316
        hardduedatecompare            => $hardduedatecompare,
316
        renewalsallowed               => $renewalsallowed,
317
        renewalsallowed               => $renewalsallowed,
318
        unseen_renewals_allowed       => $unseen_renewals_allowed,
317
        renewalperiod                 => $renewalperiod,
319
        renewalperiod                 => $renewalperiod,
318
        norenewalbefore               => $norenewalbefore,
320
        norenewalbefore               => $norenewalbefore,
319
        auto_renew                    => $auto_renew,
321
        auto_renew                    => $auto_renew,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-2 / +12 lines)
Lines 105-110 Link Here
105
                <th>Max. suspension duration (day)</th>
105
                <th>Max. suspension duration (day)</th>
106
                <th>Suspension charging interval</th>
106
                <th>Suspension charging interval</th>
107
                <th>Renewals allowed (count)</th>
107
                <th>Renewals allowed (count)</th>
108
                [% IF Koha.Preference('UnseenRenewals') %]
109
                <th>Unseen renewals allowed (count)</th>
110
                [% END %]
108
                <th>Renewal period</th>
111
                <th>Renewal period</th>
109
                <th>No renewal before</th>
112
                <th>No renewal before</th>
110
                <th>Automatic renewal</th>
113
                <th>Automatic renewal</th>
Lines 141-146 Link Here
141
                        [% SET maxsuspensiondays = CirculationRules.Search( branchcode, c, i, 'maxsuspensiondays' ) %]
144
                        [% SET maxsuspensiondays = CirculationRules.Search( branchcode, c, i, 'maxsuspensiondays' ) %]
142
                        [% SET suspension_chargeperiod = CirculationRules.Search( branchcode, c, i, 'suspension_chargeperiod' ) %]
145
                        [% SET suspension_chargeperiod = CirculationRules.Search( branchcode, c, i, 'suspension_chargeperiod' ) %]
143
                        [% SET renewalsallowed = CirculationRules.Search( branchcode, c, i, 'renewalsallowed' ) %]
146
                        [% SET renewalsallowed = CirculationRules.Search( branchcode, c, i, 'renewalsallowed' ) %]
147
                        [% SET unseenrenewalsallowed = CirculationRules.Search( branchcode, c, i, 'unseen_renewals_allowed' ) %]
144
                        [% SET renewalperiod = CirculationRules.Search( branchcode, c, i, 'renewalperiod' ) %]
148
                        [% SET renewalperiod = CirculationRules.Search( branchcode, c, i, 'renewalperiod' ) %]
145
                        [% SET norenewalbefore = CirculationRules.Search( branchcode, c, i, 'norenewalbefore' ) %]
149
                        [% SET norenewalbefore = CirculationRules.Search( branchcode, c, i, 'norenewalbefore' ) %]
146
                        [% SET auto_renew = CirculationRules.Search( branchcode, c, i, 'auto_renew' ) %]
150
                        [% SET auto_renew = CirculationRules.Search( branchcode, c, i, 'auto_renew' ) %]
Lines 154-160 Link Here
154
                        [% SET article_requests = CirculationRules.Search( branchcode, c, i, 'article_requests' ) %]
158
                        [% SET article_requests = CirculationRules.Search( branchcode, c, i, 'article_requests' ) %]
155
                        [% SET rentaldiscount = CirculationRules.Search( branchcode, c, i, 'rentaldiscount' ) %]
159
                        [% SET rentaldiscount = CirculationRules.Search( branchcode, c, i, 'rentaldiscount' ) %]
156
160
157
                        [% SET show_rule = maxissueqty || maxonsiteissueqty || issuelength || lengthunit || hardduedate || hardduedatebefore || hardduedateexact || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || renewalsallowed || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || article_requests %]
161
                        [% SET show_rule = maxissueqty || maxonsiteissueqty || issuelength || lengthunit || hardduedate || hardduedatebefore || hardduedateexact || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || unseenrenewalsallowed || renewalsallowed || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || article_requests %]
158
                        [% IF show_rule %]
162
                        [% IF show_rule %]
159
                            [% SET row_count = row_count + 1 %]
163
                            [% SET row_count = row_count + 1 %]
160
                            <tr row_countd="row_[% row_count | html %]">
164
                            <tr row_countd="row_[% row_count | html %]">
Lines 237-242 Link Here
237
                                    <td>[% maxsuspensiondays | html %]</td>
241
                                    <td>[% maxsuspensiondays | html %]</td>
238
                                    <td>[% suspension_chargeperiod | html %]</td>
242
                                    <td>[% suspension_chargeperiod | html %]</td>
239
                                    <td>[% renewalsallowed | html %]</td>
243
                                    <td>[% renewalsallowed | html %]</td>
244
                                    [% IF Koha.Preference('UnseenRenewals') %]
245
                                        <td>[% unseenrenewalsallowed | html %]</td>
246
                                    [% END %]
240
                                    <td>[% renewalperiod | html %]</td>
247
                                    <td>[% renewalperiod | html %]</td>
241
                                    <td>[% norenewalbefore | html %]</td>
248
                                    <td>[% norenewalbefore | html %]</td>
242
                                    <td>
249
                                    <td>
Lines 357-362 Link Here
357
                    <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>
364
                    <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>
358
                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>
365
                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>
359
                    <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>
366
                    <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>
367
                    <td><input type="text" name="unseen_renewals_allowed" id="unseen_renewals_allowed" size="2" /></td>
360
                    <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
368
                    <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
361
                    <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
369
                    <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
362
                    <td>
370
                    <td>
Lines 423-428 Link Here
423
                      <th>Max. suspension duration (day)</th>
431
                      <th>Max. suspension duration (day)</th>
424
                      <th>Suspension charging interval</th>
432
                      <th>Suspension charging interval</th>
425
                      <th>Renewals allowed (count)</th>
433
                      <th>Renewals allowed (count)</th>
434
                      [% IF Koha.Preference('UnseenRenewals') %]
435
                      <th>Unseen renewals allowed (count)</th>
436
                      [% END %]
426
                      <th>Renewal period</th>
437
                      <th>Renewal period</th>
427
                      <th>No renewal before</th>
438
                      <th>No renewal before</th>
428
                      <th>Automatic renewal</th>
439
                      <th>Automatic renewal</th>
429
- 

Return to bug 24083