[svn:p5ee] r8503 - p5ee/trunk/App-Widget/lib/App

Author: spadkins
Date: Tue Jan  2 11:40:50 2007
New Revision: 8503

Modified:
   p5ee/trunk/App-Widget/lib/App/Widget.pm

Log:
fixed negative currency formats

Modified: p5ee/trunk/App-Widget/lib/App/Widget.pm
==============================================================================
--- p5ee/trunk/App-Widget/lib/App/Widget.pm	(original)
+++ p5ee/trunk/App-Widget/lib/App/Widget.pm	Tue Jan  2 11:40:50 2007
@@ -549,7 +549,7 @@
                 my $int   = $4;
                 my $frac  = $5;
                 my $pct   = $6;
-                my $negated = ($paren && $value < 0);
+                my $negated = (($paren || $sign) && $value < 0);
                 if ($negated) {
                     $formatted_value = -$formatted_value;
                 }
@@ -573,18 +573,25 @@
                         }
                     }
                 }
-                if ($sign && $value > 0) {
-                    $formatted_value = "+" . $formatted_value;
-                }
                 if ($curr) {
                     $formatted_value = '$' . $formatted_value;
                 }
+                if ($negated) {
+                    if ($paren) {
+                        $formatted_value = "(" . $formatted_value . ")";
+                    }
+                    elsif ($sign && $value < 0) {
+                        $formatted_value = "-" . $formatted_value;
+                    }
+                }
+                else {
+                    if ($sign && $value > 0) {
+                        $formatted_value = "+" . $formatted_value;
+                    }
+                }
                 if ($pct) {
                     $formatted_value = $formatted_value . "%";
                 }
-                if ($paren && $negated) {
-                    $formatted_value = "(" . $formatted_value . ")";
-                }
             }
         }
         elsif ($format_options->{date_format}) {