X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fgl.pl;h=0d39d47ea65e403c3b1818cec19839d95659c82e;hb=5c8a0b36440e012cd0a54e6b68eb3d1411243b1a;hp=2c203d33e9cf227b80cbc9aeb7e4bdc5ea3fc485;hpb=f0747a2f9c8d7a9d261c20b0d2a9d5911a6ad9b5;p=kivitendo-erp.git diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index 2c203d33e..0d39d47ea 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -36,16 +36,22 @@ use utf8; use strict; use POSIX qw(strftime); -use List::Util qw(sum); +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::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 +83,134 @@ 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); + $::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}, + + 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 +233,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 +254,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; @@ -140,7 +274,7 @@ sub prepare_transaction { $form->{"project_id_$j"} = $ref->{project_id}; } else { - $form->{"accno_$i"} = "$ref->{accno}--$ref->{tax_id}"; + $form->{"accno_id_$i"} = $ref->{chart_id}; for (qw(fx_transaction source memo)) { $form->{"${_}_$i"} = $ref->{$_} } if ($ref->{amount} < 0) { $form->{totaldebit} -= $ref->{amount}; @@ -184,12 +318,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 +345,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,14 +425,15 @@ 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 + 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 + 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); push @hidden_variables, map { "l_${_}" } @columns; my $employee = $form->{employee_id} ? SL::DB::Employee->new(id => $form->{employee_id})->load->name : ''; @@ -309,7 +445,7 @@ sub generate_report { 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}); @@ -331,13 +467,15 @@ 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'), }, + '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'), }, @@ -350,10 +488,11 @@ sub generate_report { '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'), }, ); - 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)) { 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 +512,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 +562,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 +580,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); map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source); @@ -499,6 +643,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 +657,8 @@ sub show_draft { } sub update { + my %params = @_; + $main::lxdebug->enter_sub(); $main::auth->assert('gl_transactions'); @@ -533,72 +681,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"; + push @a, {}; + $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1"; + if ($debitcredit) { + $debitcount++; + } 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.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++; + $credittax = 1; } + }; + my ($tmpnetamount,$tmpdiff); + ($tmpnetamount,$form->{"tax_$i"},$tmpdiff) = $form->calculate_tax($amount,$rate,$form->{taxincluded} *= 1,2); - 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; - } - 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); - - for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} } - $count++; - } + for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} } + $count++; } for my $i (1 .. $count) { @@ -610,9 +754,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(); } @@ -650,31 +794,16 @@ sub display_rows { my %myconfig = %main::myconfig; my $cgi = $::request->{cgi}; + my %balances = GL->get_chart_balances(map { $_->{id} } @{ $form->{ALL_CHARTS} }); + $form->{debit_1} = 0 if !$form->{"debit_1"}; $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 %chart_labels = (); - my @chart_values = (); - my %charts = (); - my $taxchart_init; - foreach my $item (@{ $form->{ALL_CHARTS} }) { - if ($item->{charttype} eq 'H'){ #falls ÃÅberschrift - next; #ÃÅberspringen (Bug 1150) - } - my $key = $item->{accno} . "--" . $item->{tax_id}; - $taxchart_init = $item->{tax_id} unless (@chart_values); - push(@chart_values, $key); - $chart_labels{$key} = $item->{accno} . "--" . $item->{description}; - $charts{$item->{accno}} = $item; - } + 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}) { @@ -690,49 +819,36 @@ sub display_rows { |; } - my $selected_accno_full; - my ($accno_row) = split(/--/, $form->{"accno_$i"}); - my $item = $charts{$accno_row}; - $selected_accno_full = "$item->{accno}--$item->{tax_id}"; - - my $selected_taxchart = $form->{"taxchart_$i"}; - my ($selected_accno, $selected_tax_id) = split(/--/, $selected_accno_full); - my ($previous_accno, $previous_tax_id) = split(/--/, $form->{"previous_accno_$i"}); - my %taxchart_labels = (); my @taxchart_values = (); - my %taxcharts = (); - my $filter_accno; - $filter_accno = $::form->{ALL_CHARTS}[0]->{accno}; - $filter_accno = $selected_accno if (!$init and $i < $form->{rowcount}); - foreach my $item ( GL->get_tax_dropdown($filter_accno) ) { - my $key = $item->{id} . "--" . $item->{rate}; - $taxchart_init = $key if ($taxchart_init == $item->{id}); - push(@taxchart_values, $key); - $taxchart_labels{$key} = $item->{taxdescription} . " " . $item->{rate} * 100 . ' %'; - $taxcharts{$item->{id}} = $item; + + 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); + + my $used_tax_id; + if ( $form->{"taxchart_$i"} ) { + ($used_tax_id) = split(/--/, $form->{"taxchart_$i"}); } - if ($previous_accno && - ($previous_accno eq $selected_accno) && - ($previous_tax_id ne $selected_tax_id)) { - my $item = $taxcharts{$selected_tax_id}; - $selected_taxchart = "$item->{id}--$item->{rate}"; + 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->taxkey . " - " . $item->taxdescription . " " . $item->rate * 100 . ' %'; } - $selected_accno = '' if ($init); - $selected_taxchart ||= $taxchart_init; + $taxchart_to_use //= $default_taxchart // $first_taxchart; + my $selected_taxchart = $taxchart_to_use->id . '--' . $taxchart_to_use->rate; my $accno = qq|