Consolidation and extended test runs

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 339d2bbd220da30117dd4a95fc267902b95134cb..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);
 


@@ -969,19 +967,19 @@ sub parse_amount {
 sub round_amount {
   my ($self, $amount, $places, $adjust) = @_;
 
 sub round_amount {
   my ($self, $amount, $places, $adjust) = @_;
 

+  return 0 if !defined $amount;
+

   if ($adjust) {
   if ($adjust) {

-    my $precision = 0.01;
+    my $precision = SL::DB::Default->get->precision || 0.01;

     # Round amounts to eight places before rounding to the requested
     # number of places. This gets rid of errors due to internal floating
     # point representation.
     $amount = int($amount * 10**8 + .5 * ($amount <=> 0)) / 10**8  if $places < 8;
     # Round amounts to eight places before rounding to the requested
     # number of places. This gets rid of errors due to internal floating
     # point representation.
     $amount = int($amount * 10**8 + .5 * ($amount <=> 0)) / 10**8  if $places < 8;

-    $amount = int($amount / ($precision = _get_precision()) + ($amount <=> 0) * .5) * $precision;
+    $amount = int($amount / $precision + ($amount <=> 0) * .5) * $precision;

     $amount = int($amount * 10**$places + .5 * ($amount <=> 0)) / 10**$places;
     return $amount;
   }
 
     $amount = int($amount * 10**$places + .5 * ($amount <=> 0)) / 10**$places;
     return $amount;
   }
 

-  return 0 if !defined $amount;
-

   # We use Perl's knowledge of string representation for
   # rounding. First, convert the floating point number to a string
   # with a high number of places. Then split the string on the decimal
   # We use Perl's knowledge of string representation for
   # rounding. First, convert the floating point number to a string
   # with a high number of places. Then split the string on the decimal


@@ -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;


@@ -3698,20 +3696,6 @@ sub calculate_tax {
   return ($amount,$tax);
 };
 
   return ($amount,$tax);
 };
 

-sub _get_precision {
-  my ( $self ) = @_;
-  my $precision = 0.01;
-  eval {
-    my $client = $::auth->{client};
-    my $dbconnect = 'dbi:Pg:dbname=' . $client->{dbname} . ';host=' . $client->{dbhost} . ';port=' . $client->{dbport};
-    my $dbh       = DBI->connect($dbconnect, $client->{dbuser}, $client->{dbpasswd});
-    my $query = q{ SELECT precision FROM defaults };
-    ($precision) = selectrow_query($::form, $dbh, $query);
-    $dbh->disconnect;
-  };
-  return $precision;
-}
-

 1;
 
 __END__
 1;
 
 __END__