use SL::DB::Tax;
use SL::FU;
use SL::GL;
-use SL::Helper::Flash qw(flash);
+use SL::Helper::Flash qw(flash flash_later);
use SL::IS;
use SL::ReportGenerator;
use SL::DBUtils qw(selectrow_query selectall_hashref_query);
$report->set_options('raw_bottom_info_text' => $raw_bottom_info_text);
- setup_gl_transactions_action_bar(num_rows => scalar(@{$form->{GL}}));
+ setup_gl_transactions_action_bar();
$report->generate_with_headers();
$is_linked_bank_transaction = 1;
}
+ my $create_post_action = sub {
+ # $_[0]: description
+ # $_[1]: after_action
+ action => [
+ $_[0],
+ submit => [ '#form', { action => 'post', after_action => $_[1] } ],
+ disabled => $form->{locked} ? t8('The billing period has already been locked.')
+ : $form->{storno} ? t8('A canceled general ledger transaction cannot be posted.')
+ : ($form->{id} && $change_never) ? t8('Changing general ledger transaction has been disabled in the configuration.')
+ : ($form->{id} && $change_on_same_day_only) ? t8('General ledger transactions 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_entry;
+ if ($::instance_conf->get_gl_add_doc && $::instance_conf->get_doc_storage) {
+ %post_entry = (combobox => [ $create_post_action->(t8('Post'), 'doc-tab'),
+ $create_post_action->(t8('Post and new booking')) ]);
+ } elsif ($::instance_conf->get_doc_storage) {
+ %post_entry = (combobox => [ $create_post_action->(t8('Post')),
+ $create_post_action->(t8('Post and upload document'), 'doc-tab') ]);
+ } else {
+ %post_entry = $create_post_action->(t8('Post'));
+ }
+
for my $bar ($::request->layout->get('actionbar')) {
$bar->add(
action => [
id => 'update_button',
accesskey => 'enter',
],
- action => [
- t8('Post'),
- submit => [ '#form', { action => 'post' } ],
- disabled => $form->{locked} ? t8('The billing period has already been locked.')
- : $form->{storno} ? t8('A canceled general ledger transaction cannot be posted.')
- : ($form->{id} && $change_never) ? t8('Changing general ledger transaction has been disabled in the configuration.')
- : ($form->{id} && $change_on_same_day_only) ? t8('General ledger transactions 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_entry,
combobox => [
action => [ t8('Storno'),
submit => [ '#form', { action => 'storno' } ],
action => [ t8('more') ],
action => [
t8('History'),
- call => [ 'set_history_window', $form->{id} * 1, 'id' ],
+ call => [ 'set_history_window', $form->{id} * 1, 'glid' ],
disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
],
action => [
my ($init) = @_;
- $::request->layout->add_javascripts("autocomplete_chart.js", "autocomplete_project.js", "kivi.File.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.Validator.js");
+ $::request->layout->add_javascripts("autocomplete_chart.js", "autocomplete_project.js", "kivi.File.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.Validator.js", "show_history.js");
my @old_project_ids = grep { $_ } map{ $::form->{"project_id_$_"} } 1..$::form->{rowcount};
my @conditions = @old_project_ids ? (id => \@old_project_ids) : ();
die "No bank transaction found" unless $bt;
$chart_id = SL::DB::Manager::BankAccount->find_by(id => $bt->local_bank_account_id)->chart_id;
- die "no chart id:" unless $chart_id;
+ die "no chart id" unless $chart_id;
$payment = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $::form->{id},
chart_link => { like => '%_paid%' },
# credit/debit * -1 matches the sign for bt.amount and bt.invoice_amount
- die "Can only assign the full (partial) bank amount to a single general ledger booking" . $bt->not_assigned_amount . " " . ($payment->[0]->amount * -1)
+ die "Can only assign the full (partial) bank amount to a single general ledger booking: " . $bt->not_assigned_amount . " " . ($payment->[0]->amount * -1)
unless (abs($bt->not_assigned_amount - ($payment->[0]->amount * -1)) < 0.001);
$bt->update_attributes(invoice_amount => $bt->invoice_amount + ($payment->[0]->amount * -1));
1;
}) or do { die SL::DB->client->error };
- if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
- print $form->redirect_header($form->{callback});
- $form->redirect($locale->text('GL transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id});
- } elsif ($::instance_conf->get_gl_add_doc && $::instance_conf->get_doc_storage) {
- my $add_doc_url = build_std_url("script=gl.pl", 'action=edit', 'id=' . E($form->{id}));
- print $form->redirect_header($add_doc_url);
- $form->redirect($locale->text('GL transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id});
- }
-
- # remove or clarify
- undef($form->{callback});
$main::lxdebug->leave_sub();
}
)->webdav_path;
}
- $form->{callback} = build_std_url("action=add", "show_details");
- $form->redirect($::locale->text("General ledger transaction '#1' posted", $form->{reference}));
+ my $msg = $::locale->text("General ledger transaction '#1' posted (ID: #2)", $form->{reference}, $form->{id});
+ if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
+ $form->redirect($msg);
+
+ } 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=gl.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->{callback} = build_std_url("action=add", "show_details");
+ $form->redirect($msg);
+ }
$main::lxdebug->leave_sub();
}
projects / kivitendo-erp.git / blobdiff