X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=519351a5fcfde75890be25702248b94cc429e56b;hb=e713c3142d8c603b31d25fff371da47f56976aae;hp=b625c868a96421597a2a42b11edb23cda69d8d7f;hpb=967813e1507fcf8da70d955b0129a8b92b696e20;p=kivitendo-erp.git diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index b625c868a..519351a5f 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -49,7 +49,6 @@ 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); - require "bin/mozilla/common.pl"; require "bin/mozilla/reportgenerator.pl"; @@ -94,6 +93,7 @@ sub load_record_template { 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}; @@ -109,7 +109,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); + $::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; @@ -133,8 +133,8 @@ sub load_record_template { $::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); } @@ -183,6 +183,7 @@ sub save_record_template { cb_transaction => $::form->{cb_transaction} ? 1 : 0, reference => $::form->{reference}, description => $::form->{description}, + show_details => $::form->{show_details}, items => \@items, ); @@ -223,7 +224,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}; @@ -244,7 +245,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; @@ -335,7 +336,7 @@ 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(); @@ -415,14 +416,14 @@ sub generate_report { my $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1; my @columns = qw( - gldate transdate id reference description + 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 : ''; @@ -434,7 +435,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}); @@ -460,8 +461,8 @@ sub generate_report { 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'), }, @@ -1082,7 +1083,9 @@ sub form_header { "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"); @@ -1315,7 +1318,6 @@ sub post_transaction { $form->error($err[$errno]); } - undef($form->{callback}); # saving the history if(!exists $form->{addition} && $form->{id} ne "") { $form->{snumbers} = qq|gltransaction_| . $form->{id}; @@ -1325,6 +1327,12 @@ sub post_transaction { } # /saving the history + if ($form->{callback} =~ /BankTransaction/) { + 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(); } @@ -1337,9 +1345,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");