X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=7c8b1e5f14384fe1637d60c7a0180a995e2f1e21;hb=480c67096c7aab3ccfe6b55e8d981975c7f08578;hp=f4a07f6674b29025799aafdebbcf6d02f4522c5f;hpb=599030d5e26bcef0f9850ddbbedba106ded70ebb;p=kivitendo-erp.git

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index f4a07f667..7c8b1e5f1 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -45,20 +45,27 @@ sub restore_form {
 sub build_std_url {
   $lxdebug->enter_sub();
 
-  my $url = "$form->{script}?";
-  my $first = 1;
+  my $script = $form->{script};
+
+  my @parts;
+
   foreach my $key ((qw(login password), @_)) {
     next unless ($key);
-    $url .= "&" unless ($first);
-    $first = 0;
 
-    if ($key =~ /=/) {
-      $url .= $key;
+    if ($key =~ /(.*?)=(.*)/) {
+      if ($1 eq 'script') {
+        $script = $2;
+      } else {
+        push @parts, $key;
+      }
+
     } else {
-      $url .= "${key}=" . E($form->{$key});
+      push @parts, "${key}=" . E($form->{$key});
     }
   }
 
+  my $url = "${script}?" . join('&', @parts);
+
   $lxdebug->leave_sub();
 
   return $url;
@@ -531,12 +538,16 @@ sub reformat_numbers {
 sub show_history {
 	$lxdebug->enter_sub();
 	my $dbh = $form->dbconnect(\%myconfig);
-	
+	my ($sort, $sortby) = split(/\-\-/, $form->{order});
+  $sort =~ s/.*\.(.*)/$1/;
+  
 	$form->{title} = $locale->text("History");
     $form->header();
     print $form->parse_html_template( "common/show_history", {
-    	"DATEN" => $form->get_history($dbh,$form->{input_name}),
-    	"SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0")
+    	"DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
+    	"SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"),
+      uc($sort) => 1,
+      uc($sort)."BY" => $sortby
     	} );
 	
 	$dbh->disconnect();
@@ -563,4 +574,24 @@ sub call_sub {
   $lxdebug->leave_sub();
 }
 
+sub show_vc_details {
+	$lxdebug->enter_sub();
+
+  $form->{vc} = $form->{vc} eq "customer" ? "customer" : "vendor";
+  $form->isblank("vc_id",
+                 $form->{vc} eq "customer" ?
+                 $locale->text("No customer has been selected yet.") :
+                 $locale->text("No vendor has been selected yet."));
+
+  Common->get_vc_details(\%myconfig, $form, $form->{vc}, $form->{vc_id});
+
+  $form->{title} = $form->{vc} eq "customer" ?
+    $locale->text("Customer details") : $locale->text("Vendor details");
+  $form->header();
+  print($form->parse_html_template("common/show_vc_details",
+                                   { "is_customer" => $form->{vc} eq "customer" }));
+
+	$lxdebug->leave_sub();
+}
+
 1;