X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/e87f4016fbce09fc32b3b7ca18b78f364ad6ee6f..80050a8:/bin/mozilla/ap.pl diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index bcd858ade..e31f322b6 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,11 +409,7 @@ 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| - -
{script}> {id}> @@ -831,90 +828,37 @@ $jsscript } sub form_footer { - $main::lxdebug->enter_sub(); + $::lxdebug->enter_sub; + $::auth->assert('general_ledger'); - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - my $cgi = $main::cgi; + my $num_due; + my $num_follow_ups; + if ($::form->{id}) { + my $follow_ups = FU->follow_ups('trans_id' => $::form->{id}); - $main::auth->assert('general_ledger'); - - my $follow_ups_block; - if ($form->{id}) { - my $follow_ups = FU->follow_ups('trans_id' => $form->{id}); - - if (@{ $follow_ups} ) { - my $num_due = sum map { $_->{due} * 1 } @{ $follow_ups }; - $follow_ups_block = qq|

| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|

|; + if (@{ $follow_ups }) { + $num_due = sum map { $_->{due} * 1 } @{ $follow_ups }; + $num_follow_ups = scalar @{ $follow_ups } } } - print qq| - -$follow_ups_block + my $transdate = $::form->datetonum($::form->{transdate}, \%::myconfig); + my $closedto = $::form->datetonum($::form->{closedto}, \%::myconfig); - - -| -. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}]) -. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]) -. 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, + }); - if (!$form->{id} && $form->{draft_id}) { - print(NTI($cgi->checkbox('-name' => 'remove_draft', '-id' => 'remove_draft', - '-value' => 1, '-checked' => $form->{remove_draft}, - '-label' => '')) . - qq| 
|); - } - - my $transdate = $form->datetonum($form->{transdate}, \%myconfig); - my $closedto = $form->datetonum($form->{closedto}, \%myconfig); - - print qq||; - - if ($form->{id}) { - if ($form->{radier}) { - print qq| - -|; - } - # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it - print qq| | - if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}) && (($form->{totalpaid} == 0) || ($form->{totalpaid} eq ""))); - - print qq| - - -|; - } elsif (($transdate > $closedto) && !$form->{id}) { - print qq| - | . - NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit')); - } - # button for saving history - if($form->{id} ne "") { - print qq| |; - } - # /button for saving history - # mark_as_paid button - if($form->{id} ne "") { - print qq| |; - } - # /mark_as_paid button - print " -
- - - -"; - - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } sub mark_as_paid { @@ -1079,6 +1023,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!")); @@ -1153,7 +1099,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!')); } @@ -1214,8 +1160,6 @@ sub delete { delete $form->{header}; print qq| - -
{script}> |; @@ -1235,9 +1179,6 @@ sub delete {
- - - |; $main::lxdebug->leave_sub(); @@ -1495,6 +1436,9 @@ sub storno { $form->error($locale->text("Transaction has already been cancelled!")); } + $form->error($locale->text('Cannot post storno for a closed period!')) + if ( $form->date_closed($form->{transdate}, \%myconfig)); + AP->storno($form, \%myconfig, $form->{id}); # saving the history