From 6c7334b32c2219f4eb46ab2ca56e3a044a22db80 Mon Sep 17 00:00:00 2001 From: Philip Reetz Date: Tue, 5 May 2009 10:23:28 +0000 Subject: [PATCH] Bug #897 behoben: Belege wurden im Buchungsjournal nicht korrekt angezeigt, Zusaetzlich Suchen nach Belegen angepasst, so dass der komplette Buchungssatz ausgegeben wird und Sortierung nach Belegen ausgeschaltet --- SL/GL.pm | 32 +++++++++++++++++++++++--------- bin/mozilla/gl.pl | 8 ++++---- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/SL/GL.pm b/SL/GL.pm index 4d75fa1bb..a36c8e303 100644 --- a/SL/GL.pm +++ b/SL/GL.pm @@ -221,9 +221,9 @@ sub all_transactions { } if ($form->{source}) { - $glwhere .= " AND ac.source ILIKE ?"; - $arwhere .= " AND ac.source ILIKE ?"; - $apwhere .= " AND ac.source ILIKE ?"; + $glwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)"; + $arwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)"; + $apwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)"; push(@glvalues, '%' . $form->{source} . '%'); push(@arvalues, '%' . $form->{source} . '%'); push(@apvalues, '%' . $form->{source} . '%'); @@ -321,7 +321,6 @@ sub all_transactions { 'id' => [ qw(id) ], 'transdate' => [ qw(transdate id) ], 'reference' => [ qw(lower_reference id) ], - 'source' => [ qw(lower_source id) ], 'description' => [ qw(lower_description id) ], 'accno' => [ qw(accno transdate id) ], ); @@ -403,6 +402,9 @@ sub all_transactions { $trans_id = $ref0->{id}; + my $source = $ref0->{source}; + undef($ref0->{source}); + if ($trans_id != $trans_id2) { # first line of a booking if ($trans_id2) { @@ -447,13 +449,12 @@ sub all_transactions { $i = 0; # Debit Tax # AP_tax # VSt $j = 0; # Credit Tax # AR_tax # USt - if ($ref->{chart_id} > 0) { # all tax accounts first line, no line increasing if ($ref->{amount} < 0) { if ($ref->{link} =~ /AR_tax/) { $ref->{credit_tax}{$j} = $ref->{amount}; $ref->{credit_tax_accno}{$j} = $ref->{accno}; - } + } if ($ref->{link} =~ /AP_tax/) { $ref->{debit_tax}{$i} = $ref->{amount} * -1; $ref->{debit_tax_accno}{$i} = $ref->{accno}; @@ -469,19 +470,19 @@ sub all_transactions { } } } else { #all other accounts first line + if ($ref->{amount} < 0) { $ref->{debit}{$k} = $ref->{amount} * -1; $ref->{debit_accno}{$k} = $ref->{accno}; $ref->{debit_taxkey}{$k} = $ref->{taxkey}; $ref->{ac_transdate}{$k} = $ref->{transdate}; - + $ref->{source}{$k} = $source; } else { $ref->{credit}{$l} = $ref->{amount} * 1; $ref->{credit_accno}{$l} = $ref->{accno}; $ref->{credit_taxkey}{$l} = $ref->{taxkey}; $ref->{ac_transdate}{$l} = $ref->{transdate}; - - + $ref->{source}{$l} = $source; } } @@ -533,22 +534,35 @@ sub all_transactions { if ($ref->{debit_accno}{$k} ne "") { $k++; } + if ($ref->{source}{$k} ne "") { + $space = " | "; + } else { + $space = ""; + } $ref->{debit}{$k} = $ref2->{amount} * - 1; $ref->{debit_accno}{$k} = $ref2->{accno}; $ref->{debit_taxkey}{$k} = $ref2->{taxkey}; $ref->{ac_transdate}{$k} = $ref2->{transdate}; + $ref->{source}{$k} = $source . $space . $ref->{source}{$k}; } else { if ($ref->{credit_accno}{$l} ne "") { $l++; } + if ($ref->{source}{$l} ne "") { + $space = " | "; + } else { + $space = ""; + } $ref->{credit}{$l} = $ref2->{amount}; $ref->{credit_accno}{$l} = $ref2->{accno}; $ref->{credit_taxkey}{$l} = $ref2->{taxkey}; $ref->{ac_transdate}{$l} = $ref2->{transdate}; + $ref->{source}{$l} = $ref->{source}{$l} . $space . $source; } } } } + push @{ $form->{GL} }, $ref; $sth->finish; diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index a2816e8f0..58266b54f 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -497,7 +497,7 @@ sub generate_report { 'projectnumbers' => { 'text' => $locale->text('Project Numbers'), }, ); - foreach my $name (qw(id transdate reference source description debit_accno credit_accno debit_tax_accno credit_tax_accno)) { + foreach my $name (qw(id transdate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno)) { 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"; @@ -564,7 +564,7 @@ sub generate_report { } } - foreach my $key (qw(debit_accno credit_accno debit_tax_accno credit_tax_accno ac_transdate)) { + foreach my $key (qw(debit_accno credit_accno debit_tax_accno credit_tax_accno ac_transdate source)) { my $col = $key eq 'ac_transdate' ? 'transdate' : $key; $rows{$col} = [ map { $ref->{$key}->{$_} } sort keys(%{ $ref->{$key} }) ]; } @@ -575,9 +575,9 @@ sub generate_report { $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance}, 2); $row->{projectnumbers}->{data} = join ", ", sort { lc($a) cmp lc($b) } keys %{ $ref->{projectnumbers} }; - map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description source notes); + map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes); - map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno); + map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source); foreach my $col (qw(debit_accno credit_accno debit_tax_accno credit_tax_accno)) { $row->{$col}->{link} = [ map { "${callback}&accno=" . E($_) } @{ $rows{$col} } ]; -- 2.20.1