Tippfehler.

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index c812b404d7610905cec177259336fffd92d14ecd..4bea5f094d4dc51386abb29df1940b52289e6e98 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -349,7 +349,7 @@ sub isblank {
 sub header {
   $main::lxdebug->enter_sub();
 
 sub header {
   $main::lxdebug->enter_sub();
 

-  my ($self) = @_;
+  my ($self, $extra_code) = @_;

 
   if ($self->{header}) {
     $main::lxdebug->leave_sub();
 
   if ($self->{header}) {
     $main::lxdebug->leave_sub();


@@ -366,6 +366,8 @@ sub header {
  |;
     }
 
  |;
     }
 

+    $self->{favicon}    = "favicon.ico" unless $self->{favicon};
+

     if ($self->{favicon} && (-f "$self->{favicon}")) {
       $favicon =
         qq|<LINK REL="shortcut icon" HREF="$self->{favicon}" TYPE="image/x-icon">
     if ($self->{favicon} && (-f "$self->{favicon}")) {
       $favicon =
         qq|<LINK REL="shortcut icon" HREF="$self->{favicon}" TYPE="image/x-icon">


@@ -437,6 +439,7 @@ function fokus(){document.$self->{fokus}.focus();}
   
   </script>
 
   
   </script>
 

+  $extra_code

 </head>
 
 |;
 </head>
 
 |;


@@ -773,7 +776,8 @@ sub parse_template {
   $self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
 
   map({ $self->{"employee_${_}"} = $myconfig->{$_}; }
   $self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
 
   map({ $self->{"employee_${_}"} = $myconfig->{$_}; }

-      qw(email tel fax name signature company address businessnumber));
+      qw(email tel fax name signature company address businessnumber
+         co_ustid taxnumber duns));

   map({ $self->{"employee_${_}"} =~ s/\\n/\n/g; }
       qw(company address signature));
 
   map({ $self->{"employee_${_}"} =~ s/\\n/\n/g; }
       qw(company address signature));
 


@@ -835,7 +839,7 @@ sub parse_template {
 
       } else {
 
 
       } else {
 

-        @{ $mail->{attachments} } = ($self->{tmpfile}) unless ($form->{do_not_attach});
+        @{ $mail->{attachments} } = ($self->{tmpfile}) unless ($self->{do_not_attach});

 
         $mail->{message}       =~ s/\r\n/\n/g;
         $myconfig->{signature} =~ s/\\n/\n/g;
 
         $mail->{message}       =~ s/\r\n/\n/g;
         $myconfig->{signature} =~ s/\\n/\n/g;


@@ -1145,6 +1149,13 @@ sub set_payment_options {
     $self->{payment_terms} =~ s/<%netto_date%>/$self->{netto_date}/g;
     $self->{payment_terms} =~ s/<%skonto_date%>/$self->{skonto_date}/g;
     $self->{payment_terms} =~ s/<%skonto_amount%>/$self->{skonto_amount}/g;
     $self->{payment_terms} =~ s/<%netto_date%>/$self->{netto_date}/g;
     $self->{payment_terms} =~ s/<%skonto_date%>/$self->{skonto_date}/g;
     $self->{payment_terms} =~ s/<%skonto_amount%>/$self->{skonto_amount}/g;

+    $self->{payment_terms} =~ s/<%total%>/$self->{total}/g;
+    $self->{payment_terms} =~ s/<%invtotal%>/$self->{invtotal}/g;
+    $self->{payment_terms} =~ s/<%currency%>/$self->{currency}/g;
+    $self->{payment_terms} =~ s/<%terms_netto%>/$self->{terms_netto}/g;
+    $self->{payment_terms} =~ s/<%account_number%>/$self->{account_number}/g;
+    $self->{payment_terms} =~ s/<%bank%>/$self->{bank}/g;
+    $self->{payment_terms} =~ s/<%bank_code%>/$self->{bank_code}/g;

 
     $dbh->disconnect;
   }
 
     $dbh->disconnect;
   }


@@ -1251,7 +1262,7 @@ sub get_shipto {
     my $sth = $dbh->prepare($query);
     $sth->execute || $self->dberror($query);
     $ref = $sth->fetchrow_hashref(NAME_lc);
     my $sth = $dbh->prepare($query);
     $sth->execute || $self->dberror($query);
     $ref = $sth->fetchrow_hashref(NAME_lc);

-    map { $form->{$_} = $ref->{$_} } keys %$ref;
+    map { $self->{$_} = $ref->{$_} } keys %$ref;

     $sth->finish;  
     $dbh->disconnect;
   }
     $sth->finish;  
     $dbh->disconnect;
   }


@@ -1524,7 +1535,7 @@ sub all_vc {
               FROM language
              ORDER BY 1|;
   $sth = $dbh->prepare($query);
               FROM language
              ORDER BY 1|;
   $sth = $dbh->prepare($query);

-  $sth->execute || $form->dberror($query);
+  $sth->execute || $self->dberror($query);

 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{languages} }, $ref;
 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{languages} }, $ref;


@@ -1536,7 +1547,7 @@ sub all_vc {
               FROM printers
              ORDER BY 1|;
   $sth = $dbh->prepare($query);
               FROM printers
              ORDER BY 1|;
   $sth = $dbh->prepare($query);

-  $sth->execute || $form->dberror($query);
+  $sth->execute || $self->dberror($query);

 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{printers} }, $ref;
 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{printers} }, $ref;


@@ -1549,7 +1560,7 @@ sub all_vc {
               FROM payment_terms
              ORDER BY 1|;
   $sth = $dbh->prepare($query);
               FROM payment_terms
              ORDER BY 1|;
   $sth = $dbh->prepare($query);

-  $sth->execute || $form->dberror($query);
+  $sth->execute || $self->dberror($query);

 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{payment_terms} }, $ref;
 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{payment_terms} }, $ref;


@@ -1575,7 +1586,7 @@ sub language_payment {
               FROM language
              ORDER BY 1|;
   my $sth = $dbh->prepare($query);
               FROM language
              ORDER BY 1|;
   my $sth = $dbh->prepare($query);

-  $sth->execute || $form->dberror($query);
+  $sth->execute || $self->dberror($query);

 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{languages} }, $ref;
 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{languages} }, $ref;


@@ -1587,7 +1598,7 @@ sub language_payment {
               FROM printers
              ORDER BY 1|;
   $sth = $dbh->prepare($query);
               FROM printers
              ORDER BY 1|;
   $sth = $dbh->prepare($query);

-  $sth->execute || $form->dberror($query);
+  $sth->execute || $self->dberror($query);

 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{printers} }, $ref;
 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{printers} }, $ref;


@@ -1599,7 +1610,7 @@ sub language_payment {
               FROM payment_terms
              ORDER BY 1|;
   $sth = $dbh->prepare($query);
               FROM payment_terms
              ORDER BY 1|;
   $sth = $dbh->prepare($query);

-  $sth->execute || $form->dberror($query);
+  $sth->execute || $self->dberror($query);

 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{payment_terms} }, $ref;
 
   while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $self->{payment_terms} }, $ref;


@@ -1610,7 +1621,7 @@ sub language_payment {
   $query = qq|SELECT id, description
               FROM buchungsgruppen|;
   $sth = $dbh->prepare($query);
   $query = qq|SELECT id, description
               FROM buchungsgruppen|;
   $sth = $dbh->prepare($query);

-  $sth->execute || $form->dberror($query);
+  $sth->execute || $self->dberror($query);

 
   $self->{BUCHUNGSGRUPPEN} = [];
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
 
   $self->{BUCHUNGSGRUPPEN} = [];
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {


@@ -1723,7 +1734,7 @@ sub create_links {
   $query = qq|SELECT id, description
               FROM tax_zones|;
   $sth = $dbh->prepare($query);
   $query = qq|SELECT id, description
               FROM tax_zones|;
   $sth = $dbh->prepare($query);

-  $sth->execute || $form->dberror($query);
+  $sth->execute || $self->dberror($query);

 
 
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
 
 
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {