X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fap.pl;h=2cfff88d61574f6e8b013f7bf792a2a1990ec8c3;hb=eaf4d4830c5b449170dbef0d0ad5f88863f1e8bd;hp=2f31a59918b6bcf04371e2f6d0cedabe27562f63;hpb=8ec0d29a33e23ce962b807e87cc8b577c8c98ec2;p=kivitendo-erp.git
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 2f31a5991..2cfff88d6 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -279,6 +279,8 @@ sub create_links {
($form->datetonum($form->{transdate}, \%myconfig) <=
$form->datetonum($form->{closedto}, \%myconfig));
+ $form->{"APselected"} = $form->{"AP_1"};
+
$lxdebug->leave_sub();
}
@@ -321,6 +323,11 @@ sub form_header {
}
$readonly = ($form->{id}) ? "readonly" : "";
+ my $APselected_quoted = quotemeta($form->{"APselected"});
+ $form->{selectAP} = $form->{AP};
+ $form->{selectAP} =~
+ s/value=\"${APselected_quoted}\"/value=\"$form->{APselected}\" selected/;
+
$form->{radier} =
($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
$readonly = ($form->{radier}) ? "" : $readonly;
@@ -675,7 +682,7 @@ $jsscript
qq|
| |;
$column_data{"exchangerate_$i"} = qq|$exchangerate | |;
$column_data{"datepaid_$i"} =
- qq|{"datepaid_$i"}>
+ qq| | {"datepaid_$i"}>
| |;
$column_data{"source_$i"} =
qq| | |;
@@ -741,7 +748,10 @@ sub form_footer {
|;
-
+ print qq|
+
+|;
} else {
if (($transdate > $closedto) && !$form->{id}) {
print qq|{AP_amountselected}\"/value=\"$form->{AP_amountselected}\" selected/;
- $form->{selectAP} = $form->{AP};
- $form->{selectAP} =~
- s/value=\"$form->{APselected}\"/value=\"$form->{APselected}\" selected/;
-
($AP_amountaccno, $AP_amounttaxkey) =
split(/--/, $form->{AP_amountselected});
$form->{selecttaxchart} = $form->{taxchart};
@@ -872,6 +878,38 @@ sub update {
$lxdebug->leave_sub();
}
+
+sub post_payment {
+ $lxdebug->enter_sub();
+ for $i (1 .. $form->{paidaccounts}) {
+ if ($form->{"paid_$i"}) {
+ $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
+
+ $form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
+
+ $form->error($locale->text('Cannot post payment for a closed period!'))
+ if ($datepaid <= $closedto);
+
+ if ($form->{currency} ne $form->{defaultcurrency}) {
+ $form->{"exchangerate_$i"} = $form->{exchangerate}
+ if ($invdate == $datepaid);
+ $form->isblank("exchangerate_$i",
+ $locale->text('Exchangerate for payment missing!'));
+ }
+ }
+ }
+
+ ($form->{AP}) = split /--/, $form->{AP};
+ ($form->{AP_paid}) = split /--/, $form->{AP_paid};
+ $form->redirect($locale->text(' Payment posted!'))
+ if (AP->post_payment(\%myconfig, \%$form));
+ $form->error($locale->text('Cannot post payment!'));
+
+
+ $lxdebug->leave_sub();
+}
+
+
sub post {
$lxdebug->enter_sub();