Zahlungsbedingungen bei Lieferscheinen; veraltete Spalte »terms« entfernt

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 0aad56ef5d8ba3223a8aca856ad0e489d6b1c290..9209f3a7329f8b217fb22ea2cace67a2482ea266 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);


@@ -2912,7 +2919,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/) {