Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 0aad56ef5d8ba3223a8aca856ad0e489d6b1c290..487df6dd05674b066cae4b73896fcf0df19890a8 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -91,7 +91,8 @@ END {
 
 sub disconnect_standard_dbh {
   return unless $standard_dbh;
 
 sub disconnect_standard_dbh {
   return unless $standard_dbh;

-  $standard_dbh->disconnect();
+
+  $standard_dbh->rollback();

   undef $standard_dbh;
 }
 
   undef $standard_dbh;
 }
 


@@ -947,12 +948,18 @@ sub parse_amount {
 
   # Make sure no code wich is not a math expression ends up in eval().
   return 0 unless $amount =~ /^ [\s \d \( \) \- \+ \* \/ \. ]* $/x;
 
   # Make sure no code wich is not a math expression ends up in eval().
   return 0 unless $amount =~ /^ [\s \d \( \) \- \+ \* \/ \. ]* $/x;

+
+  # Prevent numbers from being parsed as octals;
+  $amount =~ s{ (?<! [\d.] ) 0+ (?= [1-9] ) }{}gx;
+

   return scalar(eval($amount)) * 1 ;
 }
 
 sub round_amount {
   my ($self, $amount, $places) = @_;
 
   return scalar(eval($amount)) * 1 ;
 }
 
 sub round_amount {
   my ($self, $amount, $places) = @_;
 

+  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


@@ -1119,7 +1126,7 @@ sub parse_template {
 
   if ($self->{media} eq 'email') {
 
 
   if ($self->{media} eq 'email') {
 

-    my $mail = new Mailer;
+    my $mail = Mailer->new;

 
     map { $mail->{$_} = $self->{$_} }
       qw(cc bcc subject message version format);
 
     map { $mail->{$_} = $self->{$_} }
       qw(cc bcc subject message version format);


@@ -1696,36 +1703,19 @@ sub get_default_currency {
 }
 
 sub set_payment_options {
 }
 
 sub set_payment_options {

-  $main::lxdebug->enter_sub();
-

   my ($self, $myconfig, $transdate) = @_;
 
   my ($self, $myconfig, $transdate) = @_;
 

-  return $main::lxdebug->leave_sub() unless ($self->{payment_id});
+  my $terms = $self->{payment_id} ? SL::DB::PaymentTerm->new(id => $self->{payment_id})->load : undef;
+  return if !$terms;

 
 

-  my $dbh = $self->get_standard_dbh($myconfig);
-
-  my $query =
-    qq|SELECT p.terms_netto, p.terms_skonto, p.percent_skonto, p.description_long , p.description | .
-    qq|FROM payment_terms p | .
-    qq|WHERE p.id = ?|;
-
-  ($self->{terms_netto}, $self->{terms_skonto}, $self->{percent_skonto},
-   $self->{payment_terms}, $self->{payment_description}) =
-     selectrow_query($self, $dbh, $query, $self->{payment_id});
-
-  if ($transdate eq "") {
-    if ($self->{invdate}) {
-      $transdate = $self->{invdate};
-    } else {
-      $transdate = $self->{transdate};
-    }
-  }
+  $transdate                  ||= $self->{invdate} || $self->{transdate};
+  my $due_date                  = $self->{duedate} || $self->{reqdate};

 
 

-  $query =
-    qq|SELECT ?::date + ?::integer AS netto_date, ?::date + ?::integer AS skonto_date | .
-    qq|FROM payment_terms|;
-  ($self->{netto_date}, $self->{skonto_date}) =
-    selectrow_query($self, $dbh, $query, $transdate, $self->{terms_netto}, $transdate, $self->{terms_skonto});
+  $self->{$_}                   = $terms->$_ for qw(terms_netto terms_skonto percent_skonto);
+  $self->{payment_terms}        = $terms->description_long;
+  $self->{payment_description}  = $terms->description;
+  $self->{netto_date}           = $terms->calc_date(reference_date => $transdate, due_date => $due_date, terms => 'net')->to_kivitendo;
+  $self->{skonto_date}          = $terms->calc_date(reference_date => $transdate, due_date => $due_date, terms => 'discount')->to_kivitendo;

 
   my ($invtotal, $total);
   my (%amounts, %formatted_amounts);
 
   my ($invtotal, $total);
   my (%amounts, %formatted_amounts);


@@ -1755,7 +1745,8 @@ sub set_payment_options {
   }
 
   if ($self->{"language_id"}) {
   }
 
   if ($self->{"language_id"}) {

-    $query =
+    my $dbh   = $self->get_standard_dbh($myconfig);
+    my $query =

       qq|SELECT t.translation, l.output_numberformat, l.output_dateformat, l.output_longdates | .
       qq|FROM generic_translations t | .
       qq|LEFT JOIN language l ON t.language_id = l.id | .
       qq|SELECT t.translation, l.output_numberformat, l.output_dateformat, l.output_longdates | .
       qq|FROM generic_translations t | .
       qq|LEFT JOIN language l ON t.language_id = l.id | .


@@ -1799,8 +1790,6 @@ sub set_payment_options {
 
   $self->{skonto_in_percent} = $formatted_amounts{skonto_in_percent};
 
 
   $self->{skonto_in_percent} = $formatted_amounts{skonto_in_percent};
 

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

 }
 
 sub get_template_language {
 }
 
 sub get_template_language {


@@ -1973,23 +1962,6 @@ sub get_employee_data {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-sub get_duedate {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $reference_date) = @_;
-
-  my $terms   = $self->{payment_id}  ? SL::DB::PaymentTerm->new(id => $self->{payment_id}) ->load
-              : $self->{customer_id} ? SL::DB::Customer   ->new(id => $self->{customer_id})->load->payment
-              : $self->{vendor_id}   ? SL::DB::Vendor     ->new(id => $self->{vendor_id})  ->load->payment
-              : $self->{invdate}     ? undef # no payment terms, therefore invdate == duedate
-              :                        croak("Missing field in \$::form: payment_id, customer_id, vendor_id or invdate");
-  my $duedate = $terms ? $terms->calc_date(reference_date => $reference_date)->to_kivitendo : undef;
-
-  $main::lxdebug->leave_sub();
-
-  return $duedate;
-}
-

 sub _get_contacts {
   $main::lxdebug->enter_sub();
 
 sub _get_contacts {
   $main::lxdebug->enter_sub();
 


@@ -2912,7 +2884,6 @@ sub lastname_used {
                     "d.description"           => "department",
                     "ct.name"                 => $table,
                     "cu.name"                 => "currency",
                     "d.description"           => "department",
                     "ct.name"                 => $table,
                     "cu.name"                 => "currency",

-                    "current_date + ct.terms" => "duedate",

     );
 
   if ($self->{type} =~ /delivery_order/) {
     );
 
   if ($self->{type} =~ /delivery_order/) {