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

(-)a/Koha/CirculationRules.pm (+3 lines)
Lines 155-160 our $RULE_KINDS = { Link Here
155
    norenewalbefore => {
155
    norenewalbefore => {
156
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
156
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
157
    },
157
    },
158
    noautorenewalbefore => {
159
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
160
    },
158
    onshelfholds => {
161
    onshelfholds => {
159
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
162
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
160
    },
163
    },
(-)a/admin/smart-rules.pl (+4 lines)
Lines 96-101 if ($op eq 'delete') { Link Here
96
                unseen_renewals_allowed          => undef,
96
                unseen_renewals_allowed          => undef,
97
                renewalperiod                    => undef,
97
                renewalperiod                    => undef,
98
                norenewalbefore                  => undef,
98
                norenewalbefore                  => undef,
99
                noautorenewalbefore              => undef,
99
                auto_renew                       => undef,
100
                auto_renew                       => undef,
100
                no_auto_renewal_after            => undef,
101
                no_auto_renewal_after            => undef,
101
                no_auto_renewal_after_hard_limit => undef,
102
                no_auto_renewal_after_hard_limit => undef,
Lines 268-273 elsif ($op eq 'add') { Link Here
268
    my $renewalperiod    = $input->param('renewalperiod');
269
    my $renewalperiod    = $input->param('renewalperiod');
269
    my $norenewalbefore  = $input->param('norenewalbefore');
270
    my $norenewalbefore  = $input->param('norenewalbefore');
270
    $norenewalbefore = q{} if $norenewalbefore =~ /^\s*$/;
271
    $norenewalbefore = q{} if $norenewalbefore =~ /^\s*$/;
272
    my $noautorenewalbefore = $input->param('noautorenewalbefore');
273
    $noautorenewalbefore = q{} if $noautorenewalbefore =~ /^\s*$/;
271
    my $auto_renew = $input->param('auto_renew') eq 'yes' ? 1 : 0;
274
    my $auto_renew = $input->param('auto_renew') eq 'yes' ? 1 : 0;
272
    my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
275
    my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
273
    $no_auto_renewal_after = q{} if $no_auto_renewal_after =~ /^\s*$/;
276
    $no_auto_renewal_after = q{} if $no_auto_renewal_after =~ /^\s*$/;
Lines 316-321 elsif ($op eq 'add') { Link Here
316
        unseen_renewals_allowed       => $unseen_renewals_allowed,
319
        unseen_renewals_allowed       => $unseen_renewals_allowed,
317
        renewalperiod                 => $renewalperiod,
320
        renewalperiod                 => $renewalperiod,
318
        norenewalbefore               => $norenewalbefore,
321
        norenewalbefore               => $norenewalbefore,
322
        noautorenewalbefore           => $noautorenewalbefore,
319
        auto_renew                    => $auto_renew,
323
        auto_renew                    => $auto_renew,
320
        no_auto_renewal_after         => $no_auto_renewal_after,
324
        no_auto_renewal_after         => $no_auto_renewal_after,
321
        no_auto_renewal_after_hard_limit => $no_auto_renewal_after_hard_limit,
325
        no_auto_renewal_after_hard_limit => $no_auto_renewal_after_hard_limit,
(-)a/installer/onboarding.pl (+1 lines)
Lines 269-274 if ( $step == 5 ) { Link Here
269
                no_auto_renewal_after            => "",
269
                no_auto_renewal_after            => "",
270
                no_auto_renewal_after_hard_limit => "",
270
                no_auto_renewal_after_hard_limit => "",
271
                norenewalbefore                  => "",
271
                norenewalbefore                  => "",
272
                noautorenewalbefore              => "",
272
                opacitemholds                    => "N",
273
                opacitemholds                    => "N",
273
                overduefinescap                  => "",
274
                overduefinescap                  => "",
274
                rentaldiscount                   => 0,
275
                rentaldiscount                   => 0,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-2 / +6 lines)
Lines 137-142 Link Here
137
                            [% END %]
137
                            [% END %]
138
                            <th>Renewal period</th>
138
                            <th>Renewal period</th>
139
                            <th>No renewal before</th>
139
                            <th>No renewal before</th>
140
                            <th>No automatic renewal before</th>
140
                            <th>Automatic renewal</th>
141
                            <th>Automatic renewal</th>
141
                            <th>No automatic renewal after</th>
142
                            <th>No automatic renewal after</th>
142
                            <th>No automatic renewal after (hard limit)</th>
143
                            <th>No automatic renewal after (hard limit)</th>
Lines 187-192 Link Here
187
                                    [% SET unseenrenewalsallowed = all_rules.$c.$i.unseen_renewals_allowed %]
188
                                    [% SET unseenrenewalsallowed = all_rules.$c.$i.unseen_renewals_allowed %]
188
                                    [% SET renewalperiod = all_rules.$c.$i.renewalperiod %]
189
                                    [% SET renewalperiod = all_rules.$c.$i.renewalperiod %]
189
                                    [% SET norenewalbefore = all_rules.$c.$i.norenewalbefore %]
190
                                    [% SET norenewalbefore = all_rules.$c.$i.norenewalbefore %]
191
                                    [% SET noautorenewalbefore = all_rules.$c.$i.noautorenewalbefore %]
190
                                    [% SET auto_renew = all_rules.$c.$i.auto_renew %]
192
                                    [% SET auto_renew = all_rules.$c.$i.auto_renew %]
191
                                    [% SET no_auto_renewal_after = all_rules.$c.$i.no_auto_renewal_after %]
193
                                    [% SET no_auto_renewal_after = all_rules.$c.$i.no_auto_renewal_after %]
192
                                    [% SET no_auto_renewal_after_hard_limit = all_rules.$c.$i.no_auto_renewal_after_hard_limit %]
194
                                    [% SET no_auto_renewal_after_hard_limit = all_rules.$c.$i.no_auto_renewal_after_hard_limit %]
Lines 205-211 Link Here
205
                                    [% SET recall_overdue_fine = all_rules.$c.$i.recall_overdue_fine %]
207
                                    [% SET recall_overdue_fine = all_rules.$c.$i.recall_overdue_fine %]
206
                                    [% SET recall_shelf_time = all_rules.$c.$i.recall_shelf_time %]
208
                                    [% SET recall_shelf_time = all_rules.$c.$i.recall_shelf_time %]
207
209
208
                                    [% 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 || decreaseloanholds || recalls_allowed || recalls_per_record || on_shelf_recalls || recall_due_date_interval || recall_overdue_fine || recall_shelf_time %]
210
                                    [% 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 || noautorenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || rentaldiscount || decreaseloanholds || recalls_allowed || recalls_per_record || on_shelf_recalls || recall_due_date_interval || recall_overdue_fine || recall_shelf_time %]
209
                                    [% IF show_rule %]
211
                                    [% IF show_rule %]
210
                                        [% SET row_count = row_count + 1 %]
212
                                        [% SET row_count = row_count + 1 %]
211
                                        <tr row_countd="row_[% row_count | html %]">
213
                                        <tr row_countd="row_[% row_count | html %]">
Lines 319-324 Link Here
319
                                                [% END %]
321
                                                [% END %]
320
                                                <td>[% renewalperiod | html %]</td>
322
                                                <td>[% renewalperiod | html %]</td>
321
                                                <td>[% norenewalbefore | html %]</td>
323
                                                <td>[% norenewalbefore | html %]</td>
324
                                                <td>[% noautorenewalbefore | html %]</td>
322
                                                <td data-code="[%- IF auto_renew -%]yes[%- ELSE -%]no[%- END -%]">
325
                                                <td data-code="[%- IF auto_renew -%]yes[%- ELSE -%]no[%- END -%]">
323
                                                    [% IF auto_renew %]
326
                                                    [% IF auto_renew %]
324
                                                        <span>Yes</span>
327
                                                        <span>Yes</span>
Lines 487-492 Link Here
487
                                [% END %]
490
                                [% END %]
488
                                <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
491
                                <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
489
                                <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
492
                                <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
493
                                <td><input type="text" name="noautorenewalbefore" id="noautorenewalbefore" size="3" /></td>
490
                                <td>
494
                                <td>
491
                                    <select name="auto_renew" id="auto_renew">
495
                                    <select name="auto_renew" id="auto_renew">
492
                                        <option value="no" selected>No</option>
496
                                        <option value="no" selected>No</option>
Lines 576-581 Link Here
576
                                  [% END %]
580
                                  [% END %]
577
                                  <th>Renewal period</th>
581
                                  <th>Renewal period</th>
578
                                  <th>No renewal before</th>
582
                                  <th>No renewal before</th>
583
                                  <th>No automatic renewal before</th>
579
                                  <th>Automatic renewal</th>
584
                                  <th>Automatic renewal</th>
580
                                  <th>No automatic renewal after</th>
585
                                  <th>No automatic renewal after</th>
581
                                  <th>No automatic renewal after (hard limit)</th>
586
                                  <th>No automatic renewal after (hard limit)</th>
582
- 

Return to bug 25393