Kundenauftrag/Lieferantenbestellung: Wenn alle Positionen vollständig geliefert wurde...

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index f66ad04cfe78befc84f12ded5df3b7ebc3de0319..de5d6a2251e2fb71c059fc4fcb25fb9e43fc8584 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1935,12 +1935,37 @@ sub subtotal {
   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }
 

+sub check_delivered_flag {
+  $lxdebug->enter_sub();
+
+  if (($form->{type} ne 'sales_order') && ($form->{type} ne 'purchase_order')) {
+    return $lxdebug->leave_sub();
+  }
+
+  my $all_delivered = 0;
+
+  foreach my $i (1 .. $form->{rowcount}) {
+    next if (!$form->{"id_$i"});
+
+    if ($form->parse_amount(\%myconfig, $form->{"qty_$i"}) == $form->parse_amount(\%myconfig, $form->{"ship_$i"})) {
+      $all_delivered = 1;
+      next;
+    }
+
+    $all_delivered = 0;
+    last;
+  }
+
+  $form->{delivered} = 1 if $all_delivered;
+
+  $lxdebug->leave_sub();
+}
+

 sub save_and_close {
   $lxdebug->enter_sub();
 
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
 sub save_and_close {
   $lxdebug->enter_sub();
 
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 

-

   if ($form->{type} =~ /_order$/) {
     $form->isblank("transdate", $locale->text('Order Date missing!'));
   } else {
   if ($form->{type} =~ /_order$/) {
     $form->isblank("transdate", $locale->text('Order Date missing!'));
   } else {


@@ -1993,6 +2018,8 @@ sub save_and_close {
 
     $err = $locale->text('Cannot save order!');
 
 
     $err = $locale->text('Cannot save order!');
 

+    check_delivered_flag();
+

   } else {
     if ($form->{type} eq 'sales_quotation') {
       $form->{label} = $locale->text('Quotation');
   } else {
     if ($form->{type} eq 'sales_quotation') {
       $form->{label} = $locale->text('Quotation');


@@ -2091,6 +2118,8 @@ sub save {
 
     $err = $locale->text('Cannot save order!');
 
 
     $err = $locale->text('Cannot save order!');
 

+    check_delivered_flag();
+

   } else {
     if ($form->{type} eq 'sales_quotation') {
       $form->{label} = $locale->text('Quotation');
   } else {
     if ($form->{type} eq 'sales_quotation') {
       $form->{label} = $locale->text('Quotation');