Nachtag zu r1125, neue format_amount gab keine negativen Zahlen zurueck

diff --git a/SL/Form.pm b/SL/Form.pm
index b97833e..9e55af3 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -627,10 +627,11 @@ sub format_amount {
   $amount = $p[0];
   $amount .= $d[0].$p[1].(0 x ($places - length $p[1])) if ($places || $p[1] ne '');
  
-  $amount = ($neg) ? "($amount)"  : "$amount"    if $dash =~ ?-?;
-  $amount = ($neg) ? "$amount DR" : "$amount CR" if $dash =~ ?DRCR?;
-  $amount = ($neg) ? "-$amount"   : "$amount"    if $dash =~ ??;
-  reset;
+  $amount = do {
+    ($dash =~ /-/)    ? ($neg ? "($amount)"  : "$amount" )    :
+    ($dash =~ /DRCR/) ? ($neg ? "$amount DR" : "$amount CR" ) :
+                        ($neg ? "-$amount"   : "$amount" )    ;
+  };
   
   $main::lxdebug->leave_sub(2);
   return $amount;