X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/da804bf2a76bec9da604c00208f789a9a312686b..50365526:/bin/mozilla/do.pl

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index f7e859e5b..2b1bdd948 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -48,8 +48,6 @@ require "bin/mozilla/reportgenerator.pl";
 
 use strict;
 
-my $print_post;
-
 1;
 
 # end of main
@@ -367,7 +365,7 @@ sub update_delivery_order {
       if ($rows > 1) {
 
         select_item();
-        exit;
+        ::end_of_request();
 
       } else {
 
@@ -553,6 +551,7 @@ sub orders {
                        'attachment_basename'  => $attachment_basename . strftime('_%Y%m%d', localtime time),
     );
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   # add sort and escape callback, this one we use for the add sub
   $form->{callback} = $href .= "&sort=$form->{sort}";
@@ -619,7 +618,7 @@ sub save {
   # if the name changed get new values
   if (check_name($form->{vc})) {
     update();
-    exit;
+    ::end_of_request();
   }
 
   $form->{id} = 0 if $form->{saveasnew};
@@ -639,7 +638,7 @@ sub save {
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|donumber_| . $form->{donumber};
     $form->{addition} = "SAVED";
-    $form->save_history($form->dbconnect(\%myconfig));
+    $form->save_history;
   }
   # /saving the history
 
@@ -647,7 +646,7 @@ sub save {
   if(!$form->{print_and_save}) {
     set_headings("edit");
     update();
-    exit;
+    ::end_of_request();
   }
   $main::lxdebug->leave_sub();
 }
@@ -685,12 +684,12 @@ sub delete_delivery_order {
     if(!exists $form->{addition}) {
       $form->{snumbers} = qq|donumber_| . $form->{donumber};
       $form->{addition} = "DELETED";
-      $form->save_history($form->dbconnect(\%myconfig));
+      $form->save_history;
     }
     # /saving the history
 
     $form->info($locale->text('Delivery Order deleted!'));
-    exit();
+    ::end_of_request();
   }
 
   $form->error($locale->text('Cannot delete delivery order!'));
@@ -734,7 +733,7 @@ sub invoice {
 
   for my $i (1 .. $form->{rowcount}) {
     # für bug 1284
-    if ($form->{discount}){ # Falls wir einen Kundenrabatt haben 
+    if ($form->{discount}){ # Falls wir einen Kundenrabatt haben
       # und keinen anderen discount wert an $i ...
       $form->{"discount_$i"} ||= $form->{discount}*100; # ... nehmen wir den kundenrabatt
     }
@@ -905,8 +904,6 @@ sub e_mail {
 
   $form->{print_and_save} = 1;
 
-  $print_post = 1;
-
   my $saved_form = save_form();
 
   save();
@@ -942,7 +939,7 @@ sub calculate_stock_in_out {
                                             'amount_unit' => $all_units->{$form->{"partunit_$i"}}->{base_unit},
                                             'conv_units'  => 'convertible_not_smaller',
                                             'max_places'  => 2);
-  $content    .= qq| <input type="button" onclick="open_stock_in_out_window('${in_out}', $i);" value="?">|;
+  $content     = qq|<span id="stock_in_out_qty_display_${i}">${content}</span> <input type="button" onclick="open_stock_in_out_window('${in_out}', $i);" value="?">|;
 
   $main::lxdebug->leave_sub();
 
@@ -1064,6 +1061,18 @@ sub display_stock_in_form {
   $main::lxdebug->leave_sub();
 }
 
+sub _stock_in_out_set_qty_display {
+  my $stock_info       = shift;
+  my $form             = $::form;
+  my $all_units        = AM->retrieve_all_units();
+  my $sum              = AM->sum_with_unit(map { $_->{qty}, $_->{unit} } @{ $stock_info });
+  $form->{qty_display} = $form->format_amount_units(amount      => $sum * 1,
+                                                    part_unit   => $form->{partunit},
+                                                    amount_unit => $all_units->{ $form->{partunit} }->{base_unit},
+                                                    conv_units  => 'convertible_not_smaller',
+                                                    max_places  => 2);
+}
+
 sub set_stock_in {
   $main::lxdebug->enter_sub();
 
@@ -1082,6 +1091,8 @@ sub set_stock_in {
 
   $form->{stock} = YAML::Dump($stock_info);
 
+  _stock_in_out_set_qty_display($stock_info);
+
   $form->header();
   print $form->parse_html_template('do/set_stock_in_out');
 
@@ -1175,6 +1186,8 @@ sub set_stock_out {
     stock_in_out_form();
 
   } else {
+    _stock_in_out_set_qty_display($stock_info);
+
     $form->header();
     print $form->parse_html_template('do/set_stock_in_out');
   }
@@ -1232,7 +1245,7 @@ sub transfer_in {
       update();
       $main::lxdebug->leave_sub();
 
-      exit 0;
+      ::end_of_request();
     }
   }
 
@@ -1346,7 +1359,7 @@ sub transfer_out {
       update();
       $main::lxdebug->leave_sub();
 
-      exit 0;
+      ::end_of_request();
     }
   }