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

(-)a/Koha/Number/Price.pm (-1 / +2 lines)
Lines 127-133 sub _format_params { Link Here
127
    }
127
    }
128
128
129
129
130
    $format_params{p_cs_precedes}  = $p_cs_precedes  if defined $p_cs_precedes;
130
    $format_params{p_cs_precedes} =
131
        defined $p_cs_precedes ? $p_cs_precedes : ( $currency and $currency->p_cs_precedes ) ? 1 : 0;
131
    $format_params{p_sep_by_space} = ( $currency and $currency->p_sep_by_space ) ? 1 : 0;
132
    $format_params{p_sep_by_space} = ( $currency and $currency->p_sep_by_space ) ? 1 : 0;
132
133
133
    return \%format_params;
134
    return \%format_params;
(-)a/admin/currency.pl (-5 / +9 lines)
Lines 57-62 if ( $op eq 'add_form' ) { Link Here
57
    my $rate          = $input->param('rate');
57
    my $rate          = $input->param('rate');
58
    my $active        = $input->param('active');
58
    my $active        = $input->param('active');
59
    my $p_sep_by_space = $input->param('p_sep_by_space');
59
    my $p_sep_by_space = $input->param('p_sep_by_space');
60
    my $p_cs_precedes = $input->param('p_cs_precedes') // 0;
60
    my $is_a_modif    = $input->param('is_a_modif');
61
    my $is_a_modif    = $input->param('is_a_modif');
61
62
62
    if ($is_a_modif) {
63
    if ($is_a_modif) {
Lines 66-71 if ( $op eq 'add_form' ) { Link Here
66
        $currency->rate($rate);
67
        $currency->rate($rate);
67
        $currency->active($active);
68
        $currency->active($active);
68
        $currency->p_sep_by_space($p_sep_by_space);
69
        $currency->p_sep_by_space($p_sep_by_space);
70
        $currency->p_cs_precedes($p_cs_precedes);
69
        eval { $currency->store; };
71
        eval { $currency->store; };
70
        if ($@) {
72
        if ($@) {
71
            push @messages, { type => 'error', code => 'error_on_update' };
73
            push @messages, { type => 'error', code => 'error_on_update' };
Lines 74-85 if ( $op eq 'add_form' ) { Link Here
74
        }
76
        }
75
    } else {
77
    } else {
76
        my $currency = Koha::Acquisition::Currency->new(
78
        my $currency = Koha::Acquisition::Currency->new(
77
            {   currency => $currency_code,
79
            {
78
                symbol   => $symbol,
80
                currency       => $currency_code,
79
                isocode  => $isocode,
81
                symbol         => $symbol,
80
                rate     => $rate,
82
                isocode        => $isocode,
81
                active   => $active,
83
                rate           => $rate,
84
                active         => $active,
82
                p_sep_by_space => $p_sep_by_space,
85
                p_sep_by_space => $p_sep_by_space,
86
                p_cs_precedes  => $p_cs_precedes,
83
            }
87
            }
84
        );
88
        );
85
        eval { $currency->store; };
89
        eval { $currency->store; };
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt (-1 / +8 lines)
Lines 148-153 Link Here
148
                    <input type="checkbox" id="p_sep_by_space" name="p_sep_by_space" value="1" />
148
                    <input type="checkbox" id="p_sep_by_space" name="p_sep_by_space" value="1" />
149
                [% END %]
149
                [% END %]
150
            </li>
150
            </li>
151
            <li>
152
                <label for="p_cs_precedes">Currency symbol precedes value: </label>
153
                [% IF currency.p_cs_precedes %]
154
                    <input type="checkbox" id="p_cs_precedes" name="p_cs_precedes" value="1" checked="checked" />
155
                [% ELSE %]
156
                    <input type="checkbox" id="p_cs_precedes" name="p_cs_precedes" value="1" />
157
                [% END %]
158
            </li>
151
            <li>
159
            <li>
152
                <label for="active">Active: </label>
160
                <label for="active">Active: </label>
153
                [% IF currency.active %]
161
                [% IF currency.active %]
154
- 

Return to bug 37511