X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcp.pl;h=d54137e72cc84125ae5ff798fb7024b7c87347f5;hb=7f683e50d6d550b307a1c97d071e894889039ff0;hp=d454faf9bda990178aee29d2ef1e16d7c5c0f8f9;hpb=5769da0ead8e58b4245dc8b8509f31d117cbeec4;p=kivitendo-erp.git

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index d454faf9b..d54137e72 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -74,19 +74,6 @@ sub payment {
       @{ $form->{"all_$form->{vc}"} };
   }
 
-  # departments
-  # auf departments kann man auch nicht mehr buchen. Raus oder wieder 
-  # aktivieren? Im Backend dann auch anpassen. jb 12.10.2010
-  if (@{ $form->{all_departments} || [] }) {
-    $form->{selectdepartment} = "<option>\n";
-    $form->{department}       = "$form->{department}--$form->{department_id}";
-
-    map {
-      $form->{selectdepartment} .=
-        "<option>$_->{description}--$_->{id}\n"
-    } (@{ $form->{all_departments} || [] });
-  }
-
   CP->paymentaccounts(\%myconfig, \%$form);
 
   $form->{selectaccount} = "";
@@ -105,9 +92,10 @@ sub payment {
   # 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?
-  @curr_unsorted = split(/:/, $form->{currencies});
-  chomp $curr_unsorted[0];
-  @curr = sort {} @curr_unsorted;
+  # 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];
 
@@ -126,7 +114,7 @@ sub form_header {
 
   $auth->assert('cash');
 
-  my ($vc, $vclabel, $allvc, $arap, $department, $exchangerate);
+  my ($vc, $vclabel, $allvc, $arap, $exchangerate);
   my ($jsscript, $button1, $button2, $onload);
 
   $vclabel = ucfirst $form->{vc};
@@ -167,8 +155,7 @@ sub form_header {
 |;
     }
   }
-
-  foreach my $item ($form->{vc}, "account", "currency", $form->{ARAP}, "department") {
+  foreach 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}/;
@@ -283,7 +270,6 @@ sub form_header {
           </td>
           <td align=right>
             <table>
-              $department
               <tr>
                 <th align=right nowrap>| . $locale->text('Account') . qq|</th>
                 <td colspan=3><select name=account>$form->{selectaccount}</select>
@@ -638,8 +624,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}&$form->{currency}";
 
   my $msg1 = "$form->{origtitle} posted!";
   my $msg2 = "Cannot post $form->{origtitle}!";
@@ -675,7 +662,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