X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcp.pl;h=8e31a8f1a588b7ea300f32f2aa65ef978c4a3f80;hb=1b3fe156b5ddfd588c1e55af5e21a36e84d9caf8;hp=7836eb2fc92e2f6bb707c985cffa7feef175ca31;hpb=72539cb39a3d19f930a8e0e41e46bf41afe9a8f1;p=kivitendo-erp.git

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index 7836eb2fc..8e31a8f1a 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -443,12 +443,12 @@ sub form_footer {
   $media = qq|
           <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
 
-  if ($myconfig{printer} && $latex) {
+  if ($myconfig{printer} && $latex_templates) {
     $media .= qq|
           <option value=printer $form->{OP}{printer}>|
       . $locale->text('Printer');
   }
-  if ($latex) {
+  if ($latex_templates) {
     $media .= qq|
           <option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
     $format .= qq|
@@ -474,7 +474,7 @@ sub form_footer {
 <input class=submit type=submit name=action value="|
     . $locale->text('Post') . qq|">|;
 
-  if ($latex) {
+  if ($latex_templates) {
     print qq|
 <input class=submit type=submit name=action value="|
       . $locale->text('Print') . qq|">|;
@@ -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;
@@ -716,10 +717,6 @@ sub print {
   $form->{company} = $myconfig{company};
   $form->{address} = $myconfig{address};
 
-  @a =
-    qw(name invnumber company address text_amount street zipcode city country memo);
-  $form->format_string(@a);
-
   $form->parse_template(\%myconfig, $userspath);
 
   if ($form->{media} ne 'screen') {
@@ -758,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"});