X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fap.pl;h=52c3055a7ecdfa13bef64050b705dd9a428cad96;hb=9f68c5f37f21f68997587d79f2e01369454cec46;hp=790cb69c0b3af3028210631dcc1fac43bf98e5eb;hpb=435dc011059c6df23c6ee409fa556da2a7ea40e3;p=kivitendo-erp.git diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 790cb69c0..52c3055a7 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -437,7 +437,7 @@ sub form_header { my $follow_up_vc = $form->{vendor_id} ? SL::DB::Vendor->load_cached($form->{vendor_id})->name : ''; my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)"; - $::request->layout->add_javascripts("autocomplete_chart.js", "autocomplete_customer.js", "show_vc_details.js", "show_history.js", "follow_up.js", "kivi.Draft.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.File.js", "kivi.AP.js"); + $::request->layout->add_javascripts("autocomplete_chart.js", "show_vc_details.js", "show_history.js", "follow_up.js", "kivi.Draft.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.File.js", "kivi.AP.js", "kivi.CustomerVendor.js"); my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local; my $first_taxchart; @@ -744,10 +744,11 @@ sub post { my ($inline) = @_; # check if there is a vendor, invoice, due date and invnumber - $form->isblank("transdate", $locale->text("Invoice Date missing!")); - $form->isblank("duedate", $locale->text("Due Date missing!")); - $form->isblank("vendor_id", $locale->text('Vendor missing!')); - $form->isblank("invnumber", $locale->text('Invoice Number missing!')); + $form->isblank("transdate", $locale->text("Invoice Date missing!")); + $form->isblank("duedate", $locale->text("Due Date missing!")); + $form->isblank("vendor_id", $locale->text('Vendor missing!')); + $form->isblank("invnumber", $locale->text('Invoice Number missing!')); + $form->isblank("AP_chart_id", $locale->text('No contra account selected!')); if ($myconfig{mandatory_departments} && !$form->{department_id}) { $form->{saved_message} = $::locale->text('You have to specify a department.'); @@ -826,7 +827,11 @@ sub post { # no restore_from_session_id needed. we like to have a newly generated # list of invoices for bank transactions print $form->redirect_header($form->{callback}) if ($form->{callback} =~ /BankTransaction/); - $form->redirect($locale->text('AP transaction posted.')) unless $inline; + $form->redirect($locale->text('AP transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id}) unless $inline; + # TODO Add callback/return flag in myconfig + # With version 3.5 we can add documents, but only after posting. there should be a flag in myconfig for the user + # $form->{callback} ||= 'ap.pl?action=edit&id=' . $form->{id} if $myconfig{no_reset_arap}; + } else { $form->error($locale->text('Cannot post transaction!')); }