diff --git a/Koha/Number/Price.pm b/Koha/Number/Price.pm index a0f847d495..4518e97457 100644 --- a/Koha/Number/Price.pm +++ b/Koha/Number/Price.pm @@ -127,7 +127,8 @@ sub _format_params { } - $format_params{p_cs_precedes} = $p_cs_precedes if defined $p_cs_precedes; + $format_params{p_cs_precedes} = + defined $p_cs_precedes ? $p_cs_precedes : ( $currency and $currency->p_cs_precedes ) ? 1 : 0; $format_params{p_sep_by_space} = ( $currency and $currency->p_sep_by_space ) ? 1 : 0; return \%format_params; diff --git a/admin/currency.pl b/admin/currency.pl index 6220bbd081..2ca7d620e4 100755 --- a/admin/currency.pl +++ b/admin/currency.pl @@ -57,6 +57,7 @@ if ( $op eq 'add_form' ) { my $rate = $input->param('rate'); my $active = $input->param('active'); my $p_sep_by_space = $input->param('p_sep_by_space'); + my $p_cs_precedes = $input->param('p_cs_precedes') // 0; my $is_a_modif = $input->param('is_a_modif'); if ($is_a_modif) { @@ -66,6 +67,7 @@ if ( $op eq 'add_form' ) { $currency->rate($rate); $currency->active($active); $currency->p_sep_by_space($p_sep_by_space); + $currency->p_cs_precedes($p_cs_precedes); eval { $currency->store; }; if ($@) { push @messages, { type => 'error', code => 'error_on_update' }; @@ -74,12 +76,14 @@ if ( $op eq 'add_form' ) { } } else { my $currency = Koha::Acquisition::Currency->new( - { currency => $currency_code, - symbol => $symbol, - isocode => $isocode, - rate => $rate, - active => $active, + { + currency => $currency_code, + symbol => $symbol, + isocode => $isocode, + rate => $rate, + active => $active, p_sep_by_space => $p_sep_by_space, + p_cs_precedes => $p_cs_precedes, } ); eval { $currency->store; }; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index 0cf35c914d..a3ef292b31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -148,6 +148,14 @@ [% END %] +
  • + + [% IF currency.p_cs_precedes %] + + [% ELSE %] + + [% END %] +
  • [% IF currency.active %]