X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/54e4131e091831e00a861fe2c4f53e344b87ddca..1d7e6dbbbb3cc5cfbe5ebf4bcf75b10bab6d17a7:/bin/mozilla/cp.pl

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index a80e8e176..8e31a8f1a 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -483,14 +483,7 @@ sub form_footer {
   print qq|
 <select name=format>$format</select>
 <select name=media>$media</select>
-|;
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
 
-  print qq|
   </form>
 
 </body>
@@ -603,7 +596,10 @@ sub update {
   }
 
   # recalculate
-  $amount = $form->{amount};
+
+  # Modified from $amount = $form->{amount} by J.Zach to update amount to total
+  # payment amount in Zahlungsausgang
+  $amount = 0;
   for $i (1 .. $form->{rowcount}) {
 
     map {
@@ -618,7 +614,9 @@ sub update {
         $form->{"paid_$i"} = $form->{"due_$i"};
       }
 
-      $amount -= $form->{"paid_$i"};
+      # Modified by J.Zach, see abovev
+      $amount += $form->{"paid_$i"}; 
+
     } else {
       $form->{"paid_$i"} = "";
     }
@@ -630,6 +628,9 @@ sub update {
 
   }
 
+  # Line added by J.Zach, see above
+  $form->{amount}=$amount; 
+
   &form_header;
   &list_invoices;
   &form_footer;
@@ -754,7 +755,7 @@ sub check_form {
   $form->{amount} = $amount;
 
   for $i (1 .. $form->{rowcount}) {
-    if ($form->{"paid_$i"}) {
+    if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
       $amount -= $form->parse_amount($myconfig, $form->{"paid_$i"});
 
       push(@{ $form->{paid} },      $form->{"paid_$i"});