X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=11a2b4e04a3edc9837e008b2ac69d93cae4e5244;hb=41b8891d96b1ea8b22b06e9a14eb20eb96cc0300;hp=675d9adc6563b39400a71169f024da689d0e9752;hpb=7dd95f35ee3adf728460ea79d940cf6ae556d3b8;p=kivitendo-erp.git diff --git a/SL/Form.pm b/SL/Form.pm index 675d9adc6..11a2b4e04 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -261,7 +261,7 @@ sub new { $self->{action} = lc $self->{action}; $self->{action} =~ s/( |-|,|\#)/_/g; - $self->{version} = "2.6.0 beta 1"; + $self->{version} = "2.6.0 beta 2"; $main::lxdebug->leave_sub(); @@ -979,9 +979,9 @@ sub format_amount { $amount .= $d[0].$p[1].(0 x ($places - length $p[1])) if ($places || $p[1] ne ''); $amount = do { - ($dash =~ /-/) ? ($neg ? "($amount)" : "$amount" ) : - ($dash =~ /DRCR/) ? ($neg ? "$amount DR" : "$amount CR" ) : - ($neg ? "-$amount" : "$amount" ) ; + ($dash =~ /-/) ? ($neg ? "($amount)" : "$amount" ) : + ($dash =~ /DRCR/) ? ($neg ? "$amount " . $main::locale->text('DR') : "$amount " . $main::locale->text('CR') ) : + ($neg ? "-$amount" : "$amount" ) ; };