use SL::AP;
use SL::FU;
use SL::GL;
-use SL::Helper::Flash qw(flash);
+use SL::Helper::Flash qw(flash flash_later);
use SL::IR;
use SL::IS;
use SL::ReportGenerator;
$form->{paid_missing} = $form->{invtotal_unformatted} - $form->{totalpaid};
+ $form->{payment_id} = $form->{invoice_obj}->{payment_id} // $form->{payment_id};
print $form->parse_html_template('ap/form_header', {
today => DateTime->today,
currencies => SL::DB::Manager::Currency->get_all_sorted,
- payment_terms => SL::DB::Manager::PaymentTerm->get_all_sorted(query => [ or => [ obsolete => 0, id => $::form->{payment_id}*1 ]]),
+ payment_terms => SL::DB::Manager::PaymentTerm->get_all_sorted(query => [ or => [ obsolete => 0, id => $form->{payment_id}*1 ]]),
});
$main::lxdebug->leave_sub();
$form->{what_done} = "invoice";
$form->save_history;
}
- # 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.') . ' ' . $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};
+
+ if (!$inline) {
+ my $msg = $locale->text("AP transaction '#1' posted (ID: #2)", $form->{invnumber}, $form->{id});
+ if ($form->{callback} =~ /BankTransaction/) {
+ # no restore_from_session_id needed. we like to have a newly generated
+ # list of invoices for bank transactions
+ SL::Helper::Flash::flash_later('info', $msg);
+ print $form->redirect_header($form->{callback});
+ $::dispatcher->end_request;
+
+ } elsif ('doc-tab' eq $form->{after_action}) {
+ # Redirect with callback containing a fragment does not work (by now)
+ # because the callback info is stored in the session an parsing the
+ # callback parameters does not support fragments (see SL::Form::redirect).
+ # So use flash_later for the message and redirect_headers for redirecting.
+ my $add_doc_url = build_std_url("script=ap.pl", 'action=edit', 'id=' . E($form->{id}), 'fragment=ui-tabs-docs');
+ SL::Helper::Flash::flash_later('info', $msg);
+ print $form->redirect_header($add_doc_url);
+ $::dispatcher->end_request;
+
+ } else {
+ $form->redirect($msg);
+ }
+ }
} else {
$form->error($locale->text('Cannot post transaction!'));
my @columns =
qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid
due duedate transaction_description notes employee globalprojectnumber department
- vendornumber country ustid taxzone payment_terms charts direct_debit);
+ vendornumber country ustid taxzone payment_terms charts debit_chart direct_debit
+ insertdate);
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id transdatefrom transdateto
'taxzone' => { 'text' => $locale->text('Tax rate'), },
'payment_terms' => { 'text' => $locale->text('Payment Terms'), },
'charts' => { 'text' => $locale->text('Chart'), },
+ 'debit_chart' => { 'text' => $locale->text('Debit Account'), },
'direct_debit' => { 'text' => $locale->text('direct debit'), },
+ 'insertdate' => { 'text' => $locale->text('Insert Date'), },
);
foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department)) {
my $department_description;
$department_description = SL::DB::Manager::Department->find_by(id => $form->{department_id})->description if $form->{department_id};
+ my $project_description;
+ $project_description = SL::DB::Manager::Project->find_by(id => $form->{project_id})->description if $form->{project_id};
my @options;
push @options, $locale->text('Vendor') . " : $form->{vendor}" if ($form->{vendor});
push @options, $locale->text('Contact Person') . " : $form->{cp_name}" if ($form->{cp_name});
push @options, $locale->text('Department') . " : $department_description" if ($form->{department_id});
+ push @options, $locale->text('Project') . " : $project_description" if ($project_description);
push @options, $locale->text('Invoice Number') . " : $form->{invnumber}" if ($form->{invnumber});
push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if ($form->{ordnumber});
push @options, $locale->text('Notes') . " : $form->{notes}" if ($form->{notes});
$is_linked_bank_transaction = 1;
}
+ my $create_post_action = sub {
+ # $_[0]: description
+ # $_[1]: after_action
+ action => [
+ $_[0],
+ submit => [ '#form', { action => "post", after_action => $_[1] } ],
+ checks => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting', 'kivi.AP.check_duplicate_invnumber' ],
+ disabled => !$may_edit_create ? t8('You must not change this AP transaction.')
+ : $is_closed ? t8('The billing period has already been locked.')
+ : $is_storno ? t8('A canceled invoice cannot be posted.')
+ : ($::form->{id} && $change_never) ? t8('Changing invoices has been disabled in the configuration.')
+ : ($::form->{id} && $change_on_same_day_only) ? t8('Invoices can only be changed on the day they are posted.')
+ : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
+ : undef,
+ ],
+ };
+
+ my @post_entries;
+ if ($::instance_conf->get_ap_add_doc && $::instance_conf->get_doc_storage) {
+ @post_entries = ( $create_post_action->(t8('Post'), 'doc-tab'),
+ $create_post_action->(t8('Post and new booking')) );
+ } elsif ($::instance_conf->get_doc_storage) {
+ @post_entries = ( $create_post_action->(t8('Post')),
+ $create_post_action->(t8('Post and upload document'), 'doc-tab') );
+ } else {
+ @post_entries = ( $create_post_action->(t8('Post')) );
+ }
+
for my $bar ($::request->layout->get('actionbar')) {
$bar->add(
action => [
accesskey => 'enter',
disabled => !$may_edit_create ? t8('You must not change this AP transaction.') : undef,
],
-
combobox => [
- action => [
- t8('Post'),
- submit => [ '#form', { action => "post" } ],
- checks => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting', 'kivi.AP.check_duplicate_invnumber' ],
- disabled => !$may_edit_create ? t8('You must not change this AP transaction.')
- : $is_closed ? t8('The billing period has already been locked.')
- : $is_storno ? t8('A canceled invoice cannot be posted.')
- : ($::form->{id} && $change_never) ? t8('Changing invoices has been disabled in the configuration.')
- : ($::form->{id} && $change_on_same_day_only) ? t8('Invoices can only be changed on the day they are posted.')
- : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
- : undef,
- ],
+ @post_entries,
action => [
t8('Post Payment'),
submit => [ '#form', { action => "post_payment" } ],
projects / kivitendo-erp.git / blobdiff