Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32271: (QA follow-up) Convert all positive numbers to monetary float and convert all 0 equivilents to blank value

Browse source 
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit daedce4f6e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 093a97c67b)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
This commit is contained in:
Kyle Hall 2023-07-14 09:08:51 -04:00 committed by Pedro Amorim
parent 2afb79a7c3
commit 16cf05f74d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Koha/CirculationRules.pm
View file

@ -162,8 +162,9 @@ our $RULE_KINDS = {
scope => [ 'branchcode', 'categorycode', 'itemtype' ],
},
overduefinescap => {
scope => [ 'branchcode', 'categorycode', 'itemtype' ],
is_monetary => 1,
scope => [ 'branchcode', 'categorycode', 'itemtype' ],
is_monetary => 1,
can_be_blank => 1,
},
renewalperiod => {
scope => [ 'branchcode', 'categorycode', 'itemtype' ],
@ -383,7 +384,7 @@ sub set_rule {
$rule_value = undef if defined $rule_value && $rule_value eq "" && !$can_be_blank;
my $is_monetary = defined $kind_info->{is_monetary} ? $kind_info->{is_monetary} : 0;
Koha::Exceptions::CirculationRule::NotDecimal->throw( name => $rule_name, value => $rule_value )
if ( $is_monetary && defined($rule_value) && $rule_value !~ /^\d+(\.\d+)?$/ );
if ( $is_monetary && !$can_be_blank && defined($rule_value) && $rule_value !~ /^\d+(\.\d+)?$/ );
for my $v ( $branchcode, $categorycode, $itemtype ) {
$v = undef if $v and $v eq '*';

3
admin/smart-rules.pl
View file

@ -284,7 +284,8 @@ elsif ($op eq 'add') {
my $rentaldiscount = $input->param('rentaldiscount') || 0;
my $opacitemholds = $input->param('opacitemholds') || 0;
my $article_requests = $input->param('article_requests') || 'no';
my $overduefinescap = $input->param('overduefinescap') || q{};
my $overduefinescap = $input->param('overduefinescap')
&& ( $input->param('overduefinescap') + 0 ) > 0 ? sprintf( "%.02f", $input->param('overduefinescap') ) : q{};
my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') || q{}) eq 'on';
my $note = $input->param('note');
my $decreaseloanholds = $input->param('decreaseloanholds') || q{};