Liste der Zahlungsein- und -ausgänge: Spalte "Referenz" mit Link zum Bearbeiten verse...

[kivitendo-erp.git] / bin / mozilla / cp.pl

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index b68865a..5ced174 100644 (file)
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -36,9 +36,14 @@ use SL::OP;
 use SL::IS;
 use SL::IR;
 
+use strict ("vars", "subs");
+#use warnings;
+
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/common.pl";
 
+our ($form, %myconfig, $lxdebug, $locale);
+
 1;
 
 # end of main
@@ -46,6 +51,8 @@ require "bin/mozilla/common.pl";
 sub payment {
   $lxdebug->enter_sub();
 
+  my (@curr);
+
   $form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP";
   $form->{arap} = lc $form->{ARAP};
 
@@ -107,6 +114,9 @@ sub payment {
 sub form_header {
   $lxdebug->enter_sub();
 
+  my ($vc, $vclabel, $allvc, $arap, $department, $exchangerate);
+  my ($jsscript, $button1, $button2, $onload);
+
   $vclabel = ucfirst $form->{vc};
   $vclabel = $locale->text($vclabel);
 
@@ -146,7 +156,7 @@ sub form_header {
     }
   }
 
-  foreach $item ($form->{vc}, account, currency, $form->{ARAP}, department) {
+  foreach my $item ($form->{vc}, "account", "currency", $form->{ARAP}, "department") {
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~
       s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
@@ -178,7 +188,7 @@ sub form_header {
            </tr>
 | if $form->{selectdepartment};
 
-  $form->{jsscript} = $jscalendar;
+  $form->{jsscript} = 1;
   $jsscript = "";
   if ($form->{jsscript}) {
 
@@ -278,12 +288,6 @@ sub form_header {
          <td align=right>
            <table>
              $department
-             <tr>
-               <th align=right nowrap>| . $locale->text($form->{ARAP}) . qq|</th>
-               <td colspan=3><select name=$form->{ARAP}>$form->{"select$form->{ARAP}"}</select>
-               </td>
-               <input type=hidden name="select$form->{ARAP}" value="$form->{"select$form->{ARAP}"}">
-             </tr>
              <tr>
                <th align=right nowrap>| . $locale->text('Account') . qq|</th>
                <td colspan=3><select name=account>$form->{selectaccount}</select>
@@ -306,9 +310,9 @@ sub form_header {
                <td colspan=3><input name=source value="$form->{source}" size=10></td>
              </tr>
              <tr>
-               <th align=right nowrap>| . $locale->text('Amount') . qq|</th>
-               <td colspan=3><input name=amount size=10 value=|
-    . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq| onBlur=\"check_right_number_format(this)\"></td>
+               <th align="right" nowrap>| . $locale->text('Amount') . qq|</th>
+               <td colspan="3"><input name="amount" size="10" value="|
+    . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq|" onBlur=\"check_right_number_format(this)\"></td>
              </tr>
            </table>
          </td>
@@ -326,6 +330,9 @@ $jsscript
 sub list_invoices {
   $lxdebug->enter_sub();
 
+  my (@column_index, %column_data, $colspan, $invoice);
+  my ($totalamount, $totaldue, $totalpaid);
+
   @column_index = qw(invnumber transdate amount due checked paid);
 
   $colspan = $#column_index + 1;
@@ -363,7 +370,9 @@ sub list_invoices {
         </tr>
 |;
 
-  for $i (1 .. $form->{rowcount}) {
+  for my $i (1 .. $form->{rowcount}) {
+
+    my $j = 0;
 
     map {
       $form->{"${_}_$i"} =
@@ -440,6 +449,8 @@ sub list_invoices {
 sub form_footer {
   $lxdebug->enter_sub();
 
+  my ($media, $format, $latex_templates);
+
   $form->{DF}{ $form->{format} } = "selected";
   $form->{OP}{ $form->{media} }  = "selected";
 
@@ -500,6 +511,8 @@ sub update {
 
   my ($new_name_selected) = @_;
 
+  my ($buysell, $newvc, $updated, $exchangerate, $amount);
+
   if ($form->{vc} eq 'customer') {
     $buysell = "buy";
   } else {
@@ -574,8 +587,8 @@ sub update {
 
     $form->{queued} = "";
 
-    $i = 0;
-    foreach $ref (@{ $form->{PR} }) {
+    my $i = 0;
+    foreach my $ref (@{ $form->{PR} }) {
       $i++;
       $form->{"id_$i"}        = $ref->{id};
       $form->{"invnumber_$i"} = $ref->{invnumber};
@@ -602,7 +615,7 @@ sub update {
   # Modified from $amount = $form->{amount} by J.Zach to update amount to total
   # payment amount in Zahlungsausgang
   $amount = 0;
-  for $i (1 .. $form->{rowcount}) {
+  for my $i (1 .. $form->{rowcount}) {
 
     map {
       $form->{"${_}_$i"} =
@@ -650,8 +663,8 @@ sub post {
       unless $form->{exchangerate};
   }
 
-  $msg1 = "$form->{origtitle} posted!";
-  $msg2 = "Cannot post $form->{origtitle}!";
+  my $msg1 = "$form->{origtitle} posted!";
+  my $msg2 = "Cannot post $form->{origtitle}!";
 
   # $locale->text('Payment posted!')
   # $locale->text('Receipt posted!')
@@ -668,13 +681,15 @@ sub post {
 sub print {
   $lxdebug->enter_sub();
 
+  my ($whole, $check, %queued, $spool, $filename, $userspath);
+
   &check_form;
 
   ($whole, $form->{decimal}) = split(/\./, $form->{amount});
 
   $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
 
-  $form->{decimal} .= "00";
+  #$form->{decimal} .= "00";
   $form->{decimal} = substr($form->{decimal}, 0, 2);
 
   $check = new CP $myconfig{countrycode};
@@ -695,11 +710,13 @@ sub print {
     $form->{pdf} = 1;
   }
 
+  delete $form->{OUT};
+
   if ($form->{media} eq 'printer') {
     $form->{OUT} = "| $myconfig{printer}";
   }
   if ($form->{media} eq 'queue') {
-    %queued = split / /, $form->{queued};
+    %queued = map { s|.*/|| } split / /, $form->{queued};
 
     if ($filename = $queued{ $form->{formname} }) {
       unlink "$spool/$filename";
@@ -738,6 +755,8 @@ sub vendor_details { IR->vendor_details(\%myconfig, \%$form) }
 sub check_form {
   $lxdebug->enter_sub();
 
+  my ($closedto, $datepaid, $amount);
+
   &check_name($form->{vc});
 
   if ($form->{currency} ne $form->{oldcurrency}) {
@@ -745,6 +764,7 @@ sub check_form {
     exit;
   }
 
+  $form->error($locale->text('Zero amount posting!')) if !$form->parse_amount(\%myconfig, $form->{amount});
   $form->error($locale->text('Date missing!')) unless $form->{datepaid};
 
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
@@ -756,9 +776,9 @@ sub check_form {
   $amount = $form->parse_amount(\%myconfig, $form->{amount});
   $form->{amount} = $amount;
 
-  for $i (1 .. $form->{rowcount}) {
+  for my $i (1 .. $form->{rowcount}) {
     if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
-      $amount -= $form->parse_amount($myconfig, $form->{"paid_$i"});
+      $amount -= $form->parse_amount(\%myconfig, $form->{"paid_$i"});
 
       push(@{ $form->{paid} },      $form->{"paid_$i"});
       push(@{ $form->{due} },       $form->{"due_$i"});