use POSIX qw(strftime);
use List::Util qw(first sum);
+use SL::DB::ApGl;
use SL::DB::RecordTemplate;
use SL::DB::BankTransactionAccTrans;
use SL::DB::Tax;
$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();
my $form = $::form;
my $change_never = $::instance_conf->get_gl_changeable == 0;
my $change_on_same_day_only = $::instance_conf->get_gl_changeable == 2 && ($form->current_date(\%::myconfig) ne $form->{gldate});
- my $is_linked_bank_transaction;
+ my ($is_linked_bank_transaction, $is_linked_ap_transaction);
if ($form->{id} && SL::DB::Manager::BankTransactionAccTrans->find_by(gl_id => $form->{id})) {
$is_linked_bank_transaction = 1;
}
+ if ($form->{id} && SL::DB::Manager::ApGl->find_by(gl_id => $form->{id})) {
+ $is_linked_ap_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.')
+ : $is_linked_ap_transaction ? t8('This transaction is linked with a AP transaction. Please undo and redo the AP 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(
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' } ],
disabled => !$form->{id} ? t8('This general ledger transaction has not been posted yet.')
: $form->{storno} ? t8('A canceled general ledger transaction cannot be canceled again.')
: $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
+ : $is_linked_ap_transaction ? t8('This transaction is linked with a AP transaction. Please undo and redo the AP transaction booking if needed.')
: undef,
],
action => [ t8('Delete'),
: $change_never ? t8('Changing invoices has been disabled in the configuration.')
: $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.')
+ : $is_linked_ap_transaction ? t8('This transaction is linked with a AP transaction. Please undo and redo the AP transaction booking if needed.')
: $form->{storno} ? t8('A canceled general ledger transaction cannot be deleted.')
- : undef,
+ : undef,
],
], # end of combobox "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 => [
call => [ 'kivi.Draft.popup', 'gl', 'unknown', $form->{draft_id}, $form->{draft_description} ],
disabled => $form->{id} ? t8('This invoice has already been posted.')
: $form->{locked} ? t8('The billing period has already been locked.')
- : undef,
+ : undef,
],
], # end of combobox "more"
);
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) : ();
$form->isblank("reference", $locale->text('Reference missing!'));
$form->isblank("transdate", $locale->text('Transaction Date missing!'));
$form->isblank("description", $locale->text('Description missing!'));
+ $form->isblank("transaction_description", $locale->text('A transaction description is required.')) if $::instance_conf->get_require_transaction_description_ps;
my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
$form->redirect($msg);
- } elsif ($::instance_conf->get_gl_add_doc && $::instance_conf->get_doc_storage) {
+ } 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).
projects / mfinanz.git / blobdiff