use POSIX qw(strftime);
use List::Util qw(first sum);
+use SL::DB::ApGl;
use SL::DB::RecordTemplate;
+use SL::DB::ReconciliationLink;
use SL::DB::BankTransactionAccTrans;
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);
$::form->{duedate} = $today->to_kivitendo;
$::form->{rowcount} = @{ $template->items };
$::form->{paidaccounts} = 1;
- $::form->{$_} = $template->$_ for qw(department_id taxincluded ob_transaction cb_transaction reference description show_details);
+ $::form->{$_} = $template->$_ for qw(department_id taxincluded ob_transaction cb_transaction reference description show_details transaction_description);
$::form->{$_} = $dummy_form->{$_} for qw(closedto revtrans previous_id previous_gldate);
my $row = 0;
my $template = $::form->{record_template_id} ? SL::DB::RecordTemplate->new(id => $::form->{record_template_id})->load : SL::DB::RecordTemplate->new;
my $js = SL::ClientJS->new(controller => SL::Controller::Base->new);
my $new_name = $template->template_name_to_use($::form->{record_template_new_template_name});
-
$js->dialog->close('#record_template_dialog');
+
+ # bank transactions need amounts for assignment
+ my $can_save = 0;
+ $can_save = 1 if ($::form->{credit_1} > 0 && $::form->{debit_2} > 0 && $::form->{credit_2} == 0 && $::form->{debit_1} == 0);
+ $can_save = 1 if ($::form->{credit_2} > 0 && $::form->{debit_1} > 0 && $::form->{credit_1} == 0 && $::form->{debit_2} == 0);
+ return $js->flash('error', t8('Can only save template if amounts,i.e. 1 for debit and credit are set.'))->render unless $can_save;
+
my @items = grep {
$_->{chart_id} && (($_->{tax_id} // '') ne '')
} map {
template_type => 'gl_transaction',
template_name => $new_name,
- currency_id => $::instance_conf->get_currency_id,
- department_id => $::form->{department_id} || undef,
- project_id => $::form->{globalproject_id} || undef,
- taxincluded => $::form->{taxincluded} ? 1 : 0,
- ob_transaction => $::form->{ob_transaction} ? 1 : 0,
- cb_transaction => $::form->{cb_transaction} ? 1 : 0,
- reference => $::form->{reference},
- description => $::form->{description},
- show_details => $::form->{show_details},
+ currency_id => $::instance_conf->get_currency_id,
+ department_id => $::form->{department_id} || undef,
+ project_id => $::form->{globalproject_id} || undef,
+ taxincluded => $::form->{taxincluded} ? 1 : 0,
+ ob_transaction => $::form->{ob_transaction} ? 1 : 0,
+ cb_transaction => $::form->{cb_transaction} ? 1 : 0,
+ reference => $::form->{reference},
+ description => $::form->{description},
+ show_details => $::form->{show_details},
+ transaction_description => $::form->{transaction_description},
items => \@items,
);
my $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
my @columns = qw(
- transdate gldate id reference description
- notes source doccnt debit debit_accno
- credit credit_accno debit_tax debit_tax_accno
- credit_tax credit_tax_accno projectnumbers balance employee
+ transdate gldate id reference
+ description notes transaction_description source
+ doccnt debit debit_accno
+ credit credit_accno debit_tax debit_tax_accno
+ credit_tax credit_tax_accno balance projectnumbers
+ department employee
);
# add employee here, so that variable is still known and passed in url when choosing a different sort order in resulting table
- my @hidden_variables = qw(accno source reference description notes project_id datefrom dateto employee_id datesort category l_subtotal department_id);
+ my @hidden_variables = qw(accno source reference description notes project_id datefrom dateto employee_id datesort category l_subtotal department_id transaction_description);
push @hidden_variables, map { "l_${_}" } @columns;
my $employee = $form->{employee_id} ? SL::DB::Employee->new(id => $form->{employee_id})->load->name : '';
my (@options, @date_options);
- push @options, $locale->text('Account') . " : $form->{accno} $form->{account_description}" if ($form->{accno});
- push @options, $locale->text('Source') . " : $form->{source}" if ($form->{source});
- push @options, $locale->text('Reference') . " : $form->{reference}" if ($form->{reference});
- push @options, $locale->text('Description') . " : $form->{description}" if ($form->{description});
- push @options, $locale->text('Notes') . " : $form->{notes}" if ($form->{notes});
- push @options, $locale->text('Employee') . " : $employee" if $employee;
+ push @options, $locale->text('Account') . " : $form->{accno} $form->{account_description}" if ($form->{accno});
+ push @options, $locale->text('Source') . " : $form->{source}" if ($form->{source});
+ push @options, $locale->text('Reference') . " : $form->{reference}" if ($form->{reference});
+ push @options, $locale->text('Description') . " : $form->{description}" if ($form->{description});
+ push @options, $locale->text('Notes') . " : $form->{notes}" if ($form->{notes});
+ push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description};
+ push @options, $locale->text('Employee') . " : $employee" if $employee;
my $datesorttext = $form->{datesort} eq 'transdate' ? $locale->text('Transdate') : $locale->text('Gldate');
push @date_options, "$datesorttext" if ($form->{datesort} and ($form->{datefrom} or $form->{dateto}));
push @date_options, $locale->text('From'), $locale->date(\%myconfig, $form->{datefrom}, 1) if ($form->{datefrom});
$form->{l_doccnt} = $form->{l_source} ? 'Y' : '';
my %column_defs = (
- 'id' => { 'text' => $locale->text('ID'), },
- 'transdate' => { 'text' => $locale->text('Transdate'), },
- 'gldate' => { 'text' => $locale->text('Gldate'), },
- 'reference' => { 'text' => $locale->text('Reference'), },
- 'source' => { 'text' => $locale->text('Source'), },
- 'doccnt' => { 'text' => $locale->text('Document Count'), },
- 'description' => { 'text' => $locale->text('Description'), },
- 'notes' => { 'text' => $locale->text('Notes'), },
- 'debit' => { 'text' => $locale->text('Debit'), },
- 'debit_accno' => { 'text' => $locale->text('Debit Account'), },
- 'credit' => { 'text' => $locale->text('Credit'), },
- 'credit_accno' => { 'text' => $locale->text('Credit Account'), },
- 'debit_tax' => { 'text' => $locale->text('Debit Tax'), },
- 'debit_tax_accno' => { 'text' => $locale->text('Debit Tax Account'), },
- 'credit_tax' => { 'text' => $locale->text('Credit Tax'), },
- 'credit_tax_accno' => { 'text' => $locale->text('Credit Tax Account'), },
- 'balance' => { 'text' => $locale->text('Balance'), },
- 'projectnumbers' => { 'text' => $locale->text('Project Numbers'), },
- 'employee' => { 'text' => $locale->text('Employee'), },
+ 'id' => { 'text' => $locale->text('ID'), },
+ 'transdate' => { 'text' => $locale->text('Transdate'), },
+ 'gldate' => { 'text' => $locale->text('Gldate'), },
+ 'reference' => { 'text' => $locale->text('Reference'), },
+ 'source' => { 'text' => $locale->text('Source'), },
+ 'doccnt' => { 'text' => $locale->text('Document Count'), },
+ 'description' => { 'text' => $locale->text('Description'), },
+ 'notes' => { 'text' => $locale->text('Notes'), },
+ 'debit' => { 'text' => $locale->text('Debit'), },
+ 'debit_accno' => { 'text' => $locale->text('Debit Account'), },
+ 'credit' => { 'text' => $locale->text('Credit'), },
+ 'credit_accno' => { 'text' => $locale->text('Credit Account'), },
+ 'debit_tax' => { 'text' => $locale->text('Debit Tax'), },
+ 'debit_tax_accno' => { 'text' => $locale->text('Debit Tax Account'), },
+ 'credit_tax' => { 'text' => $locale->text('Credit Tax'), },
+ 'credit_tax_accno' => { 'text' => $locale->text('Credit Tax Account'), },
+ 'balance' => { 'text' => $locale->text('Balance'), },
+ 'projectnumbers' => { 'text' => $locale->text('Project Numbers'), },
+ 'department' => { 'text' => $locale->text('Department'), },
+ 'employee' => { 'text' => $locale->text('Employee'), },
+ 'transaction_description' => { 'text' => $locale->text('Transaction description'), },
);
- foreach my $name (qw(id transdate gldate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
+ foreach my $name (qw(id transdate gldate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno department transaction_description)) {
my $sortname = $name =~ m/accno/ ? 'accno' : $name;
my $sortdir = $sortname eq $form->{sort} ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $callback . "&sort=$sortname&sortdir=$sortdir";
$row->{balance}->{data} = $data;
$row->{projectnumbers}->{data} = join ", ", sort { lc($a) cmp lc($b) } keys %{ $ref->{projectnumbers} };
- map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes gldate employee);
+ map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes gldate employee department transaction_description);
map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source);
$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, $is_reconciled_bank_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;
+ }
+ # dont edit reconcilated bookings!
+ if ($form->{id}) {
+ my @acc_trans = map { $_->acc_trans_id } @{ SL::DB::Manager::AccTransaction->get_all( where => [ trans_id => $form->{id} ] ) };
+ if (scalar @acc_trans && scalar @{ SL::DB::Manager::ReconciliationLink->get_all(where => [ acc_trans_id => [ @acc_trans ] ]) }) {
+ $is_reconciled_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.')
+ : $is_linked_ap_transaction ? t8('This transaction is linked with a AP transaction. Please undo and redo the AP transaction booking if needed.')
+ : $is_reconciled_bank_transaction ? t8('This transaction is reconciled with a bank transaction. Please undo the reconciliation 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.')
+ : $is_reconciled_bank_transaction ? t8('This transaction is reconciled with a bank transaction. Please undo the reconciliation 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.')
+ : $is_reconciled_bank_transaction ? t8('This transaction is reconciled with a bank transaction. Please undo the reconciliation 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) : ();
my $locale = $main::locale;
# check if there is something in reference and date
- $form->isblank("reference", $locale->text('Reference missing!'));
- $form->isblank("transdate", $locale->text('Transaction Date missing!'));
- $form->isblank("description", $locale->text('Description missing!'));
+ $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);
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%' },
die "guru meditation error: Can only assign amount to one bank account booking" if scalar @{ $payment } > 1;
# 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"
- unless $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});
- }
-
- # 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