Auth::ColumnInformation: beim Anlegen einmal fetchen

[mfinanz.git] / bin / mozilla / do.pl

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index b5015e781d0f954d654c072df172ef0d5c22c3ac..89d012e2b171fb668dae4092e4f5ff085fa51d50 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -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 {
 
@@ -741,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};
@@ -759,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();
 }
@@ -783,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!'));
@@ -828,7 +828,10 @@ sub invoice {
   }
 
   for my $i (1 .. $form->{rowcount}) {
+    map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice lastcost basefactor discount);
     # für bug 1284
+    # adds a customer/vendor discount, unless we have a workflow case
+    # CAVEAT: has to be done, after the above parse_amount
     unless ($form->{"ordnumber"}) {
       if ($form->{discount}) { # Falls wir einen Lieferanten-/Kundenrabatt haben
         # und rabattfähig sind, dann
@@ -837,7 +840,6 @@ sub invoice {
         }
       }
     }
-    map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice lastcost basefactor);
     $form->{"donumber_$i"} = $form->{donumber};
     $form->{"converted_from_delivery_order_items_id_$i"} = delete $form->{"delivery_order_items_id_$i"};
   }
@@ -1405,7 +1407,7 @@ sub transfer_in {
       update();
       $main::lxdebug->leave_sub();
 
-      ::end_of_request();
+      $::dispatcher->end_request;
     }
   }
 
@@ -1524,7 +1526,7 @@ sub transfer_out {
       update();
       $main::lxdebug->leave_sub();
 
-      ::end_of_request();
+      $::dispatcher->end_request;
     }
   }
   DO->transfer_in_out('direction' => 'out',
@@ -1791,11 +1793,16 @@ sub sort {
   my $form     = $main::form;
   my %temp_hash;
 
-  croak ("Delivery Order needs to be saved") unless $form->{id};
+  save(no_redirect => 1); # has to be done, at least for newly added positions
 
   # hashify partnumbers, positions. key is delivery_order_items_id
   for my $i (1 .. ($form->{rowcount}) ) {
     $temp_hash{$form->{"delivery_order_items_id_$i"}} = { runningnumber => $form->{"runningnumber_$i"}, partnumber => $form->{"partnumber_$i"} };
+    if ($form->{id} && $form->{"discount_$i"}) {
+      # prepare_order assumes a db value if there is a form->id and multiplies *100
+      # We hope for new controller code (no more format_amount/parse_amount distinction)
+      $form->{"discount_$i"} /=100;
+    }
   }
   # naturally sort partnumbers and get a sorted array of doi_ids
   my @sorted_doi_ids =  sort { Sort::Naturally::ncmp($temp_hash{$a}->{"partnumber"}, $temp_hash{$b}->{"partnumber"}) }  keys %temp_hash;
@@ -1807,6 +1814,12 @@ sub sort {
     $form->{"runningnumber_$temp_hash{$_}->{runningnumber}"} = $new_number;
     $new_number++;
   }
+  # all parse_amounts changes are in form (i.e. , to .) therefore we need
+  # another format_amount to change it back, for the next save ;-(
+  # works great except for row discounts (see above comment)
+  prepare_order();
+
+
     $main::lxdebug->leave_sub();
     save();
 }