X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=faca8ce0d256b84c0fa535427d870a6a64e3dc31;hb=40f3befb965dd6125c0da70ad292f41a5d168d1c;hp=6f49848fcff76c7f6e9029152486a493e4ff40c4;hpb=53af5bf8cb24918ccdfc898ebaf916e4ef938c3c;p=kivitendo-erp.git diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index 6f49848fc..faca8ce0d 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -38,12 +38,14 @@ use strict; 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); @@ -112,7 +114,7 @@ sub load_record_template { $::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; @@ -158,9 +160,15 @@ sub save_record_template { 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 { @@ -178,15 +186,16 @@ sub save_record_template { 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, ); @@ -419,25 +428,28 @@ sub generate_report { 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}); @@ -463,28 +475,30 @@ sub generate_report { $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"; @@ -572,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); @@ -635,7 +649,7 @@ sub generate_report { $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(); @@ -792,13 +806,6 @@ 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; @@ -914,26 +921,23 @@ 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 $balance = $form->format_amount(\%::myconfig, $balances{$accno_id} // 0, 2, 'DRCR'); + 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|