use List::Util qw(first sum);
use SL::DB::RecordTemplate;
+use SL::DB::BankTransactionAccTrans;
use SL::DB::Tax;
use SL::FU;
use SL::GL;
use SL::DBUtils qw(selectrow_query selectall_hashref_query);
use SL::Webdav;
use SL::Locale::String qw(t8);
-
+use SL::Helper::GlAttachments qw(count_gl_attachments);
+use SL::Presenter::Tag;
+use SL::Presenter::Chart;
require "bin/mozilla/common.pl";
require "bin/mozilla/reportgenerator.pl";
die "invalid template type" unless $template->template_type eq 'gl_transaction';
$template->substitute_variables;
+ my $payment_suggestion = $::form->{form_defaults}->{amount_1};
# Clean the current $::form before rebuilding it from the template.
+ my $form_defaults = delete $::form->{form_defaults};
delete @{ $::form }{ grep { !m{^(?:script|login)$}i } keys %{ $::form } };
my $dummy_form = {};
$::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);
+ $::form->{$_} = $template->$_ for qw(department_id taxincluded ob_transaction cb_transaction reference description show_details);
$::form->{$_} = $dummy_form->{$_} for qw(closedto revtrans previous_id previous_gldate);
my $row = 0;
$::form->{"accno_id_${row}"} = $item->chart_id;
$::form->{"previous_accno_id_${row}"} = $item->chart_id;
- $::form->{"debit_${row}"} = $::form->format_amount(\%::myconfig, $item->amount1, 2) if $item->amount1 * 1;
- $::form->{"credit_${row}"} = $::form->format_amount(\%::myconfig, $item->amount2, 2) if $item->amount2 * 1;
+ $::form->{"debit_${row}"} = $::form->format_amount(\%::myconfig, ($payment_suggestion ? $payment_suggestion : $item->amount1), 2) if $item->amount1 * 1;
+ $::form->{"credit_${row}"} = $::form->format_amount(\%::myconfig, ($payment_suggestion ? $payment_suggestion : $item->amount2), 2) if $item->amount2 * 1;
$::form->{"taxchart_${row}"} = $item->tax_id . '--' . $tax->rate;
$::form->{"${_}_${row}"} = $item->$_ for qw(source memo project_id);
}
+ $::form->{$_} = $form_defaults->{$_} for keys %{ $form_defaults // {} };
+
flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
update(
cb_transaction => $::form->{cb_transaction} ? 1 : 0,
reference => $::form->{reference},
description => $::form->{description},
+ show_details => $::form->{show_details},
items => \@items,
);
$form->{credit} = 0;
$form->{tax} = 0;
- $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
$form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
$form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
- $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
my $i = 1;
my $tax = 0;
$form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
- if ($form->{reference} && $::instance_conf->get_webdav) {
+ if ($form->{id} && $::instance_conf->get_webdav) {
my $webdav = SL::Webdav->new(
type => 'general_ledger',
- number => $form->{reference},
+ number => $form->{id},
);
- my $webdav_path = $webdav->webdav_path;
my @all_objects = $webdav->get_all_objects;
@{ $form->{WEBDAV} } = map { { name => $_->filename,
type => t8('File'),
projects => { key => "ALL_PROJECTS", all => 1 },
);
$::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
- $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
+
+ setup_gl_search_action_bar();
$::form->header;
print $::form->parse_html_template('gl/search', {
my $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
my @columns = qw(
- gldate transdate id reference description
- notes source debit debit_accno
+ 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
);
# 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);
+ my @hidden_variables = qw(accno source reference description notes project_id datefrom dateto employee_id datesort category l_subtotal department_id);
push @hidden_variables, map { "l_${_}" } @columns;
my $employee = $form->{employee_id} ? SL::DB::Employee->new(id => $form->{employee_id})->load->name : '';
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;
- my $datesorttext = $form->{datesort} eq 'transdate' ? $locale->text('Invoice Date') : $locale->text('Booking Date');
+ 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});
push @date_options, $locale->text('Bis'), $locale->date(\%myconfig, $form->{dateto}, 1) if ($form->{dateto});
$form->{l_datesort} = 'Y';
$form->{l_debit_tax_accno} = 'Y';
$form->{l_balance} = $form->{accno} ? 'Y' : '';
+ $form->{l_doccnt} = $form->{l_source} ? 'Y' : '';
my %column_defs = (
'id' => { 'text' => $locale->text('ID'), },
- 'transdate' => { 'text' => $locale->text('Invoice Date'), },
- 'gldate' => { 'text' => $locale->text('Booking Date'), },
+ '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'), },
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
- $report->set_export_options('generate_report', @hidden_variables, qw(sort sortdir));
+ $form->{l_attachments} = 'Y';
+ $report->set_export_options('generate_report', @hidden_variables, qw(sort sortdir l_attachments));
$report->set_sort_indicator($form->{sort} eq 'accno' ? 'debit_accno' : $form->{sort}, $form->{sortdir});
my $row = { };
map { $row->{$_} = { 'data' => '', 'align' => $column_alignment{$_} } } @columns;
+ if ( $form->{l_doccnt} ) {
+ $row->{doccnt}->{data} = SL::Helper::GlAttachments->count_gl_pdf_attachments($ref->{id},$ref->{type});
+ }
+
my $sh = "";
if ($form->{balance} < 0) {
$sh = " S";
$report->set_options('raw_bottom_info_text' => $raw_bottom_info_text);
+ setup_gl_transactions_action_bar(num_rows => scalar(@{$form->{GL}}));
+
$report->generate_with_headers();
$main::lxdebug->leave_sub();
my %taxchart_labels = ();
my @taxchart_values = ();
- my $accno_id = $::form->{"accno_id_$i"};
- my $chart = $charts_by_id{$accno_id} // $default_chart;
- $accno_id = $chart->{id};
- my $chart_has_changed = $::form->{"previous_accno_id_$i"} && ($accno_id != $::form->{"previous_accno_id_$i"});
+ my $accno_id = $::form->{"accno_id_$i"};
+ my $chart = $charts_by_id{$accno_id} // $default_chart;
+ $accno_id = $chart->{id};
my ($first_taxchart, $default_taxchart, $taxchart_to_use);
foreach my $item ( GL->get_active_taxes_for_chart($accno_id, $transdate) ) {
$taxchart_labels{$key} = $item->taxdescription . " " . $item->rate * 100 . ' %';
}
- $taxchart_to_use = $default_taxchart // $first_taxchart if $chart_has_changed || !$taxchart_to_use;
+ $taxchart_to_use //= $default_taxchart // $first_taxchart;
my $selected_taxchart = $taxchart_to_use->id . '--' . $taxchart_to_use->rate;
my $accno = qq|<td>| .
- $::request->presenter->chart_picker("accno_id_$i", $accno_id, style => "width: 300px") .
- $::request->presenter->hidden_tag("previous_accno_id_$i", $accno_id)
+ SL::Presenter::Chart::picker("accno_id_$i", $accno_id, style => "width: 300px") .
+ SL::Presenter::Tag::hidden_tag("previous_accno_id_$i", $accno_id)
. qq|</td>|;
my $tax_ddbox = qq|<td>| .
NTI($cgi->popup_menu('-name' => "taxchart_$i",
my $copy2credit = $i == 1 ? 'onkeyup="copy_debit_to_credit()"' : '';
my $balance = $form->format_amount(\%::myconfig, $balances{$accno_id} // 0, 2, 'DRCR');
+ # if we have a bt_chart_id we disallow changing the amount of the bank account
+ if ($form->{bt_chart_id}) {
+ $debitreadonly = $creditreadonly = "readonly" if ($form->{"accno_id_$i"} eq $form->{bt_chart_id});
+ $copy2credit = '' if $i == 1; # and disallow copy2credit
+ }
+
print qq|<tr valign=top>
$accno
<td id="chart_balance_$i" align="right">${balance}</td>
return ($::instance_conf->get_gl_changeable == 2) ? ($::form->current_date(\%::myconfig) eq $::form->{gldate}) : ($::instance_conf->get_gl_changeable == 1);
}
+sub setup_gl_action_bar {
+ my %params = @_;
+ 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;
+
+ if ($form->{id} && SL::DB::Manager::BankTransactionAccTrans->find_by(gl_id => $form->{id})) {
+ $is_linked_bank_transaction = 1;
+ }
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Update'),
+ submit => [ '#form', { action => 'update' } ],
+ 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,
+ ],
+ combobox => [
+ action => [ t8('Storno'),
+ submit => [ '#form', { action => 'storno' } ],
+ confirm => t8('Do you really want to cancel this general ledger transaction?'),
+ 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.')
+ : undef,
+ ],
+ action => [ t8('Delete'),
+ submit => [ '#form', { action => 'delete' } ],
+ confirm => t8('Do you really want to delete this object?'),
+ disabled => !$form->{id} ? t8('This invoice has not been posted yet.')
+ : $form->{locked} ? t8('The billing period has already been locked.')
+ : $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.')
+ : $form->{storno} ? t8('A canceled general ledger transaction cannot be deleted.')
+ : undef,
+ ],
+ ], # end of combobox "Storno"
+
+ combobox => [
+ action => [ t8('more') ],
+ action => [
+ t8('History'),
+ call => [ 'set_history_window', $form->{id} * 1, 'id' ],
+ disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
+ ],
+ action => [
+ t8('Follow-Up'),
+ call => [ 'follow_up_window' ],
+ disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
+ ],
+ action => [
+ t8('Record templates'),
+ call => [ 'kivi.RecordTemplate.popup', 'gl_transaction' ],
+ ],
+ action => [
+ t8('Drafts'),
+ 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,
+ ],
+ ], # end of combobox "more"
+ );
+ }
+}
+
+sub setup_gl_search_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Search'),
+ submit => [ '#form', { action => 'continue', nextsub => 'generate_report' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
+sub setup_gl_transactions_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ combobox => [
+ action => [ $::locale->text('Create new') ],
+ action => [
+ $::locale->text('GL Transaction'),
+ submit => [ '#create_new_form', { action => 'gl_transaction' } ],
+ ],
+ action => [
+ $::locale->text('AR Transaction'),
+ submit => [ '#create_new_form', { action => 'ar_transaction' } ],
+ ],
+ action => [
+ $::locale->text('AP Transaction'),
+ submit => [ '#create_new_form', { action => 'ap_transaction' } ],
+ ],
+ action => [
+ $::locale->text('Sales Invoice'),
+ submit => [ '#create_new_form', { action => 'sales_invoice' } ],
+ ],
+ action => [
+ $::locale->text('Vendor Invoice'),
+ submit => [ '#create_new_form', { action => 'vendor_invoice' } ],
+ ],
+ ], # end of combobox "Create new"
+ );
+ }
+}
+
sub form_header {
$::lxdebug->enter_sub;
$::auth->assert('gl_transactions');
my ($init) = @_;
- $::request->layout->add_javascripts("autocomplete_chart.js", "kivi.GL.js", "kivi.RecordTemplate.js");
+ $::request->layout->add_javascripts("autocomplete_chart.js", "kivi.File.js", "kivi.GL.js", "kivi.RecordTemplate.js");
my @old_project_ids = grep { $_ } map{ $::form->{"project_id_$_"} } 1..$::form->{rowcount};
"charts" => { "key" => "ALL_CHARTS",
"transdate" => $::form->{transdate} });
- $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+ # we cannot book on charttype header
+ @{ $::form->{ALL_CHARTS} } = grep { $_->{charttype} ne 'H' } @{ $::form->{ALL_CHARTS} };
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
my $title = $::form->{title};
$::form->{title} = $::locale->text("$title General Ledger Transaction");
$::form->{previous_id} ||= "--";
$::form->{previous_gldate} ||= "--";
+ setup_gl_action_bar();
+
$::form->header;
print $::form->parse_html_template('gl/form_header', {
hide_title => $title,
sub delete {
$main::lxdebug->enter_sub();
- my $form = $main::form;
- my $locale = $main::locale;
-
- $form->header;
-
- print qq|
-<form method=post action=gl.pl>
-|;
-
- map { $form->{$_} =~ s/\"/"/g } qw(reference description);
-
- delete $form->{header};
-
- foreach my $key (keys %$form) {
- next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
- print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
- }
-
- print qq|
-<h2 class=confirm>| . $locale->text('Confirm!') . qq|</h2>
-
-<h4>|
- . $locale->text('Are you sure you want to delete Transaction')
- . qq| $form->{reference}</h4>
-
-<input name=action class=submit type=submit value="|
- . $locale->text('Yes') . qq|">
-</form>
-|;
- $main::lxdebug->leave_sub();
-
-}
-
-sub yes {
- $main::lxdebug->enter_sub();
-
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
$form->error($locale->text('Empty transaction!'));
}
- if ((my $errno = GL->post_transaction(\%myconfig, \%$form)) <= -1) {
- $errno *= -1;
- my @err;
- $err[1] = $locale->text('Cannot have a value in both Debit and Credit!');
- $err[2] = $locale->text('Debit and credit out of balance!');
- $err[3] = $locale->text('Cannot post a transaction without a value!');
- $form->error($err[$errno]);
- }
- undef($form->{callback});
- # saving the history
- if(!exists $form->{addition} && $form->{id} ne "") {
- $form->{snumbers} = qq|gltransaction_| . $form->{id};
- $form->{addition} = "POSTED";
- $form->{what_done} = "gl transaction";
- $form->save_history;
+ # start transaction (post + history + (optional) banktrans)
+ SL::DB->client->with_transaction(sub {
+
+ if ((my $errno = GL->post_transaction(\%myconfig, \%$form)) <= -1) {
+ $errno *= -1;
+ my @err;
+ $err[1] = $locale->text('Cannot have a value in both Debit and Credit!');
+ $err[2] = $locale->text('Debit and credit out of balance!');
+ $err[3] = $locale->text('Cannot post a transaction without a value!');
+
+ die $err[$errno];
+ }
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = qq|gltransaction_| . $form->{id};
+ $form->{addition} = "POSTED";
+ $form->{what_done} = "gl transaction";
+ $form->save_history;
+ }
+
+ # Case BankTransaction: update RecordLink and BankTransaction
+ if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
+ # set invoice_amount - we only rely on bt_id in form, do all other stuff ui independent
+ # die if we have a unlogic or NYI case and abort the whole transaction
+ my ($bt, $chart_id, $payment);
+ require SL::DB::Manager::BankTransaction;
+
+ $bt = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
+ 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;
+
+ $payment = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $::form->{id},
+ chart_link => { like => '%_paid%' },
+ chart_id => $chart_id ]);
+ 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;
+
+ $bt->update_attributes(invoice_amount => $bt->invoice_amount + ($payment->[0]->amount * -1));
+
+ # create record_link
+ my %props = (
+ from_table => 'bank_transactions',
+ from_id => $::form->{bt_id},
+ to_table => 'gl',
+ to_id => $::form->{id},
+ );
+ SL::DB::RecordLink->new(%props)->save;
+ # and tighten holy acc_trans_id for this bank_transaction
+ my %props_acc = (
+ acc_trans_id => $payment->[0]->acc_trans_id,
+ bank_transaction_id => $bt->id,
+ gl_id => $payment->[0]->trans_id,
+ );
+ my $bta = SL::DB::BankTransactionAccTrans->new(%props_acc);
+ $bta->save;
+
+ }
+ 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});
}
- # /saving the history
+ # remove or clarify
+ undef($form->{callback});
$main::lxdebug->leave_sub();
}
my $locale = $main::locale;
if ($::myconfig{mandatory_departments} && !$form->{department_id}) {
- $form->{saved_message} = $::locale->text('You have to specify a department.');
- update();
- exit;
+ $form->error($locale->text('You have to specify a department.'));
}
$form->{title} = $locale->text("$form->{title} General Ledger Transaction");
post_transaction();
if ($::instance_conf->get_webdav) {
SL::Webdav->new(type => 'general_ledger',
- number => $form->{reference},
+ number => $form->{id},
)->webdav_path;
}