From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 12 Oct 2010 10:23:45 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~101^2~6
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=aef4bc0c25c038294c180ba710099d63d2919a3e;p=kivitendo-erp.git

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

Conflicts:

	bin/mozilla/cp.pl
---

aef4bc0c25c038294c180ba710099d63d2919a3e
diff --cc bin/mozilla/cp.pl
index d454faf9b,2df7812e7..df454c42d
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@@ -638,8 -657,8 +638,9 @@@ sub post 
      $form->error($locale->text('Exchangerate missing!'))
        unless $form->{exchangerate};
    }
+ 
 +  # Beim Aktualisieren wird das Konto übernommen
-   $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&muh=kuh&account=$form->{account}";
+   $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&type=$form->{type}&account=$form->{account}";
  
    my $msg1 = "$form->{origtitle} posted!";
    my $msg2 = "Cannot post $form->{origtitle}!";