X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fdo.pl;h=25020a09cc595253f659d5253b69c7691ec1efbd;hb=469ca9fc3cac624073270fc3217766dbb7aba253;hp=f06bd32565fb2a7ee840adfae6f4d924706e2eef;hpb=7f109935fea293ad71b68263a2f13bd1730e9b73;p=kivitendo-erp.git

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index f06bd3256..25020a09c 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -258,27 +258,27 @@ sub form_header {
   # use JavaScript Calendar or not
   $form->{jsscript} = 1;
 
-  #write Trigger
-  my $jsscript = Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1", "reqdate", "BL", "trigger2");
-
   my @old_project_ids = ($form->{"globalproject_id"});
   map({ push(@old_project_ids, $form->{"project_id_$_"})
           if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
 
   my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
-  $form->get_lists("shipto"         => "ALL_SHIPTO",
-                   "projects"       => {
+  $form->get_lists("projects"       => {
                      "key"          => "ALL_PROJECTS",
                      "all"          => 0,
                      "old_id"       => \@old_project_ids
                    },
-                   "employees"      => "ALL_EMPLOYEES",
-                   "salesmen"       => "ALL_SALESMEN",
                    $vc              => "ALL_VC",
                    "price_factors"  => "ALL_PRICE_FACTORS",
                    "departments"    => "ALL_DEPARTMENTS",
                    "business_types" => "ALL_BUSINESS_TYPES",
     );
+
+  $::form->{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{employee_id},  deleted => 0 ] ]);
+  $::form->{ALL_SALESMEN}          = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id},  deleted => 0 ] ]);
+  $::form->{ALL_SHIPTO}            = SL::DB::Manager::Shipto->get_all(query => [
+    or => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
+  ]);
   $::form->{ALL_CONTACTS}          = SL::DB::Manager::Contact->get_all(query => [
     or => [
       cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
@@ -612,8 +612,7 @@ sub orders {
     };
 
     $row->{donumber}->{link}  = $edit_url       . "&id=" . E($dord->{id})      . "&callback=${callback}";
-    $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id})   . "&callback=${callback}";
-
+    $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id})   . "&callback=${callback}" if $dord->{oe_id};
     $report->add_data($row);
 
     $idx++;