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

Conflicts:

	bin/mozilla/cp.pl

diff --cc bin/mozilla/cp.pl
index d454faf9bda990178aee29d2ef1e16d7c5c0f8f9,2df7812e7e7f8c11f7c60da486a8599c5a1f44f5..df454c42dd346ac3f6610dae3b5dddf5d1f9f088
--- 1/bin/mozilla/cp.pl
--- 2/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};
    }
-   $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&muh=kuh&account=$form->{account}";
+ 
 +  # Beim Aktualisieren wird das Konto übernommen
+   $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}!";