Recommit von r1154 von skoehler: Nachtag zu r1152, fehlerhafte Abfrage beim Bezahlen...

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 49e09818c7abd84e26cbedb9fc265acd9746bc15..d21e3f87c3db9f815216e85c1868ef534779d678 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -647,10 +647,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;