X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fap.pl;h=2cfff88d61574f6e8b013f7bf792a2a1990ec8c3;hb=864b73ffb0964215f287a393ea37ec2eef6eb8eb;hp=9cc84e7fe39aa5665c7430b6198ad8f6498564ae;hpb=04a2f2e779fabb1faa836937504d4ce8bf906a06;p=kivitendo-erp.git diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 9cc84e7fe..2cfff88d6 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -79,6 +79,7 @@ sub add { unless $form->{callback}; &create_links; + AP->get_transdate(\%myconfig, $form); &display_form; $lxdebug->leave_sub(); @@ -239,9 +240,9 @@ sub create_links { } $form->{"${key}_$k"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}"; + my $q_description = quotemeta($form->{acc_trans}{$key}->[$i-1]->{description}); $form->{"select${key}"} =~ - /{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}<\/option>\n/; - $test = $1; + /{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--${q_description}<\/option>\n/; $form->{"${key}_$k"} = $1; if ($akey eq 'amount') { $form->{"taxchart_$k"} = $form->{taxchart}; @@ -278,6 +279,8 @@ sub create_links { ($form->datetonum($form->{transdate}, \%myconfig) <= $form->datetonum($form->{closedto}, \%myconfig)); + $form->{"APselected"} = $form->{"AP_1"}; + $lxdebug->leave_sub(); } @@ -320,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; @@ -634,6 +642,7 @@ $jsscript "; + my @triggers = (); $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); for $i (1 .. $form->{paidaccounts}) { print " @@ -673,7 +682,8 @@ $jsscript qq|$form->{"selectAP_paid_$i"}|; $column_data{"exchangerate_$i"} = qq|$exchangerate|; $column_data{"datepaid_$i"} = - qq|{"datepaid_$i"}>|; + qq|{"datepaid_$i"}> + |; $column_data{"source_$i"} = qq||; $column_data{"memo_$i"} = @@ -684,9 +694,11 @@ $jsscript print " "; + push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); } map { $form->{$_} =~ s/\"/"/g } qw(selectAP_paid); - print qq| + print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) . + qq| {paidaccounts}> @@ -719,25 +731,27 @@ sub form_footer { $transdate = $form->datetonum($form->{transdate}, \%myconfig); $closedto = $form->datetonum($form->{closedto}, \%myconfig); - if ($form->{id} && $form->{radier}) { + if ($form->{id}) { # print qq| # |; + if ($form->{radier}) { print qq| |; + } - - if ($transdate > $closedto) { print qq| + . $locale->text('Use As Template') . qq|"> +|; + print qq| + |; - } - } else { if (($transdate > $closedto) && !$form->{id}) { print qq|{path}/menu.pl"; - &menubar; - } - print " @@ -777,10 +786,6 @@ sub update { # $form->{selectAP_amount} =~ # s/value=\"$form->{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}; @@ -873,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(); @@ -941,6 +978,18 @@ sub post_as_new { $lxdebug->leave_sub(); } +sub use_as_template { + $lxdebug->enter_sub(); + + map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno); + $form->{paidaccounts} = 1; + $form->{rowcount}--; + $form->{invdate} = $form->current_date(\%myconfig); + &update; + + $lxdebug->leave_sub(); +} + sub delete { $lxdebug->enter_sub(); @@ -1471,14 +1520,8 @@ sub ap_transactions { . $locale->text('AP Transaction') . qq|"> |; + . $locale->text('Vendor Invoice') . qq|"> - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq|