From: Sven Donath <lxo@dexo.de>
Date: Mon, 11 Oct 2010 13:19:22 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~101^2~6^2~1
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/85ec9753ee5a76b23ce0189623ea7a698e87a5d8?hp=-c

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

85ec9753ee5a76b23ce0189623ea7a698e87a5d8
diff --combined bin/mozilla/cp.pl
index 5c9a1a4ee,1fa5d34c6..2b4e434b1
--- a/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