X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fcp.pl;h=ccecac3063cc1da063c7a8d00611b7e277185f92;hb=6768ddad54d2a675939e1167536f4943628de2bb;hp=c6a61526f50adc0550046a54d926f83180464ad4;hpb=3a65820b13e873bb70ad06769b53faa2c6526323;p=kivitendo-erp.git
diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index c6a61526f..ccecac306 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -73,10 +73,11 @@ sub payment {
$form->{"select$form->{vc}"} = "";
if ($form->{"all_$form->{vc}"}) {
- $form->{"select$form->{vc}"} .= "\n";
+ $form->{"select$form->{vc}"} .= "\n";
# s.o. jb 12.10.2010
$form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id};
- map { $form->{"select$form->{vc}"} .= "\n" }
+ # hotfix for 2450. TODO remove legacy code and use L
+ map { $form->{"select$form->{vc}"} .= "\n" }
@{ $form->{"all_$form->{vc}"} };
}
CP->paymentaccounts(\%myconfig, \%$form);
@@ -137,7 +138,7 @@ sub form_header {
# sometimes it happens that values in customer arrive without the signs '--'
# but in order to select the right option field we need values with '--'
- if ($form->{vc} eq "customer"){
+ if ($form->{vc} eq "customer" && $form->{"all_$form->{vc}"}){
my ($customername) = split /--/, $form->{ $form->{vc} };
$form->{ $form->{vc} } = $customername . "--" . $form->{customer_id};
}
@@ -147,6 +148,7 @@ sub form_header {
#
# offen: $form->{ARAP} kann raus?
for my $item ($form->{vc}, "account", "currency", $form->{ARAP}) {
+ $form->{$item} = H($form->{$item});
$form->{"select$item"} =~ s/ selected//;
$form->{"select$item"} =~ s/option value="\Q$form->{$item}\E">\Q$form->{$item}\E/option selected value="$form->{$item}">$form->{$item}/;
}
@@ -323,13 +325,13 @@ sub update {
$updated = &check_name($form->{vc});
};
- # if ($new_name_selected || $updated) {
+ if ($new_name_selected || $updated) {
# get open invoices from ar/ap using $form->{vc} and a.${vc}_id, i.e. customer_id
CP->get_openinvoices(\%myconfig, \%$form);
($newvc) = split /--/, $form->{ $form->{vc} };
$form->{"old$form->{vc}"} = qq|$newvc--$form->{"$form->{vc}_id"}|;
$updated = 1;
- # }
+ }
if ($form->{currency} ne $form->{oldcurrency}) {
$form->{oldcurrency} = $form->{currency};
@@ -457,7 +459,7 @@ sub check_form {
if ($form->{currency} ne $form->{oldcurrency}) {
&update;
- ::end_of_request();
+ $::dispatcher->end_request;
}
$form->error($locale->text('Date missing!')) unless $form->{datepaid};
my $selected_check = 1;