@@ -, +, @@ match DB --- installer/onboarding.pl | 28 +++++++++++-------- .../prog/en/modules/onboarding/onboardingstep6.tt | 32 +++++++++++++--------- 2 files changed, 35 insertions(+), 25 deletions(-) --- a/installer/onboarding.pl +++ a/installer/onboarding.pl @@ -305,20 +305,24 @@ if ( $step > 5 && $cur ) { my $isocode = $input->param('isocode'); my $rate = $input->param('rate'); my $active = $input->param('active'); + my $p_sep_by_space = $input->param('p_sep_by_space'); my $is_a_modif = $input->param('is_a_modif'); - my $currency = Koha::Acquisition::Currency->new( - { currency => $currency_code, - symbol => $symbol, - isocode => $isocode, - rate => $rate, - active => $active, + if ($currency_code) { + my $currency = Koha::Acquisition::Currency->new( + { currency => $currency_code, + symbol => $symbol, + isocode => $isocode, + rate => $rate, + active => $active, + p_sep_by_space => $p_sep_by_space, + } + ); + eval { $currency->store; }; + if ($@) { + push @messages, { type => 'error', code => 'error_on_insert' }; + } else { + push @messages, { type => 'message', code => 'success_on_insert' }; } - ); - eval { $currency->store; }; - if ($@) { - push @messages, { type => 'error', code => 'error_on_insert' }; - } else { - push @messages, { type => 'message', code => 'success_on_insert' }; } $cur = Koha::Acquisition::Currencies->get_active; if ($cur) { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep6.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep6.tt @@ -7,9 +7,6 @@ [% END %] [% INCLUDE 'installer-doc-head-close.inc' %] -[% INCLUDE 'validator-strings.inc' %] -[% INCLUDE 'installer-strings.inc' %] - @@ -43,23 +40,27 @@ [% IF currency %] Currency: - [% currency.currency %] + [% currency.currency | html %] [% ELSE %] - Required + Required [% END %]
  • - - Required + + Required
  • - - Required + + Required
  • - - + + +
  • +
  • + +
  • @@ -75,5 +76,10 @@ [% END %] - -[% INCLUDE 'intranet-bottom.inc' %] + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'validator-strings.inc' %] + [% INCLUDE 'installer-strings.inc' %] + +[% END %] +[% INCLUDE 'installer-intranet-bottom.inc' %] --