Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp

diff --combined bin/mozilla/cp.pl
index 5c9a1a4ee0a4ea14939c4b909a19bf4e08e919aa,1fa5d34c6fa34c4431c74ab0e4de132a632b19cf..2b4e434b13c4af3023c4ef456b87441c2e8620a5
--- 1/bin/mozilla/cp.pl
--- 2/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@@ -48,7 -48,6 +48,6 @@@ our ($form, %myconfig, $lxdebug, $local
  
  sub payment {
    $lxdebug->enter_sub();
- 
    $auth->assert('cash');
  
    my (@curr);
@@@ -83,7 -82,6 +82,6 @@@
    }
  
    CP->paymentaccounts(\%myconfig, \%$form);
- 
    $form->{selectaccount} = "";
    $form->{"select$form->{ARAP}"} = "";
  
@@@ -288,7 -286,6 +286,6 @@@ sub form_header 
                  <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>
@@@ -661,6 -658,8 +658,8 @@@ sub post 
        unless $form->{exchangerate};
    }
  
+   $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&muh=kuh&account=$form->{account}";
+ 
    my $msg1 = "$form->{origtitle} posted!";
    my $msg2 = "Cannot post $form->{origtitle}!";
  
@@@ -678,7 -677,7 +677,7 @@@
  
  sub print {
    $lxdebug->enter_sub();
- 
+   exit; # Niemand braucht mich mehr! LöschMich endlich! jb 8.10.2010
    $auth->assert('cash');
  
    my ($whole, $check, %queued, $spool, $filename, $userspath);
@@@ -770,7 -769,7 +769,7 @@@ sub check_form 
    for my $i (1 .. $form->{rowcount}) {
      if ($form->{"checked_$i"}) {
        if ($form->parse_amount(\%myconfig, $form->{"paid_$i"}, 2) <= 0) { # negativen Betrag eingegeben
 -          $form->error($locale->text('No zero or negative values, please! Correct row number:' . $i));
 +          $form->error($locale->text('Amount has to be greater then zero! Wrong row number: ') . $i);
        }
          undef($selected_check);
          # last; # ich muss doch über alle buchungen laufen, da ich noch