@@ -, +, @@
---
Koha/CirculationRules.pm | 3 +++
admin/smart-rules.pl | 4 ++++
installer/onboarding.pl | 1 +
.../intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 7 ++++++-
4 files changed, 14 insertions(+), 1 deletion(-)
--- a/Koha/CirculationRules.pm
+++ a/Koha/CirculationRules.pm
@@ -155,6 +155,9 @@ our $RULE_KINDS = {
norenewalbefore => {
scope => [ 'branchcode', 'categorycode', 'itemtype' ],
},
+ noautorenewalbefore => {
+ scope => [ 'branchcode', 'categorycode', 'itemtype' ],
+ },
onshelfholds => {
scope => [ 'branchcode', 'categorycode', 'itemtype' ],
},
--- a/admin/smart-rules.pl
+++ a/admin/smart-rules.pl
@@ -96,6 +96,7 @@ if ($op eq 'delete') {
unseen_renewals_allowed => undef,
renewalperiod => undef,
norenewalbefore => undef,
+ noautorenewalbefore => undef,
auto_renew => undef,
no_auto_renewal_after => undef,
no_auto_renewal_after_hard_limit => undef,
@@ -268,6 +269,8 @@ elsif ($op eq 'add') {
my $renewalperiod = $input->param('renewalperiod');
my $norenewalbefore = $input->param('norenewalbefore');
$norenewalbefore = q{} if $norenewalbefore =~ /^\s*$/;
+ my $noautorenewalbefore = $input->param('noautorenewalbefore');
+ $noautorenewalbefore = q{} if $noautorenewalbefore =~ /^\s*$/;
my $auto_renew = $input->param('auto_renew') eq 'yes' ? 1 : 0;
my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
$no_auto_renewal_after = q{} if $no_auto_renewal_after =~ /^\s*$/;
@@ -316,6 +319,7 @@ elsif ($op eq 'add') {
unseen_renewals_allowed => $unseen_renewals_allowed,
renewalperiod => $renewalperiod,
norenewalbefore => $norenewalbefore,
+ noautorenewalbefore => $noautorenewalbefore,
auto_renew => $auto_renew,
no_auto_renewal_after => $no_auto_renewal_after,
no_auto_renewal_after_hard_limit => $no_auto_renewal_after_hard_limit,
--- a/installer/onboarding.pl
+++ a/installer/onboarding.pl
@@ -269,6 +269,7 @@ if ( $step == 5 ) {
no_auto_renewal_after => "",
no_auto_renewal_after_hard_limit => "",
norenewalbefore => "",
+ noautorenewalbefore => "",
opacitemholds => "N",
overduefinescap => "",
rentaldiscount => 0,
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -137,6 +137,7 @@
[% END %]
Renewal period |
No renewal before |
+ No automatic renewal before |
Automatic renewal |
No automatic renewal after |
No automatic renewal after (hard limit) |
@@ -187,6 +188,7 @@
[% SET unseenrenewalsallowed = all_rules.$c.$i.unseen_renewals_allowed %]
[% SET renewalperiod = all_rules.$c.$i.renewalperiod %]
[% SET norenewalbefore = all_rules.$c.$i.norenewalbefore %]
+ [% SET noautorenewalbefore = all_rules.$c.$i.noautorenewalbefore %]
[% SET auto_renew = all_rules.$c.$i.auto_renew %]
[% SET no_auto_renewal_after = all_rules.$c.$i.no_auto_renewal_after %]
[% SET no_auto_renewal_after_hard_limit = all_rules.$c.$i.no_auto_renewal_after_hard_limit %]
@@ -205,7 +207,7 @@
[% SET recall_overdue_fine = all_rules.$c.$i.recall_overdue_fine %]
[% SET recall_shelf_time = all_rules.$c.$i.recall_shelf_time %]
- [% 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 %]
+ [% 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 %]
[% IF show_rule %]
[% SET row_count = row_count + 1 %]
@@ -319,6 +321,7 @@
[% END %]
[% renewalperiod | html %] |
[% norenewalbefore | html %] |
+ [% noautorenewalbefore | html %] |
[% IF auto_renew %]
Yes
@@ -487,6 +490,7 @@
[% END %]
| |
|
+ |
|