Consolidation and extended test runs

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 6a65a82bcf980d26980872391d8bbe670e4a8f6b..5d754efec30c12b62409271018dac3156cb78f6e 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -945,15 +945,13 @@ sub parse_amount {
     return 0;
   }
 
     return 0;
   }
 

-  if ($myconfig->{numberformat} eq '1,000.00') {
-    $amount =~ s/,//g;
-  } elsif ($myconfig->{numberformat} eq '1.000,00') {
+  $amount =~ s/\'//g;
+ if (   ($myconfig->{numberformat} eq '1.000,00')
+      || ($myconfig->{numberformat} eq '1000,00')) {

     $amount =~ s/\.//g;
     $amount =~ s/\.//g;

-  } elsif ($myconfig->{numberformat} eq "1'000.00") {
-    $amount =~ s/\'//g;
+    $amount =~ s/,/\./g;

   }
   }

-
-  $amount =~ s/,/\./g;
+  $amount =~ s/,//g;

 
   $main::lxdebug->leave_sub(2);
 
 
   $main::lxdebug->leave_sub(2);
 


@@ -2898,8 +2896,8 @@ sub create_links {
             (SELECT cu.name FROM currencies cu WHERE cu.id=d.currency_id) AS defaultcurrency,
             (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
             (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
             (SELECT cu.name FROM currencies cu WHERE cu.id=d.currency_id) AS defaultcurrency,
             (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
             (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,

-           (SELECT c.accno FROM chart c WHERE d.rndgain_accno_id = c.id) AS rndgain_accno,
-           (SELECT c.accno FROM chart c WHERE d.rndloss_accno_id = c.id) AS rndloss_accno
+            (SELECT c.accno FROM chart c WHERE d.rndgain_accno_id = c.id) AS rndgain_accno,
+            (SELECT c.accno FROM chart c WHERE d.rndloss_accno_id = c.id) AS rndloss_accno

           FROM defaults d|;
     $ref = selectfirst_hashref_query($self, $dbh, $query);
     map { $self->{$_} = $ref->{$_} } keys %$ref;
           FROM defaults d|;
     $ref = selectfirst_hashref_query($self, $dbh, $query);
     map { $self->{$_} = $ref->{$_} } keys %$ref;