X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Far.pl;h=4634cb19d48ffe550a69c89833e23f381c62aa3e;hb=eaf4d4830c5b449170dbef0d0ad5f88863f1e8bd;hp=bff54d0f830beb16a98f092b435b1f536bb5f506;hpb=8ec0d29a33e23ce962b807e87cc8b577c8c98ec2;p=kivitendo-erp.git
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index bff54d0f8..4634cb19d 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -292,6 +292,8 @@ sub create_links {
($form->datetonum($form->{transdate}, \%myconfig) <=
$form->datetonum($form->{closedto}, \%myconfig));
+ $form->{"ARselected"} = $form->{"AR_1"};
+
$lxdebug->leave_sub();
}
@@ -331,6 +333,11 @@ sub form_header {
($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
$readonly = ($form->{radier}) ? "" : $readonly;
+ my $ARselected_quoted = quotemeta($form->{"ARselected"});
+ $form->{selectAR} = $form->{AR};
+ $form->{selectAR} =~
+ s/value=\"${ARselected_quoted}\"/value=\"$form->{ARselected}\" selected/;
+
# set option selected
foreach $item (qw(customer currency department employee)) {
$form->{"select$item"} =~ s/ selected//;
@@ -695,7 +702,7 @@ $jsscript
qq|
| |;
$column_data{exchangerate} = qq|$exchangerate | |;
$column_data{datepaid} =
- qq|{"datepaid_$i"}>
+ qq| | {"datepaid_$i"}>
| |;
$column_data{source} =
qq| | |;
@@ -764,6 +771,10 @@ sub form_footer {
. $locale->text('Use As Template') . qq|">
|;
}
+ print qq|
+
+ |;
} else {
if ($transdate > $closedto) {
@@ -799,11 +810,6 @@ sub update {
# $form->{selectAR_amount} =~
# s/value=\"$form->{AR_amountselected}\"/value=\"$form->{AR_amountselected}\" selected/;
- $form->{selectAR} = $form->{AR};
-
- $form->{selectAR} =~
- s/value=\"$form->{ARselected}\"/value=\"$form->{ARselected}\" selected/;
-
($AR_amountaccno, $AR_amounttaxkey) =
split(/--/, $form->{AR_amountselected});
$form->{selecttaxchart} = $form->{taxchart};
@@ -898,6 +904,36 @@ 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->{AR}) = split /--/, $form->{AR};
+ ($form->{AR_paid}) = split /--/, $form->{AR_paid};
+ $form->redirect($locale->text(' Payment posted!'))
+ if (AR->post_payment(\%myconfig, \%$form));
+ $form->error($locale->text('Cannot post payment!'));
+
+
+ $lxdebug->leave_sub();
+}
+
sub post {
$lxdebug->enter_sub();