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

(-)a/Koha/Number/Price.pm (-2 / +1 lines)
Lines 95-101 sub round { Link Here
95
sub _format_params {
95
sub _format_params {
96
    my ( $self, $params ) = @_;
96
    my ( $self, $params ) = @_;
97
    my $with_symbol = $params->{with_symbol} || 0;
97
    my $with_symbol = $params->{with_symbol} || 0;
98
    my $p_cs_precedes = $params->{p_cs_precedes};
99
    my $currency        = Koha::Acquisition::Currencies->get_active;
98
    my $currency        = Koha::Acquisition::Currencies->get_active;
100
    my $currency_format = C4::Context->preference("CurrencyFormat");
99
    my $currency_format = C4::Context->preference("CurrencyFormat");
101
100
Lines 132-139 sub _format_params { Link Here
132
    }
131
    }
133
132
134
133
135
    $format_params{p_cs_precedes}  = $p_cs_precedes  if defined $p_cs_precedes;
136
    $format_params{p_sep_by_space} = ( $currency and $currency->p_sep_by_space ) ? 1 : 0;
134
    $format_params{p_sep_by_space} = ( $currency and $currency->p_sep_by_space ) ? 1 : 0;
135
    $format_params{p_cs_precedes}  = ( $currency and $currency->p_cs_precedes ) ? 1 : 0;
137
136
138
    return \%format_params;
137
    return \%format_params;
139
}
138
}
(-)a/admin/currency.pl (+3 lines)
Lines 58-63 if ( $op eq 'add_form' ) { Link Here
58
    my $rate          = $input->param('rate');
58
    my $rate          = $input->param('rate');
59
    my $active        = $input->param('active');
59
    my $active        = $input->param('active');
60
    my $p_sep_by_space = $input->param('p_sep_by_space');
60
    my $p_sep_by_space = $input->param('p_sep_by_space');
61
    my $p_cs_precedes = $input->param('p_cs_precedes');
61
    my $is_a_modif    = $input->param('is_a_modif');
62
    my $is_a_modif    = $input->param('is_a_modif');
62
63
63
    if ($is_a_modif) {
64
    if ($is_a_modif) {
Lines 67-72 if ( $op eq 'add_form' ) { Link Here
67
        $currency->rate($rate);
68
        $currency->rate($rate);
68
        $currency->active($active);
69
        $currency->active($active);
69
        $currency->p_sep_by_space($p_sep_by_space);
70
        $currency->p_sep_by_space($p_sep_by_space);
71
        $currency->p_cs_precedes($p_cs_precedes);
70
        eval { $currency->store; };
72
        eval { $currency->store; };
71
        if ($@) {
73
        if ($@) {
72
            push @messages, { type => 'error', code => 'error_on_update' };
74
            push @messages, { type => 'error', code => 'error_on_update' };
Lines 81-86 if ( $op eq 'add_form' ) { Link Here
81
                rate     => $rate,
83
                rate     => $rate,
82
                active   => $active,
84
                active   => $active,
83
                p_sep_by_space => $p_sep_by_space,
85
                p_sep_by_space => $p_sep_by_space,
86
                p_cs_precedes  => $p_cs_precedes,
84
            }
87
            }
85
        );
88
        );
86
        eval { $currency->store; };
89
        eval { $currency->store; };
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt (-1 / +14 lines)
Lines 102-107 Link Here
102
                    <input type="checkbox" id="p_sep_by_space" name="p_sep_by_space" value="1" />
102
                    <input type="checkbox" id="p_sep_by_space" name="p_sep_by_space" value="1" />
103
                [% END %]
103
                [% END %]
104
            </li>
104
            </li>
105
            <li>
106
                <label>Position of the currency symbol: </label>
107
                [% IF currency.p_cs_precedes %]
108
                    <label for="p_cs_precedes_before">Before
109
                    <input type="radio" id="p_cs_precedes_before" name="p_cs_precedes" value="1" checked="checked" /></label>
110
                    <label for="p_cs_precedes_after">After
111
                    <input type="radio" id="p_cs_precedes_after" name="p_cs_precedes" value="0" /></label>
112
                [% ELSE %]
113
                    <label for="p_cs_precedes_before">Before
114
                    <input type="radio" id="p_cs_precedes_before" name="p_cs_precedes" value="1" /></label>
115
                    <label for="p_cs_precedes_after">After
116
                    <input type="radio" id="p_cs_precedes_after" name="p_cs_precedes" value="0" checked="checked" /></label>
117
                [% END %]
118
            </li>
105
            <li>
119
            <li>
106
                <label for="active">Active: </label>
120
                <label for="active">Active: </label>
107
                [% IF currency.active %]
121
                [% IF currency.active %]
108
- 

Return to bug 20352