X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/18407da47add04b0e16722edcc181a99ef06a241..8f56a7e6ca6a5495f6b3bb1b7da44715c5a6389d:/bin/mozilla/common.pl

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index 3cb850d98..c88efe875 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -11,7 +11,7 @@
 
 use SL::Common;
 use SL::DB::Helper::Mappings;
-use SL::DBUtils;
+use SL::DBUtils qw(do_query);
 use SL::Form;
 use SL::MoreCommon;
 use SL::Helper::Flash;
@@ -196,7 +196,7 @@ sub part_selection_internal {
   $form->{formname} ||= 'Form';
 
   $form->{title} = $locale->text("Select a part");
-  $form->header();
+  $form->header(no_layout => 1);
   print $form->parse_html_template("generic/part_selection", { "HEADER" => \@header,
                                                                "PARTS"  => $parts, });
 
@@ -244,7 +244,7 @@ sub delivery_customer_selection {
         @header_sort);
 
   $form->{"title"} = $locale->text("Select a Customer");
-  $form->header();
+  $form->header(no_layout => 1);
   print $form->parse_html_template("generic/select_delivery_customer", { "HEADER"   => \@header,
                                                                          "DELIVERY" => $delivery, });
 
@@ -292,7 +292,7 @@ sub vendor_selection {
         @header_sort);
 
   $form->{"title"} = $locale->text("Select a Customer");
-  $form->header();
+  $form->header(no_layout => 1);
   print $form->parse_html_template("generic/select_vendor", { "HEADER" => \@header,
                                                               "VENDOR" => $vendor, });
 
@@ -334,7 +334,7 @@ sub calculate_qty {
 
   $form->{formel} = $formel;
   $form->{title}  = $locale->text("Please enter values");
-  $form->header();
+  $form->header(no_layout => 1);
   print $form->parse_html_template("generic/calculate_qty", { "HEADER"    => \@header,
                                                               "VARIABLES" => \@variable, });
 
@@ -343,21 +343,6 @@ sub calculate_qty {
 
 # -------------------------------------------------------------------------
 
-sub set_longdescription {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  $form->{title} = $locale->text("Enter longdescription");
-  $form->header();
-  print $form->parse_html_template("generic/set_longdescription");
-
-  $main::lxdebug->leave_sub();
-}
-
-# -------------------------------------------------------------------------
-
 sub H {
   return $main::locale->quote_special_chars('HTML', $_[0]);
 }
@@ -399,12 +384,24 @@ sub show_history {
   $sort =~ s/.*\.(.*)/$1/;
 
   $form->{title} = $locale->text("History");
-  $form->header();
+  $form->header(no_layout => 1);
+
+  my $callback = build_std_url(qw(action longdescription trans_id_type input_name));
+  my $restriction;
+  if ( $form->{trans_id_type} eq 'glid' ) {
+    $restriction = "AND ( snumbers LIKE 'invnumber%' OR what_done LIKE '%Buchungsnummer%' OR snumbers LIKE 'gltransaction%' ) ";
+  } elsif ( $form->{trans_id_type} eq 'id' ) {
+    $restriction = " AND ( snumbers NOT LIKE 'invnumber_%' AND snumbers NOT LIKE 'gltransaction%' AND (what_done NOT LIKE '%Buchungsnummer%' OR what_done IS null))";
+  } else {
+    $restriction = '';
+  };
+
   print $form->parse_html_template( "common/show_history", {
-    "DATEN"        => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
+    "DATEN"        => $form->get_history($dbh,$form->{input_name},$restriction,$form->{order}),
     "SUCCESS"      => ($form->get_history($dbh,$form->{input_name}) ne "0"),
     uc($sort)      => 1,
-    uc($sort)."BY" => $sortby
+    uc($sort)."BY" => $sortby,
+    callback       => $callback,
   } );
 
   $dbh->disconnect();
@@ -455,10 +452,11 @@ sub show_vc_details {
                  $locale->text("No vendor has been selected yet."));
 
   Common->get_vc_details(\%myconfig, $form, $form->{vc}, $form->{vc_id});
+  $form->{discount_as_percent} = $form->format_amount(\%::myconfig, $form->parse_amount(\%::myconfig, $form->{discount}) * 100, 2);
 
   $form->{title} = $form->{vc} eq "customer" ?
     $locale->text("Customer details") : $locale->text("Vendor details");
-  $form->header();
+  $form->header(no_layout => 1);
   print $form->parse_html_template("common/show_vc_details", { "is_customer" => $form->{vc} eq "customer" });
 
   $main::lxdebug->leave_sub();
@@ -510,6 +508,10 @@ sub mark_as_paid_common {
       $referer =~ /^(.*)\?action\=[^\&]*(\&.*)$/;
       $script = $1;
       $callback = $2;
+    } elsif ($referer =~ /RESTORE_FORM_FROM_SESSION_ID/){
+      $referer =~ /^(.*)\?RESTORE_FORM_FROM_SESSION_ID\=(.*)$/;
+      $script = $1;
+      $callback = "";
     } else {
       $script = $referer;
       $callback = "";