<td> muss in <tr> stecken.

[mfinanz.git] / SL / Form.pm
diff --git a/SL/Form.pm b/SL/Form.pm

index 2d6ba266a81337c910d364652108907af14b462a..c1b0e28876036b5648a5cabfd7451ba83c10b868 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -434,6 +434,7 @@ sub header {
      }
      print qq|Content-Type: text/html; charset=${db_charset};
  
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
  <html>
  <head>
    <title>$self->{titlebar}</title>
@@ -726,18 +727,23 @@ sub format_amount {
    if ($amount eq "") {
      $amount = 0;
    }
-  my $neg = ($amount =~ s/-//);
-
+  
+  # Hey watch out! The amount can be an exponential term like 1.13686837721616e-13
+  
+  my $neg = ($amount =~ s/^-//);
+  my $exp = ($amount =~ m/[e]/) ? 1 : 0;
+  
    if (defined($places) && ($places ne '')) {
-    if ($places < 0) {
-      $amount *= 1;
-      $places *= -1;
-
-      my ($actual_places) = ($amount =~ /\.(\d+)/);
-      $actual_places = length($actual_places);
-      $places = $actual_places > $places ? $actual_places : $places;
+    if (not $exp) {
+      if ($places < 0) {
+        $amount *= 1;
+        $places *= -1;
+
+        my ($actual_places) = ($amount =~ /\.(\d+)/);
+        $actual_places = length($actual_places);
+        $places = $actual_places > $places ? $actual_places : $places;
+      }
      }
-
      $amount = $self->round_amount($amount, $places);
    }
  
@@ -863,6 +869,10 @@ sub parse_template {
        qw(company address signature));
    map({ $self->{$_} =~ s/\\n/\n/g; } qw(company address signature));
  
+  map({ $self->{"${_}"} = $myconfig->{$_}; }
+      qw(co_ustid));
+              
+
    $self->{copies} = 1 if (($self->{copies} *= 1) <= 0);
  
    # OUT is used for the media, screen, printer, email
@@ -1007,18 +1017,18 @@ sub get_formname_translation {
    $formname ||= $self->{formname};
  
    my %formname_translations = (
-     bin_list            => $main::locale->text('Bin List'),
-     credit_note         => $main::locale->text('Credit Note'),
-     invoice             => $main::locale->text('Invoice'),
-     packing_list        => $main::locale->text('Packing List'),
-     pick_list           => $main::locale->text('Pick List'),
-     proforma            => $main::locale->text('Proforma Invoice'),
-     purchase_order      => $main::locale->text('Purchase Order'),
-     request_quotation   => $main::locale->text('RFQ'),
-     sales_order         => $main::locale->text('Confirmation'),
-     sales_quotation     => $main::locale->text('Quotation'),
-     storno_invoice      => $main::locale->text('Storno Invoice'),
-     storno_packing_list => $main::locale->text('Storno Packing List'),
+    bin_list            => $main::locale->text('Bin List'),
+    credit_note         => $main::locale->text('Credit Note'),
+    invoice             => $main::locale->text('Invoice'),
+    packing_list        => $main::locale->text('Packing List'),
+    pick_list           => $main::locale->text('Pick List'),
+    proforma            => $main::locale->text('Proforma Invoice'),
+    purchase_order      => $main::locale->text('Purchase Order'),
+    request_quotation   => $main::locale->text('RFQ'),
+    sales_order         => $main::locale->text('Confirmation'),
+    sales_quotation     => $main::locale->text('Quotation'),
+    storno_invoice      => $main::locale->text('Storno Invoice'),
+    storno_packing_list => $main::locale->text('Storno Packing List'),
    );
  
    return $formname_translations{$formname}
@@ -2290,7 +2300,7 @@ sub create_links {
                  LEFT JOIN taxkeys tk ON (tk.chart_id = c.id)
                  WHERE c.link LIKE ?
                    AND (tk.id = (SELECT id FROM taxkeys WHERE taxkeys.chart_id = c.id AND startdate <= $transdate ORDER BY startdate DESC LIMIT 1)
-                    OR c.link LIKE '%_tax%')
+                    OR c.link LIKE '%_tax%' OR c.taxkey_id IS NULL)
                  ORDER BY c.accno|;
  
      $sth = $dbh->prepare($query);