X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=faca8ce0d256b84c0fa535427d870a6a64e3dc31;hb=577042c61c5e1fffb8747079b4f9826e51532ee8;hp=cb2ebb2e7ad25a26a4e696bbb79030328a0aa36b;hpb=ad635c66023bc107d55b2f2f41f6fcadabd02cc3;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index cb2ebb2e7..faca8ce0d 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -36,16 +36,24 @@ use utf8;
use strict;
use POSIX qw(strftime);
-use List::Util qw(sum);
+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 flash_later);
use SL::IS;
use SL::ReportGenerator;
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";
@@ -77,6 +85,135 @@ require "bin/mozilla/reportgenerator.pl";
# $locale->text('Nov')
# $locale->text('Dec')
+sub load_record_template {
+ $::auth->assert('gl_transactions');
+
+ # Load existing template and verify that its one for this module.
+ my $template = SL::DB::RecordTemplate
+ ->new(id => $::form->{id})
+ ->load(
+ with_object => [ qw(customer payment currency record_items record_items.chart) ],
+ );
+
+ 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 = {};
+ GL->transaction(\%::myconfig, $dummy_form);
+
+ # Fill $::form from the template.
+ my $today = DateTime->today_local;
+ $::form->{title} = "Add";
+ $::form->{transdate} = $today->to_kivitendo;
+ $::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 transaction_description);
+ $::form->{$_} = $dummy_form->{$_} for qw(closedto revtrans previous_id previous_gldate);
+
+ my $row = 0;
+ foreach my $item (@{ $template->items }) {
+ $row++;
+
+ my $active_taxkey = $item->chart->get_active_taxkey;
+ my $taxes = SL::DB::Manager::Tax->get_all(
+ where => [ chart_categories => { like => '%' . $item->chart->category . '%' }],
+ sort_by => 'taxkey, rate',
+ );
+
+ my $tax = first { $item->tax_id == $_->id } @{ $taxes };
+ $tax //= first { $active_taxkey->tax_id == $_->id } @{ $taxes };
+ $tax //= $taxes->[0];
+
+ if (!$tax) {
+ $row--;
+ next;
+ }
+
+ $::form->{"accno_id_${row}"} = $item->chart_id;
+ $::form->{"previous_accno_id_${row}"} = $item->chart_id;
+ $::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(
+ keep_rows_without_amount => 1,
+ dont_add_new_row => 1,
+ );
+}
+
+sub save_record_template {
+ $::auth->assert('gl_transactions');
+
+ 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 {
+ +{ chart_id => $::form->{"accno_id_${_}"},
+ amount1 => $::form->parse_amount(\%::myconfig, $::form->{"debit_${_}"}),
+ amount2 => $::form->parse_amount(\%::myconfig, $::form->{"credit_${_}"}),
+ tax_id => (split m{--}, $::form->{"taxchart_${_}"})[0],
+ project_id => $::form->{"project_id_${_}"} || undef,
+ source => $::form->{"source_${_}"},
+ memo => $::form->{"memo_${_}"},
+ }
+ } (1..($::form->{rowcount} || 1));
+
+ $template->assign_attributes(
+ 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},
+ transaction_description => $::form->{transaction_description},
+
+ items => \@items,
+ );
+
+ eval {
+ $template->save;
+ 1;
+ } or do {
+ return $js
+ ->flash('error', $::locale->text("Saving the record template '#1' failed.", $new_name))
+ ->render;
+ };
+
+ return $js
+ ->flash('info', $::locale->text("The record template '#1' has been saved.", $new_name))
+ ->render;
+}
+
sub add {
$main::lxdebug->enter_sub();
@@ -99,7 +236,7 @@ sub add {
$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};
@@ -120,7 +257,7 @@ sub prepare_transaction {
$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;
@@ -184,12 +321,11 @@ sub edit {
$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'),
@@ -212,7 +348,9 @@ sub search {
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', {
@@ -290,26 +428,29 @@ sub generate_report {
my $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
my @columns = qw(
- gldate transdate id reference description
- notes source 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);
+ 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;
- my $datesorttext = $form->{datesort} eq 'transdate' ? $locale->text('Invoice Date') : $locale->text('Booking Date');
+ 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});
push @date_options, $locale->text('Bis'), $locale->date(\%myconfig, $form->{dateto}, 1) if ($form->{dateto});
@@ -331,29 +472,33 @@ sub generate_report {
$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'), },
- 'reference' => { 'text' => $locale->text('Reference'), },
- 'source' => { 'text' => $locale->text('Source'), },
- '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";
@@ -373,7 +518,8 @@ sub generate_report {
$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});
@@ -422,6 +568,10 @@ sub generate_report {
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";
@@ -436,7 +586,7 @@ sub generate_report {
$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);
@@ -499,6 +649,8 @@ sub generate_report {
$report->set_options('raw_bottom_info_text' => $raw_bottom_info_text);
+ setup_gl_transactions_action_bar();
+
$report->generate_with_headers();
$main::lxdebug->leave_sub();
@@ -511,6 +663,8 @@ sub show_draft {
}
sub update {
+ my %params = @_;
+
$main::lxdebug->enter_sub();
$main::auth->assert('gl_transactions');
@@ -533,72 +687,68 @@ sub update {
my $zerotaxes = selectall_hashref_query($form, $dbh, "SELECT id FROM tax WHERE rate = 0", );
my @flds =
- qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
+ qw(accno_id debit credit projectnumber fx_transaction source memo tax taxchart);
for my $i (1 .. $form->{rowcount}) {
+ $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) for qw(debit credit tax);
- unless (($form->{"debit_$i"} eq "") && ($form->{"credit_$i"} eq "")) {
- for (qw(debit credit tax)) {
- $form->{"${_}_$i"} =
- $form->parse_amount(\%myconfig, $form->{"${_}_$i"});
- }
+ next if !$form->{"debit_$i"} && !$form->{"credit_$i"} && !$params{keep_rows_without_amount};
+
+ push @a, {};
+ $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
+ if ($debitcredit) {
+ $debitcount++;
+ } else {
+ $creditcount++;
+ }
- push @a, {};
- $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
+ if (($debitcount >= 2) && ($creditcount == 2)) {
+ $form->{"credit_$i"} = 0;
+ $form->{"tax_$i"} = 0;
+ $creditcount--;
+ $form->{creditlock} = 1;
+ }
+ if (($creditcount >= 2) && ($debitcount == 2)) {
+ $form->{"debit_$i"} = 0;
+ $form->{"tax_$i"} = 0;
+ $debitcount--;
+ $form->{debitlock} = 1;
+ }
+ if (($creditcount == 1) && ($debitcount == 2)) {
+ $form->{creditlock} = 1;
+ }
+ if (($creditcount == 2) && ($debitcount == 1)) {
+ $form->{debitlock} = 1;
+ }
+ if ($debitcredit && $credittax) {
+ $form->{"taxchart_$i"} = "$notax_id--0.00000";
+ }
+ if (!$debitcredit && $debittax) {
+ $form->{"taxchart_$i"} = "$notax_id--0.00000";
+ }
+ $amount =
+ ($form->{"debit_$i"} == 0)
+ ? $form->{"credit_$i"}
+ : $form->{"debit_$i"};
+ my $j = $#a;
+ if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
+ $form->{"taxchart_$i"} = "$notax_id--0.00000";
+ $form->{"tax_$i"} = 0;
+ }
+ my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+ my $iswithouttax = grep { $_->{id} == $taxkey } @{ $zerotaxes };
+ if (!$iswithouttax) {
if ($debitcredit) {
- $debitcount++;
+ $debittax = 1;
} else {
- $creditcount++;
- }
-
- if (($debitcount >= 2) && ($creditcount == 2)) {
- $form->{"credit_$i"} = 0;
- $form->{"tax_$i"} = 0;
- $creditcount--;
- $form->{creditlock} = 1;
- }
- if (($creditcount >= 2) && ($debitcount == 2)) {
- $form->{"debit_$i"} = 0;
- $form->{"tax_$i"} = 0;
- $debitcount--;
- $form->{debitlock} = 1;
- }
- if (($creditcount == 1) && ($debitcount == 2)) {
- $form->{creditlock} = 1;
- }
- if (($creditcount == 2) && ($debitcount == 1)) {
- $form->{debitlock} = 1;
- }
- if ($debitcredit && $credittax) {
- $form->{"taxchart_$i"} = "$notax_id--0.00";
- }
- if (!$debitcredit && $debittax) {
- $form->{"taxchart_$i"} = "$notax_id--0.00";
- }
- $amount =
- ($form->{"debit_$i"} == 0)
- ? $form->{"credit_$i"}
- : $form->{"debit_$i"};
- my $j = $#a;
- if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
- $form->{"taxchart_$i"} = "$notax_id--0.00";
- $form->{"tax_$i"} = 0;
+ $credittax = 1;
}
- my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
- my $iswithouttax = grep { $_->{id} == $taxkey } @{ $zerotaxes };
- if (!$iswithouttax) {
- if ($debitcredit) {
- $debittax = 1;
- } else {
- $credittax = 1;
- }
- };
- my ($tmpnetamount,$tmpdiff);
- ($tmpnetamount,$form->{"tax_$i"},$tmpdiff) = $form->calculate_tax($amount,$rate,$form->{taxincluded} *= 1,2);
+ };
+ my ($tmpnetamount,$tmpdiff);
+ ($tmpnetamount,$form->{"tax_$i"},$tmpdiff) = $form->calculate_tax($amount,$rate,$form->{taxincluded} *= 1,2);
- for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
- $count++;
- }
+ for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
+ $count++;
}
for my $i (1 .. $count) {
@@ -610,9 +760,9 @@ sub update {
for (@flds) { delete $form->{"${_}_$i"} }
}
- $form->{rowcount} = $count + 1;
+ $form->{rowcount} = $count + ($params{dont_add_new_row} ? 0 : 1);
- &display_form;
+ display_form();
$main::lxdebug->leave_sub();
}
@@ -656,16 +806,10 @@ sub display_rows {
$form->{totaldebit} = 0;
$form->{totalcredit} = 0;
- my %project_labels = ();
- my @project_values = ("");
- foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
- push(@project_values, $item->{"id"});
- $project_labels{$item->{"id"}} = $item->{"projectnumber"};
- }
-
my %charts_by_id = map { ($_->{id} => $_) } @{ $::form->{ALL_CHARTS} };
my $default_chart = $::form->{ALL_CHARTS}[0];
my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local;
+ my $deliverydate = $::form->{deliverydate} ? DateTime->from_kivitendo($::form->{deliverydate}) : undef;
my ($source, $memo, $source_hidden, $memo_hidden);
for my $i (1 .. $form->{rowcount}) {
@@ -684,28 +828,33 @@ sub display_rows {
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) ) {
+ my $used_tax_id;
+ if ( $form->{"taxchart_$i"} ) {
+ ($used_tax_id) = split(/--/, $form->{"taxchart_$i"});
+ }
+
+ my $taxdate = $deliverydate ? $deliverydate : $transdate;
+ foreach my $item ( GL->get_active_taxes_for_chart($accno_id, $taxdate, $used_tax_id) ) {
my $key = $item->id . "--" . $item->rate;
$first_taxchart //= $item;
$default_taxchart = $item if $item->{is_default};
$taxchart_to_use = $item if $key eq $form->{"taxchart_$i"};
push(@taxchart_values, $key);
- $taxchart_labels{$key} = $item->taxdescription . " " . $item->rate * 100 . ' %';
+ $taxchart_labels{$key} = $item->taxkey . " - " . $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|| | .
- $::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| | |;
my $tax_ddbox = qq|| .
NTI($cgi->popup_menu('-name' => "taxchart_$i",
@@ -772,17 +921,18 @@ sub display_rows {
}
}
- my $projectnumber =
- NTI($cgi->popup_menu('-name' => "project_id_$i",
- '-values' => \@project_values,
- '-labels' => \%project_labels,
- '-default' => $form->{"project_id_$i"} ));
- my $projectnumber_hidden = qq|
- |;
+ my $projectnumber = SL::Presenter::Project::picker("project_id_$i", $form->{"project_id_$i"});
+ my $projectnumber_hidden = SL::Presenter::Tag::hidden_tag("project_id_$i", $form->{"project_id_$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| |
$accno
| ${balance} |
@@ -820,24 +970,182 @@ sub _get_radieren {
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, $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(
+ action => [
+ t8('Update'),
+ submit => [ '#form', { action => 'update' } ],
+ id => 'update_button',
+ accesskey => 'enter',
+ ],
+ %post_entry,
+ 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.')
+ : $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'),
+ 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.')
+ : $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,
+ ],
+ ], # end of combobox "Storno"
+
+ combobox => [
+ action => [ t8('more') ],
+ action => [
+ t8('History'),
+ call => [ 'set_history_window', $form->{id} * 1, 'glid' ],
+ 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");
-
- my @old_project_ids = grep { $_ } map{ $::form->{"project_id_$_"} } 1..$::form->{rowcount};
+ $::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");
- $::form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 0,
- "old_id" => \@old_project_ids },
+ my @old_project_ids = grep { $_ } map{ $::form->{"project_id_$_"} } 1..$::form->{rowcount};
+ my @conditions = @old_project_ids ? (id => \@old_project_ids) : ();
+ $::form->{ALL_PROJECTS} = SL::DB::Manager::Project->get_all_sorted(query => [ or => [ active => 1, @conditions ]]);
- "charts" => { "key" => "ALL_CHARTS",
- "transdate" => $::form->{transdate} });
+ $::form->get_lists(
+ "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");
@@ -857,6 +1165,8 @@ sub form_header {
$::form->{previous_id} ||= "--";
$::form->{previous_gldate} ||= "--";
+ setup_gl_action_bar();
+
$::form->header;
print $::form->parse_html_template('gl/form_header', {
hide_title => $title,
@@ -890,42 +1200,6 @@ sub form_footer {
sub delete {
$main::lxdebug->enter_sub();
- my $form = $main::form;
- my $locale = $main::locale;
-
- $form->header;
-
- print qq|
-
-|;
- $main::lxdebug->leave_sub();
-
-}
-
-sub yes {
- $main::lxdebug->enter_sub();
-
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
@@ -954,9 +1228,10 @@ sub post_transaction {
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);
@@ -974,7 +1249,7 @@ sub post_transaction {
my ($notax_id) = selectrow_query($form, $dbh, "SELECT id FROM tax WHERE taxkey = 0 LIMIT 1", );
my $zerotaxes = selectall_hashref_query($form, $dbh, "SELECT id FROM tax WHERE rate = 0", );
- my @flds = qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
+ my @flds = qw(accno_id debit credit projectnumber fx_transaction source memo tax taxchart);
for my $i (1 .. $form->{rowcount}) {
next if $form->{"debit_$i"} eq "" && $form->{"credit_$i"} eq "";
@@ -1014,17 +1289,17 @@ sub post_transaction {
$form->{debitlock} = 1;
}
if ($debitcredit && $credittax) {
- $form->{"taxchart_$i"} = "$notax_id--0.00";
+ $form->{"taxchart_$i"} = "$notax_id--0.00000";
}
if (!$debitcredit && $debittax) {
- $form->{"taxchart_$i"} = "$notax_id--0.00";
+ $form->{"taxchart_$i"} = "$notax_id--0.00000";
}
my $amount = ($form->{"debit_$i"} == 0)
? $form->{"credit_$i"}
: $form->{"debit_$i"};
my $j = $#a;
if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
- $form->{"taxchart_$i"} = "$notax_id--0.00";
+ $form->{"taxchart_$i"} = "$notax_id--0.00000";
$form->{"tax_$i"} = 0;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
@@ -1095,24 +1370,72 @@ sub post_transaction {
$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;
- }
- # /saving the 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: " . $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));
+
+ # 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 };
$main::lxdebug->leave_sub();
}
@@ -1126,9 +1449,7 @@ sub post {
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");
@@ -1137,12 +1458,28 @@ sub post {
post_transaction();
if ($::instance_conf->get_webdav) {
SL::Webdav->new(type => 'general_ledger',
- number => $form->{reference},
+ number => $form->{id},
)->webdav_path;
}
- $form->{callback} = build_std_url("action=add", "show_details");
- $form->redirect($form->{callback});
+ 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();
}
@@ -1196,8 +1533,9 @@ sub continue {
}
sub get_tax_dropdown {
- my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local;
- my @tax_accounts = GL->get_active_taxes_for_chart($::form->{accno_id}, $transdate);
+ my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local;
+ my $deliverydate = $::form->{deliverydate} ? DateTime->from_kivitendo($::form->{deliverydate}) : undef;
+ my @tax_accounts = GL->get_active_taxes_for_chart($::form->{accno_id}, $deliverydate // $transdate);
my $html = $::form->parse_html_template("gl/update_tax_accounts", { TAX_ACCOUNTS => \@tax_accounts });
print $::form->ajax_response_header, $html;