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

(-)a/admin/smart-rules.pl (+3 lines)
Lines 98-103 if ($op eq 'delete') { Link Here
98
                hardduedate                      => undef,
98
                hardduedate                      => undef,
99
                hardduedatecompare               => undef,
99
                hardduedatecompare               => undef,
100
                renewalsallowed                  => undef,
100
                renewalsallowed                  => undef,
101
                onsite_renewalsallowed           => undef,
101
                renewalperiod                    => undef,
102
                renewalperiod                    => undef,
102
                norenewalbefore                  => undef,
103
                norenewalbefore                  => undef,
103
                auto_renew                       => undef,
104
                auto_renew                       => undef,
Lines 262-267 elsif ($op eq 'add') { Link Here
262
    my $maxissueqty  = strip_non_numeric($input->param('maxissueqty'));
263
    my $maxissueqty  = strip_non_numeric($input->param('maxissueqty'));
263
    my $maxonsiteissueqty  = strip_non_numeric($input->param('maxonsiteissueqty'));
264
    my $maxonsiteissueqty  = strip_non_numeric($input->param('maxonsiteissueqty'));
264
    my $renewalsallowed  = $input->param('renewalsallowed');
265
    my $renewalsallowed  = $input->param('renewalsallowed');
266
    my $onsite_renewalsallowed  = $input->param('onsite_renewalsallowed');
265
    my $renewalperiod    = $input->param('renewalperiod');
267
    my $renewalperiod    = $input->param('renewalperiod');
266
    my $norenewalbefore  = $input->param('norenewalbefore');
268
    my $norenewalbefore  = $input->param('norenewalbefore');
267
    $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
269
    $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
Lines 306-311 elsif ($op eq 'add') { Link Here
306
        hardduedate                   => $hardduedate,
308
        hardduedate                   => $hardduedate,
307
        hardduedatecompare            => $hardduedatecompare,
309
        hardduedatecompare            => $hardduedatecompare,
308
        renewalsallowed               => $renewalsallowed,
310
        renewalsallowed               => $renewalsallowed,
311
        onsite_renewalsallowed        => $onsite_renewalsallowed,
309
        renewalperiod                 => $renewalperiod,
312
        renewalperiod                 => $renewalperiod,
310
        norenewalbefore               => $norenewalbefore,
313
        norenewalbefore               => $norenewalbefore,
311
        auto_renew                    => $auto_renew,
314
        auto_renew                    => $auto_renew,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-2 / +5 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
                <th>On-site renewals allowed (count)</th>
108
                <th>Renewal period</th>
109
                <th>Renewal period</th>
109
                <th>No renewal before</th>
110
                <th>No renewal before</th>
110
                <th>Automatic renewal</th>
111
                <th>Automatic renewal</th>
Lines 143-148 Link Here
143
                        [% SET maxsuspensiondays = all_rules.$c.$i.maxsuspensiondays %]
144
                        [% SET maxsuspensiondays = all_rules.$c.$i.maxsuspensiondays %]
144
                        [% SET suspension_chargeperiod = all_rules.$c.$i.suspension_chargeperiod %]
145
                        [% SET suspension_chargeperiod = all_rules.$c.$i.suspension_chargeperiod %]
145
                        [% SET renewalsallowed = all_rules.$c.$i.renewalsallowed %]
146
                        [% SET renewalsallowed = all_rules.$c.$i.renewalsallowed %]
147
                        [% SET onsite_renewalsallowed = all_rules.$c.$i.onsite_renewalsallowed %]
146
                        [% SET renewalperiod = all_rules.$c.$i.renewalperiod %]
148
                        [% SET renewalperiod = all_rules.$c.$i.renewalperiod %]
147
                        [% SET norenewalbefore = all_rules.$c.$i.norenewalbefore %]
149
                        [% SET norenewalbefore = all_rules.$c.$i.norenewalbefore %]
148
                        [% SET auto_renew = all_rules.$c.$i.auto_renew %]
150
                        [% SET auto_renew = all_rules.$c.$i.auto_renew %]
Lines 156-162 Link Here
156
                        [% SET article_requests = all_rules.$c.$i.article_requests %]
158
                        [% SET article_requests = all_rules.$c.$i.article_requests %]
157
                        [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]
159
                        [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]
158
160
159
                        [% 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 || onsite_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 %]
160
                        [% IF show_rule %]
162
                        [% IF show_rule %]
161
                            [% SET row_count = row_count + 1 %]
163
                            [% SET row_count = row_count + 1 %]
162
                            <tr row_countd="row_[% row_count | html %]">
164
                            <tr row_countd="row_[% row_count | html %]">
Lines 239-244 Link Here
239
                                    <td>[% maxsuspensiondays | html %]</td>
241
                                    <td>[% maxsuspensiondays | html %]</td>
240
                                    <td>[% suspension_chargeperiod | html %]</td>
242
                                    <td>[% suspension_chargeperiod | html %]</td>
241
                                    <td>[% renewalsallowed | html %]</td>
243
                                    <td>[% renewalsallowed | html %]</td>
244
                                    <td>[% onsite_renewalsallowed | html %]</td>
242
                                    <td>[% renewalperiod | html %]</td>
245
                                    <td>[% renewalperiod | html %]</td>
243
                                    <td>[% norenewalbefore | html %]</td>
246
                                    <td>[% norenewalbefore | html %]</td>
244
                                    <td>
247
                                    <td>
Lines 365-370 Link Here
365
                    <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>
368
                    <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>
366
                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>
369
                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>
367
                    <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>
370
                    <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>
371
                    <td><input type="text" name="onsite_renewalsallowed" id="renewalsallowed" size="2" /></td>
368
                    <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
372
                    <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
369
                    <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
373
                    <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
370
                    <td>
374
                    <td>
371
- 

Return to bug 24101