X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4493d1eb7845b7eba868f0a16ec2e623dcf1d591..fbbfd3ce7bdc893ac30638cce1427938276b659b:/bin/mozilla/do.pl

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 51986b0b7..7e3ccb4de 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -40,7 +40,7 @@ use SL::DB::DeliveryOrder;
 use SL::DO;
 use SL::IR;
 use SL::IS;
-use SL::MoreCommon qw(ary_diff);
+use SL::MoreCommon qw(ary_diff restore_form save_form);
 use SL::ReportGenerator;
 use SL::WH;
 use Sort::Naturally ();
@@ -429,7 +429,7 @@ sub update_delivery_order {
       if ($rows > 1) {
 
         select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"});
-        ::end_of_request();
+        $::dispatcher->end_request;
 
       } else {
 
@@ -558,7 +558,7 @@ sub orders {
   my @hidden_variables = map { "l_${_}" } @columns;
   push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber
                                           transaction_description transdatefrom transdateto reqdatefrom reqdateto
-                                          type vc employee_id salesman_id project_id
+                                          type vc employee_id salesman_id project_id parts_partnumber parts_description
                                           insertdatefrom insertdateto business_id);
 
   my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
@@ -629,6 +629,12 @@ sub orders {
   if ($form->{transaction_description}) {
     push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
   }
+  if ($form->{parts_description}) {
+    push @options, $locale->text('Part Description') . " : $form->{parts_description}";
+  }
+  if ($form->{parts_partnumber}) {
+    push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}";
+  }
   if ( $form->{transdatefrom} or $form->{transdateto} ) {
     push @options, $locale->text('Delivery Order Date');
     push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1)     if $form->{transdatefrom};
@@ -735,7 +741,7 @@ sub save {
   # if the name changed get new values
   if (check_name($form->{vc})) {
     update();
-    ::end_of_request();
+    $::dispatcher->end_request;
   }
 
   $form->{id} = 0 if $form->{saveasnew};
@@ -753,7 +759,7 @@ sub save {
   if (!$params{no_redirect} && !$form->{print_and_save}) {
     delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
     edit();
-    ::end_of_request();
+    $::dispatcher->end_request;
   }
   $main::lxdebug->leave_sub();
 }
@@ -777,7 +783,7 @@ sub delete {
     # /saving the history
 
     $form->info($locale->text('Delivery Order deleted!'));
-    ::end_of_request();
+    $::dispatcher->end_request;
   }
 
   $form->error($locale->text('Cannot delete delivery order!'));
@@ -963,7 +969,8 @@ sub invoice_multi {
     IS->get_customer(\%myconfig, \%$form);
     $vc_discount = $form->{customer_discount};
   }
-  restore_form($saved_form);
+  # use payment terms from customer or vendor
+  restore_form($saved_form,0,qw(payment_id));
 
   $form->{rowcount} = 0;
   foreach my $ref (@{ $form->{form_details} }) {
@@ -1398,7 +1405,7 @@ sub transfer_in {
       update();
       $main::lxdebug->leave_sub();
 
-      ::end_of_request();
+      $::dispatcher->end_request;
     }
   }
 
@@ -1517,7 +1524,7 @@ sub transfer_out {
       update();
       $main::lxdebug->leave_sub();
 
-      ::end_of_request();
+      $::dispatcher->end_request;
     }
   }
   DO->transfer_in_out('direction' => 'out',