X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcp.pl;h=a70c32eebdcd2b2a74882e0053f4d0bec1567c57;hb=6e08e45474de9b64b0cdd310e0e93d8a998587e8;hp=d8890a10e95effad6be614cf9346da022226d164;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index d8890a10e..a70c32eeb 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -31,64 +31,94 @@
 #
 #======================================================================
 
-
 use SL::CP;
-use SL::OP;
 use SL::IS;
 use SL::IR;
+use SL::AR;
+use SL::AP;
+use Data::Dumper;
+use strict;
+#use warnings;
+
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
 
-require "$form->{path}/arap.pl";
+our ($form, %myconfig, $lxdebug, $locale, $auth);
 
 1;
-# end of main
 
+# end of main
 
 sub payment {
   $lxdebug->enter_sub();
 
-  
+  $auth->assert('cash');
+
+  my (@curr);
+
   $form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP";
   $form->{arap} = lc $form->{ARAP};
 
   # setup customer/vendor selection for open invoices
   if ($form->{all_vc}) {
+    # Dieser Zweig funktioniert derzeit NIE. Ggf. ganz raus oder
+    # alle offenen Zahlungen wieder korrekt anzeigen. jb 12.10.2010
     $form->all_vc(\%myconfig, $form->{vc}, $form->{ARAP});
   } else {
     CP->get_openvc(\%myconfig, \%$form);
   }
-
+  # Auswahlliste für vc zusammenbauen
+  # Erweiterung für schliessende option und erweiterung um value
+  # für bugfix 1771 (doppelte Leerzeichen werden nicht 'gepostet')
   $form->{"select$form->{vc}"} = "";
-  
-  if ($form->{"all_$form->{vc}"}) {
-    $form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id};
-    map { $form->{"select$form->{vc}"} .= "<option>$_->{name}--$_->{id}\n" } @{ $form->{"all_$form->{vc}"} };
-  }
 
-  # departments
-  if (@{ $form->{all_departments} }) { 
-    $form->{selectdepartment} = "<option>\n";
-    $form->{department} = "$form->{department}--$form->{department_id}";
+  $form->{selectcustomer} .= "<option value=\"\"></option>\n" if $form->{vc} eq "customer";
 
-    map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} });
+  if ($form->{"all_$form->{vc}"}) {
+    # s.o. jb 12.10.2010
+    $form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id};
+    map { $form->{"select$form->{vc}"} .= "<option value=\"$_->{name}--$_->{id}\">$_->{name}--$_->{id}</option>\n" }
+      @{ $form->{"all_$form->{vc}"} };
   }
-
   CP->paymentaccounts(\%myconfig, \%$form);
 
+  # Standard Konto für Umlaufvermögen
+  my $accno_arap = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
+  # Entsprechend präventiv die Auswahlliste für Kontonummer
+  # auch mit value= zusammenbauen (s.a. oben bugfix 1771)
+  # Wichtig: Auch das Template anpassen, damit hidden input korrekt die "
+  # escaped.
   $form->{selectaccount} = "";
   $form->{"select$form->{ARAP}"} = "";
 
-  map { $form->{selectaccount} .= "<option>$_->{accno}--$_->{description}\n" } @{ $form->{PR}{"$form->{ARAP}_paid"} };
-  map { $form->{"select$form->{ARAP}"} .= "<option>$_->{accno}--$_->{description}\n" } @{ $form->{PR}{$form->{ARAP}} };
+  map { $form->{selectaccount} .= "<option value=\"$_->{accno}--$_->{description}\">$_->{accno}--$_->{description}</option>\n";
+        $form->{account}        = "$_->{accno}--$_->{description}" if ($_->{accno} eq $accno_arap) } @{ $form->{PR}{"$form->{ARAP}_paid"} };
+
+  # Braucht man das hier überhaupt? Erstmal auskommentieren .. jan 18.12.2010
+  #  map {
+  #    $form->{"select$form->{ARAP}"} .=
+  #      "<option>$_->{accno}--$_->{description}\n"
+  #  } @{ $form->{PR}{ $form->{ARAP} } };
+  # ENDE LOESCHMICH in 2012
 
   # currencies
-  @curr = split /:/, $form->{currencies};
+  # oldcurrency ist zwar noch hier als fragment enthalten, wird aber bei
+  # der aktualisierung der form auch nicht mitübernommen. das konzept
+  # old_$FOO habe ich auch noch nicht verstanden ...
+  # Ok. Wenn currency übernommen werden, dann in callback-string über-
+  # geben und hier reinparsen, oder besser multibox oder html auslagern?
+  # Antwort: form->currency wird mit oldcurrency oder curr[0] überschrieben
+  # Wofür macht das Sinn?
+  @curr = split(/:/, $form->{currencies});
   chomp $curr[0];
-  $form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} = $curr[0];
+  $form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} =
+    $curr[0];
 
+  # Entsprechend präventiv die Auswahlliste für Währungen
+  # auch mit value= zusammenbauen (s.a. oben bugfix 1771)
   $form->{selectcurrency} = "";
-  map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
+  map { $form->{selectcurrency} .= "<option value=\"$_\">$_</option>\n" } @curr;
 
-  $form->{media} = "screen";
 
   &form_header;
   &form_footer;
@@ -96,380 +126,94 @@ sub payment {
   $lxdebug->leave_sub();
 }
 
-
-
 sub form_header {
-  $lxdebug->enter_sub();
+  $lxdebug->enter_sub;
 
+  $auth->assert('cash');
 
-  $vclabel = ucfirst $form->{vc};
-  $vclabel = $locale->text($vclabel);
-  
-  if ($form->{type} eq 'receipt') {
-    $form->{title} = $locale->text('Receipt');
-    $form->{origtitle} = "Receipt";
-  }
-  if ($form->{type} eq 'check') {
-    $form->{title} = $locale->text('Payment');
-    $form->{origtitle} = "Payment";
-  }
+  my ($vc, $arap, $exchangerate);
 
-# $locale->text('Customer')
-# $locale->text('Vendor')
-
-  if ($form->{$form->{vc}} eq "") {
+  if ($form->{ $form->{vc} } eq "") {
     map { $form->{"addr$_"} = "" } (1 .. 4);
   }
 
-  if ($form->{currency} ne $form->{defaultcurrency}) {
-    $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate});
-    if ($form->{forex}) {
-      $exchangerate = qq|
- 	      <tr>
-		<th align=right nowrap>|.$locale->text('Exchangerate').qq|</th>
-		<td colspan=3><input type=hidden name=exchangerate size=10 value=$form->{exchangerate}>$form->{exchangerate}</td>
-	      </tr>
-|;
-    } else {
-      $exchangerate = qq|
- 	      <tr>
-		<th align=right nowrap>|.$locale->text('Exchangerate').qq|</th>
-		<td colspan=3><input name=exchangerate size=10 value=$form->{exchangerate}></td>
-	      </tr>
-|;
-    }
+  # sometimes it happens that values in customer arrive without the signs '--'
+  # but in order to select the right option field we need values with '--'
+  if ($form->{vc} eq "customer"){
+    my ($customername) = split /--/, $form->{ $form->{vc} };
+    $form->{ $form->{vc} } = $customername . "--" . $form->{customer_id};
   }
-
-  foreach $item ($form->{vc}, account, currency, $form->{ARAP}, department) {
+  # bugfix 1771
+  # geändert von <option>asdf--2929
+  # nach:
+  #              <option value="asdf--2929">asdf--2929</option>
+  # offen: $form->{ARAP} kann raus?
+  for my $item ($form->{vc}, "account", "currency", $form->{ARAP}) {
     $form->{"select$item"} =~ s/ selected//;
-    $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
+    $form->{"select$item"} =~ s/option value="\Q$form->{$item}\E">\Q$form->{$item}\E/option selected value="$form->{$item}">$form->{$item}/;
   }
 
-  $vc = ($form->{"select$form->{vc}"}) ? qq|<select name=$form->{vc}>$form->{"select$form->{vc}"}\n</select>| : qq|<input name=$form->{vc} size=35 value="$form->{$form->{vc}}">|;
+  $vc =
+    ($form->{"select$form->{vc}"})
+    ? qq|<select name=$form->{vc}>$form->{"select$form->{vc}"}\n</select>|
+    : qq|<input name=$form->{vc} size=35 value="$form->{$form->{vc}}">|;
+
+  $form->{openinvoices} = $form->{all_vc} ? "" : 1;
+
+  # $locale->text('AR')
+  # $locale->text('AP')
 
-  if ($form->{all_vc}) {
-    $allvc = "checked";
-    $form->{openinvoices} = "";
-  } else {
-    $allvc = "";
-    $form->{openinvoices} = 1;
-  }
-  
-# $locale->text('AR')
-# $locale->text('AP')
-
-  $department = qq|
-              <tr>
-	        <th align="right" nowrap>|.$locale->text('Department').qq|</th>
-		<td><select name=department>$form->{selectdepartment}</select>
-		<input type=hidden name=selectdepartment value="$form->{selectdepartment}">
-
-	      </td>
-	    </tr>
-| if $form->{selectdepartment};
-
-  $form->{jsscript} = $jscalendar;
-  $jsscript = "";    
-  if ($form->{jsscript}) 
-  {
-    # with JavaScript Calendar
-    $button1 = qq|
-       <td><input name=datepaid id=datepaid size=11 title="$myconfig{dateformat}" value="$form->{datepaid}">
-       <input type=button name=datepaid id="trigger1" value=|.$locale->text('button').qq|></td>
-       |;
-      #write Trigger
-      $jsscript = Form->write_trigger(\%myconfig,"1","datepaid","BL","trigger1","","","");
-   }
-   else
-   {
-      # without JavaScript Calendar
-      $button1 = qq|
-                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
-    }
- 
   $form->header;
 
   $arap = lc $form->{ARAP};
 
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
-<input type=hidden name=closedto value=$form->{closedto}>
-<input type=hidden name=vc value=$form->{vc}>
-<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=formname value=$form->{type}>
-<input type=hidden name=queued value="$form->{queued}">
-<input type=hidden name=arap value=$arap>
-<input type=hidden name=ARAP value=$form->{ARAP}>
-<input type=hidden name=openinvoices value=$form->{openinvoices}>
-<input type=hidden name=title value="$form->{title}">
-<input type=hidden name=origtitle value="$form->{origtitle}">
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr valign=top>
-	  <td>
-	    <table>
-	      <tr>
-	        <td align=right>
-		<input name=all_vc type=checkbox style=checkbox value=Y $allvc>
-		<input type=hidden name="oldall_vc" value="$form->{all_vc}"></td>
-		<th align=left>|.$locale->text('All').qq|</th>
-	      </tr>
-	      <tr>
-		<th align=right>$vclabel</th>
-		<td>$vc</td>
-                <input type=hidden name="select$form->{vc}" value="$form->{"select$form->{vc}"}">
-                <input type=hidden name="$form->{vc}_id" value=$form->{"$form->{vc}_id"}>
-		<input type=hidden name="old$form->{vc}" value="$form->{"old$form->{vc}"}">
-	      </tr>
-	      <tr valign=top>
-		<th align=right nowrap>|.$locale->text('Address').qq|</th>
-		<td colspan=2>
-		  <table>
-		    <tr>
-		      <td>$form->{street}</td>
-		    </tr>
-		    <tr>
-		      <td>$form->{zipcode}</td>
-		    </tr>
-		    <tr>
-		      <td>$form->{city}</td>
-		    </tr>
-		    <tr>
-		      <td>$form->{country}</td>
-		    </tr>
-		  </table>
-		</td>
-		<input type=hidden name=street value="$form->{street}">
-		<input type=hidden name=zipcode value="$form->{zipcode}">
-		<input type=hidden name=city value="$form->{city}">
-		<input type=hidden name=country value="$form->{country}">
-	      </tr>
-	      <tr>
-		<th align=right>|.$locale->text('Memo').qq|</th>
-		<td colspan=2><input name="memo" size=30 value="$form->{memo}"></td>
-	      </tr>
-	    </table>
-	  </td>
-	  <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>
-		<input type=hidden name=selectaccount value="$form->{selectaccount}">
-		</td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>|.$locale->text('Date').qq|</th>
-                $button1
-	      </tr>
-	      <tr>
-		<th align=right nowrap>|.$locale->text('Currency').qq|</th>
-		<td><select name=currency>$form->{selectcurrency}</select></td>
-		<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
-		<input type=hidden name=oldcurrency value=$form->{oldcurrency}>
-	      </tr>
-	      $exchangerate
-	      <tr>
-		<th align=right nowrap>|.$locale->text('Source').qq|</th>
-		<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|></td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  
-$jsscript
-|;
+  print $::form->parse_html_template('cp/form_header', {
+    is_customer => $form->{vc}   eq 'customer',
+    is_receipt  => $form->{type} eq 'receipt',
+    arap        => $arap,
+    vccontent   => $vc,
+  });
 
-  $lxdebug->leave_sub();
+  $lxdebug->leave_sub;
 }
 
-
 sub list_invoices {
-  $lxdebug->enter_sub();
-
-
-  @column_index = qw(invnumber transdate amount due checked paid);
-  
-  $colspan = $#column_index + 1;
-
-  $invoice = $locale->text('Invoices');
-  
-  print qq|
-  <input type=hidden name=column_index value="id @column_index">
-  <tr>
-    <td>
-      <table width=100%>
-	<tr>
-	  <th class=listheading colspan=$colspan>$invoice</th>
-	</tr>
-|;
-
-  $column_data{invnumber} = qq|<th nowrap class=listheading>|.$locale->text('Invoice')."</th>";
-  $column_data{transdate} = qq|<th nowrap class=listheading>|.$locale->text('Date')."</th>";
-  $column_data{amount} = qq|<th nowrap class=listheading>|.$locale->text('Amount')."</th>";
-  $column_data{due} = qq|<th nowrap class=listheading>|.$locale->text('Due')."</th>";
-  $column_data{paid} = qq|<th nowrap class=listheading>|.$locale->text('Amount')."</th>";
-  $column_data{checked} = qq|<th nowrap class=listheading>|.$locale->text('Select')."</th>";
-  
-  print qq|
-        <tr>
-|;
-  map { print "$column_data{$_}\n" } @column_index;
-  print qq|
-        </tr>
-|;
-
-  for $i (1 .. $form->{rowcount}) {
-
-    map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(amount due paid);
-    
-    $totalamount += $form->{"amount_$i"};
-    $totaldue += $form->{"due_$i"};
-    $totalpaid += $form->{"paid_$i"};
-
-    map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(amount due paid);
-
-    $column_data{invnumber} = qq|<td>$form->{"invnumber_$i"}</td>
-      <input type=hidden name="invnumber_$i" value="$form->{"invnumber_$i"}">
-      <input type=hidden name="id_$i" value=$form->{"id_$i"}>|;
-    $column_data{transdate} = qq|<td width=15%>$form->{"transdate_$i"}</td>
-      <input type=hidden name="transdate_$i" value=$form->{"transdate_$i"}>|;
-    $column_data{amount} = qq|<td align=right width=15%>$form->{"amount_$i"}</td>
-      <input type=hidden name="amount_$i" value=$form->{"amount_$i"}>|;
-    $column_data{due} = qq|<td align=right width=15%>$form->{"due_$i"}</td>
-      <input type=hidden name="due_$i" value=$form->{"due_$i"}>|;
-
-    $column_data{paid} = qq|<td align=right width=15%><input name="paid_$i" size=10 value=$form->{"paid_$i"}></td>|;
-
-    $form->{"checked_$i"} = ($form->{"checked_$i"}) ? "checked" : "";
-    $column_data{checked} = qq|<td align=center width=10%><input name="checked_$i" type=checkbox style=checkbox $form->{"checked_$i"}></td>|;
-
-    $j++; $j %= 2;
-    print qq|
-	<tr class=listrow$j>
-|;
-    map { print "$column_data{$_}\n" } @column_index;
-    print qq|
-        </tr>
-|;
+  $::lxdebug->enter_sub;
+  $::auth->assert('cash');
+
+  my @columns = qw(amount due paid invnumber id transdate checked);
+  my (@invoices, %total);
+  for my $i (1 .. $::form->{rowcount}) {
+    push @invoices, +{ map { $_ => $::form->{"$_\_$i"} } @columns };
+    $total{$_} += $invoices[-1]{$_} = $::form->parse_amount(\%::myconfig, $invoices[-1]{$_}) for qw(amount due paid);
   }
 
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
-
-  $column_data{amount} = qq|<th class=listtotal align=right>|.$form->format_amount(\%myconfig, $totalamount, 2, "&nbsp;").qq|</th>|;
-  $column_data{due} = qq|<th class=listtotal align=right>|.$form->format_amount(\%myconfig, $totaldue, 2, "&nbsp;").qq|</th>|;
-  $column_data{paid} = qq|<th class=listtotal align=right>|.$form->format_amount(\%myconfig, $totalpaid, 2, "&nbsp;").qq|</th>|;
+  print $::form->parse_html_template('cp/invoices', {
+    invoices => \@invoices,
+    totals   => \%total,
+  });
 
-  print qq|
-        <tr class=listtotal>
-|;
-  map { print "$column_data{$_}\n" } @column_index;
-  print qq|
-        </tr>
-      </table>
-    </td>
-  </tr>
-|;
-
-  $lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
-
 sub form_footer {
-  $lxdebug->enter_sub();
-
-
-  $form->{DF}{$form->{format}} = "selected";
-  $form->{OP}{$form->{media}} = "selected";
-  
-  $media = qq|
-          <option value=screen $form->{OP}{screen}>|.$locale->text('Screen');
-
-  if ($myconfig{printer} && $latex) {
-    $media .= qq|
-          <option value=printer $form->{OP}{printer}>|.$locale->text('Printer');
-  }
-  if ($latex) {
-    $media .= qq|
-          <option value=queue $form->{OP}{queue}>|.$locale->text('Queue');
-    $format .= qq|
-            <option value=postscript $form->{DF}{postscript}>|.$locale->text('Postscript').qq|
-	    <option value=pdf $form->{DF}{pdf}>|.$locale->text('PDF');
-  }
-  
-	      
-  print qq|
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-<input type=hidden name=rowcount value=$form->{rowcount}>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<br>
-<input class=submit type=submit name=action value="|.$locale->text('Update').qq|">
-<input class=submit type=submit name=action value="|.$locale->text('Post').qq|">|;
-
-  if ($latex) {
-    print qq|
-<input class=submit type=submit name=action value="|.$locale->text('Print').qq|">|;
-  }
-
-  print qq|
-<select name=format>$format</select>
-<select name=media>$media</select>
-|;
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-
-  print qq|
-  </form>
+  $::lxdebug->enter_sub;
+  $::auth->assert('cash');
 
-</body>
-</html>
-|;
+  print $::form->parse_html_template('cp/form_footer');
 
-  $lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
-
 sub update {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   my ($new_name_selected) = @_;
-  
- 
+
+  my ($buysell, $newvc, $updated, $exchangerate, $amount);
+
   if ($form->{vc} eq 'customer') {
     $buysell = "buy";
   } else {
@@ -477,40 +221,115 @@ sub update {
   }
 
   # if we switched to all_vc
+  # funktioniert derzeit nicht 12.10.2010 jb
   if ($form->{all_vc} ne $form->{oldall_vc}) {
 
     $form->{openinvoices} = ($form->{all_vc}) ? 0 : 1;
-    
+
     $form->{"select$form->{vc}"} = "";
 
     if ($form->{all_vc}) {
       $form->all_vc(\%myconfig, $form->{vc}, $form->{ARAP});
-      
+
       if ($form->{"all_$form->{vc}"}) {
-	map { $form->{"select$form->{vc}"} .= "<option>$_->{name}--$_->{id}\n" } @{ $form->{"all_$form->{vc}"} };
+        map {
+          $form->{"select$form->{vc}"} .=
+            "<option>$_->{name}--$_->{id}\n"
+        } @{ $form->{"all_$form->{vc}"} };
       }
-    } else {
+    } else {  # ab hier wieder ausgeführter code (s.o.):
       CP->get_openvc(\%myconfig, \%$form);
-      
+
       if ($form->{"all_$form->{vc}"}) {
-	$newvc = qq|$form->{"all_$form->{vc}"}[0]->{name}--$form->{"all_$form->{vc}"}[0]->{id}|;
-	map { $form->{"select$form->{vc}"} .= "<option>$_->{name}--$_->{id}\n" } @{ $form->{"all_$form->{vc}"} };
+        $newvc =
+          qq|$form->{"all_$form->{vc}"}[0]->{name}--$form->{"all_$form->{vc}"}[0]->{id}|;
+        map {
+          $form->{"select$form->{vc}"} .=
+            "<option>$_->{name}--$_->{id}\n"
+        } @{ $form->{"all_$form->{vc}"} };
       }
-      
+
       # if the name is not the same
       if ($form->{"select$form->{vc}"} !~ /$form->{$form->{vc}}/) {
-	$form->{$form->{vc}} = $newvc;
+        $form->{ $form->{vc} } = $newvc;
       }
     }
   }
 
-  # get customer and invoices
-  $updated = &check_name($form->{vc});
+  # search by customernumber
+  # the customernumber has to be correct otherwise nothing is found
+  if ($form->{vc} eq 'customer' and $form->{customernumber} and $form->{ARAP} eq 'AR') {
+    $form->{open} ='Y'; # only open invoices
+    # ar_transactions automatically searches by $form->{customer_id} or else
+    # $form->{customer} if available, and these variables will always be set
+    # so we have to empty these values first
+    $form->{customer_id} = '';
+    $form->{customer} = '';
+    AR->ar_transactions(\%myconfig, \%$form);
+
+    # Here we just take the first returned value even if the custumernumber
+    # may not be unique
+    $form->{customer} = $form->{AR}[0]{name};
+    $form->{customer_id} = $form->{AR}[0]{customer_id};
+  }
+
+  # search by invoicenumber,
+  if ($form->{invnumber}) {
+    $form->{open} ='Y'; # only open invoices
+    if ($form->{ARAP} eq 'AR'){
+      # ar_transactions automatically searches by $form->{customer_id} or else
+      # $form->{customer} if available, and these variables will always be set
+      # so we have to empty these values first
+      $form->{customer_id} = '';
+      $form->{customer} = '';
+      AR->ar_transactions(\%myconfig, \%$form);
+
+      # if you search for invoice '11' ar_transactions will also match invoices
+      # 112, 211, ... due to the LIKE
+
+      # so there is now an extra loop that tries to match the invoice number
+      # exactly among all returned results, and then passes the customer_id instead of the name
+      # because the name may not be unique
+
+      my $found_exact_invnumber_match = 0;
+      foreach my $i ( @{ $form->{AR} } ) {
+        next unless $i->{invnumber} eq $form->{invnumber};
+        # found exactly matching invnumber
+        $form->{$form->{vc}} = $i->{name};
+        $form->{customer_id} = $i->{customer_id};
+        #$form->{"old${form->{vc}"} = $i->{customer_id};
+        $found_exact_invnumber_match = 1;
+      };
+
+      unless ( $found_exact_invnumber_match ) {
+        # use first returned entry, may not be the correct one if invnumber doesn't
+        # match uniquely
+        $form->{$form->{vc}} = $form->{AR}[0]{name};
+        $form->{customer_id} = $form->{AR}[0]{customer_id};
+      };
+    } else {
+      # s.o. nur für zahlungsausgang
+      AP->ap_transactions(\%myconfig, \%$form);
+      $form->{$form->{vc}} = $form->{AP}[0]{name};
+    }
+  }
+
+  # determine customer/vendor
+  if ( $form->{customer_id} and ($form->{invnumber} or $form->{customernumber}) ) {
+    # we already know the exact customer_id, so fill $form with customer data
+    IS->get_customer(\%myconfig, \%$form);
+    $updated = 1;
+  } else {
+    # check_name is called with "customer" or "vendor" and otherwise uses contents of $form
+    # check_name also runs get_customer/get_vendor
+    $updated = &check_name($form->{vc});
+  };
 
   if ($new_name_selected || $updated) {
+    # get open invoices from ar/ap using $form->{vc} and a.${vc}_id, i.e. customer_id
     CP->get_openinvoices(\%myconfig, \%$form);
-    ($newvc) = split /--/, $form->{$form->{vc}};
-    $form->{"old$form->{vc}"} = qq|$newvc--$form->{"$form->{vc}_id"}|;;
+    ($newvc) = split /--/, $form->{ $form->{vc} };
+    $form->{"old$form->{vc}"} = qq|$newvc--$form->{"$form->{vc}_id"}|;
     $updated = 1;
   }
 
@@ -521,9 +340,12 @@ sub update {
       $updated = 1;
     }
   }
-  
-  
-  $form->{exchangerate} = $exchangerate if ($form->{forex} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{datepaid}, $buysell)));
+
+  if (!$form->{forex}) {        # read exchangerate from input field (not hidden)
+    $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate});
+  }
+  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{datepaid}, $buysell);
+  $form->{exchangerate} = $form->{forex} if $form->{forex};
 
   $amount = $form->{amount} = $form->parse_amount(\%myconfig, $form->{amount});
 
@@ -531,195 +353,154 @@ sub update {
     $form->{rowcount} = 0;
 
     $form->{queued} = "";
-    
-    $i = 0;
-    foreach $ref (@{ $form->{PR} }) {
+
+    my $i = 0;
+    foreach my $ref (@{ $form->{PR} }) {
       $i++;
-      $form->{"id_$i"} = $ref->{id};
+      $form->{"id_$i"}        = $ref->{id};
       $form->{"invnumber_$i"} = $ref->{invnumber};
       $form->{"transdate_$i"} = $ref->{transdate};
       $ref->{exchangerate} = 1 unless $ref->{exchangerate};
       $form->{"amount_$i"} = $ref->{amount} / $ref->{exchangerate};
-      $form->{"due_$i"} = ($ref->{amount} - $ref->{paid}) / $ref->{exchangerate};
+      $form->{"due_$i"}    =
+        ($ref->{amount} - $ref->{paid}) / $ref->{exchangerate};
       $form->{"checked_$i"} = "";
-      $form->{"paid_$i"} = "";
+      $form->{"paid_$i"}    = "";
 
       # need to format
-      map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(amount due);
+      map {
+        $form->{"${_}_$i"} =
+          $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2)
+      } qw(amount due);
 
     }
     $form->{rowcount} = $i;
   }
 
   # recalculate
-  $amount = $form->{amount};
-  for $i (1 .. $form->{rowcount}) {
 
-    map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(amount due paid);
+  # Modified from $amount = $form->{amount} by J.Zach to update amount to total
+  # payment amount in Zahlungsausgang
+  $amount = 0;
+  for my $i (1 .. $form->{rowcount}) {
+
+    map {
+      $form->{"${_}_$i"} =
+        $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+    } qw(amount due paid);
 
     if ($form->{"checked_$i"}) {
+
       # calculate paid_$i
       if (!$form->{"paid_$i"}) {
-	$form->{"paid_$i"} = $form->{"due_$i"};
+        $form->{"paid_$i"} = $form->{"due_$i"};
       }
-      
-      $amount -= $form->{"paid_$i"};
+
+      # Modified by J.Zach, see abovev
+      $amount += $form->{"paid_$i"};
+
     } else {
       $form->{"paid_$i"} = "";
     }
 
-    map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(amount due paid);
+    map {
+      $form->{"${_}_$i"} =
+        $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2)
+    } qw(amount due paid);
 
   }
 
+  # Line added by J.Zach, see above
+  $form->{amount}=$amount;
+
   &form_header;
   &list_invoices;
   &form_footer;
-  
+
   $lxdebug->leave_sub();
 }
 
 sub post {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
 
   &check_form;
-  
+
   if ($form->{currency} ne $form->{defaultcurrency}) {
-    $form->error($locale->text('Exchangerate missing!')) unless $form->{exchangerate};
+    $form->error($locale->text('Exchangerate missing!'))
+      unless $form->{exchangerate};
   }
 
-  $msg1 = "$form->{origtitle} posted!";
-  $msg2 = "Cannot post $form->{origtitle}!";
+  # Beim Aktualisieren wird das Konto übernommen
+  # und jetzt auch Beleg und Datum
+  $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&type=$form->{type}&account=$form->{account}&$form->{currency}" .
+                      "&datepaid=$form->{datepaid}&source=$form->{source}";
 
-# $locale->text('Payment posted!')
-# $locale->text('Receipt posted!')
-# $locale->text('Cannot post Payment!')
-# $locale->text('Cannot post Receipt!')
+  my $msg1 = $::form->{type} eq 'receipt' ? $::locale->text("Receipt posted!") : $::locale->text("Payment posted!");
+  my $msg2 = $::form->{type} eq 'receipt' ? $::locale->text("Cannot post Receipt!") : $::locale->text("Cannot post Payment!");
 
-  $form->redirect($locale->text($msg1)) if (CP->process_payment(\%myconfig, \%$form));
-  $form->error($locale->text($msg2));
+  # Die Nachrichten (Receipt posted!) werden nicht angezeigt.
+  # Entweder wieder aktivieren oder komplett rausnehmen
+  $form->redirect($msg1) if (CP->process_payment(\%::myconfig, $::form));
+  $form->error($msg2);
 
   $lxdebug->leave_sub();
 }
 
-
-sub print {
+sub check_form {
   $lxdebug->enter_sub();
 
- 
-  &check_form;
-
-  ($whole, $form->{decimal}) = split /\./, $form->{amount};
-  
-  $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
-  
-  $form->{decimal} .= "00";
-  $form->{decimal} = substr($form->{decimal}, 0, 2);
+  $auth->assert('cash');
 
-  $check = new CP $myconfig{countrycode};
-  $check->init;
-  $form->{text_amount} = $check->num2text($whole);
+  my ($closedto, $datepaid, $amount);
 
-  &{ "$form->{vc}_details" };
-
-  $form->{callback} = "";
-  
-  $form->{templates} = "$myconfig{templates}";
-  $form->{IN} = "$form->{formname}.tex";
-
-  if ($form->{format} eq 'postscript') {
-    $form->{postscript} = 1;
-  }
-  if ($form->{format} eq 'pdf') {
-    $form->{pdf} = 1;
-  }
-
-  if ($form->{media} eq 'printer') {
-    $form->{OUT} = "| $myconfig{printer}";
-  }
-  if ($form->{media} eq 'queue') {
-    %queued = split / /, $form->{queued};
-    
-    if ($filename = $queued{$form->{formname}}) {
-      unlink "$spool/$filename";
-      $filename =~ s/\..*$//g;
-    } else {
-      $filename = time;
-      $filename .= $$;
-    }
-    $filename .= ($form->{postscript}) ? '.ps' : '.pdf';
-    $form->{queued} = "$form->{formname} $filename";
-    $form->{OUT} = ">$spool/$filename";
-
-    $form->update_status(\%myconfig);
-
-  }
-
-  $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') {
-    $form->{callback} = "$form->{script}?action=payment&vc=$form->{vc}&path=$form->{path}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}";
-
-    $form->redirect if (CP->process_payment(\%myconfig, \%$form));
-    $form->error($locale->text('Cannot post payment!'));
-  }
-  
-  $lxdebug->leave_sub();
-}
-
-
-sub customer_details { IS->customer_details(\%myconfig, \%$form) };
-sub vendor_details { IR->vendor_details(\%myconfig, \%$form) };
-  
-
-sub check_form {
-  $lxdebug->enter_sub();
-
-  
   &check_name($form->{vc});
 
   if ($form->{currency} ne $form->{oldcurrency}) {
     &update;
-    exit;
+    ::end_of_request();
   }
-  
   $form->error($locale->text('Date missing!')) unless $form->{datepaid};
+  my $selected_check = 1;
+  for my $i (1 .. $form->{rowcount}) {
+    next unless $form->{"checked_$i"};
+    if (abs($form->parse_amount(\%myconfig, $form->{"paid_$i"}, 2)) < 0.01) {
+      $form->error($locale->text('Row #1: amount has to be different from zero.', $i));
+    }
+    undef $selected_check;
+  }
+  $form->error($locale->text('No transaction selected!')) if $selected_check;
 
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
   $datepaid = $form->datetonum($form->{datepaid}, \%myconfig);
-  
-  $form->error($locale->text('Cannot process payment for a closed period!')) if ($datepaid <= $closedto);
+
+  $form->error($locale->text('Cannot process payment for a closed period!'))
+    if ($form->date_closed($form->{"datepaid"}, \%myconfig));
 
   $amount = $form->parse_amount(\%myconfig, $form->{amount});
   $form->{amount} = $amount;
 
-  
-  for $i (1 .. $form->{rowcount}) {
-    if ($form->{"paid_$i"}) {
-      $amount -= $form->parse_amount($myconfig, $form->{"paid_$i"});
-      
-      push(@{ $form->{paid} }, $form->{"paid_$i"});
-      push(@{ $form->{due} }, $form->{"due_$i"});
-      push(@{ $form->{invnumber} }, $form->{"invnumber_$i"});
-      push(@{ $form->{invdate} }, $form->{"transdate_$i"});
+  for my $i (1 .. $form->{rowcount}) {
+    if ($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"});
+      push(@{ $form->{invnumber} ||= [] }, $form->{"invnumber_$i"});
+      push(@{ $form->{invdate}   ||= [] }, $form->{"transdate_$i"});
     }
   }
 
   if ($form->round_amount($amount, 2) != 0) {
     push(@{ $form->{paid} }, $form->format_amount(\%myconfig, $amount, 2));
     push(@{ $form->{due} }, $form->format_amount(\%myconfig, 0, "0"));
-    push(@{ $form->{invnumber} }, ($form->{ARAP} eq 'AR') ? $locale->text('Deposit') : $locale->text('Prepayment'));
+    push(@{ $form->{invnumber} },
+         ($form->{ARAP} eq 'AR')
+         ? $locale->text('Deposit')
+         : $locale->text('Prepayment'));
     push(@{ $form->{invdate} }, $form->{datepaid});
   }
-   
+
   $lxdebug->leave_sub();
 }
-
-