X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fap.pl;h=2bf801787f737789e17e757fdd109b4b4e1c2749;hb=3686bb31d623aaef632060fbdd9d7447c310e279;hp=d90b06209fe8590d6b40b4383fdc8a3686df71a0;hpb=79b83b02cf67cf4b701eb1654fa274095d84745a;p=kivitendo-erp.git
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index d90b06209..2bf801787 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -195,7 +195,7 @@ sub form_header {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
$main::auth->assert('general_ledger');
@@ -285,7 +285,8 @@ sub form_header {
my $notes =
qq||;
- my $department = qq|
+ my $department;
+ $department = qq|
| . $locale->text('Department') . qq| |
@@ -370,7 +371,7 @@ sub form_header {
# with JavaScript Calendar
$button1 = qq|
- | |
+ |
text('button') . qq|> |
|;
@@ -388,7 +389,7 @@ sub form_header {
# without JavaScript Calendar
$button1 =
- qq| | |;
+ qq| | |;
$button2 =
qq| | |;
}
@@ -408,10 +409,8 @@ sub form_header {
'-default' => $form->{"globalproject_id"} ));
$form->header;
- my $onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
- $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
print qq|
-
+
+ my $storno = $::form->{id}
+ && !IS->has_storno(\%::myconfig, $::form, 'ap')
+ && !IS->is_storno( \%::myconfig, $::form, 'ap', $::form->{id})
+ && ($::form->{totalpaid} == 0 || $::form->{totalpaid} eq '');
-
-
-";
+ $::form->header;
+ print $::form->parse_html_template('ap/form_footer', {
+ num_due => $num_due,
+ num_follow_ups => $num_follow_ups,
+ show_post_draft => ($transdate > $closedto) && !$::form->{id},
+ show_storno => $storno,
+ });
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
sub mark_as_paid {
@@ -1071,6 +1025,8 @@ sub post {
$main::auth->assert('general_ledger');
+ my ($inline) = @_;
+
# check if there is a vendor, invoice and due date
$form->isblank("transdate", $locale->text("Invoice Date missing!"));
$form->isblank("duedate", $locale->text("Due Date missing!"));
@@ -1145,7 +1101,7 @@ sub post {
# /saving the history
remove_draft() if $form->{remove_draft};
# Dieser Text wird niemals ausgegeben: Probleme beim redirect?
- $form->redirect($locale->text('Transaction posted!'));
+ $form->redirect($locale->text('Transaction posted!')) unless $inline;
} else {
$form->error($locale->text('Cannot post transaction!'));
}
@@ -1182,7 +1138,7 @@ sub use_as_template {
$main::auth->assert('general_ledger');
- map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
+ map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
$form->{paidaccounts} = 1;
$form->{rowcount}--;
$form->{invdate} = $form->current_date(\%myconfig);
@@ -1206,8 +1162,6 @@ sub delete {
delete $form->{header};
print qq|
-
-
-
-
-