From 12fb1a282a4777ecdaf7f297057732d2d473ad24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Sat, 19 Sep 2009 22:07:24 +0200 Subject: [PATCH] =?utf8?q?Fix=20f=C3=BCr=20Bug=201150=20-=20Dialogbuchen?= =?utf8?q?=20geht=20auf=20=C3=9Cberschriften.=20Entsprechend=20im=20Backen?= =?utf8?q?d=20den=20chart.charttype=20zus=C3=A4tzlich=20geholt=20und=20die?= =?utf8?q?=20Liste=20ALL=5FCHARTS=20im=20Frontend=20gefiltert?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Form.pm | 2 +- bin/mozilla/gl.pl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/SL/Form.pm b/SL/Form.pm index e034a203c..f0bb0e2cb 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -2196,7 +2196,7 @@ sub _get_charts { my $transdate = quote_db_date($params->{transdate}); my $query = - qq|SELECT c.id, c.accno, c.description, c.link, tk.taxkey_id, tk.tax_id | . + qq|SELECT c.id, c.accno, c.description, c.link, c.charttype, tk.taxkey_id, tk.tax_id | . qq|FROM chart c | . qq|LEFT JOIN taxkeys tk ON | . qq|(tk.id = (SELECT id FROM taxkeys | . diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index 7516cf8d1..ae476bd17 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -88,6 +88,7 @@ sub add { $form->{callback} = "gl.pl?action=add" unless $form->{callback}; # we use this only to set a default date + # yep. aber er holt hier auch schon ALL_CHARTS. Aufwand / Nutzen? jb GL->transaction(\%myconfig, \%$form); map { @@ -796,6 +797,9 @@ sub display_rows { 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); -- 2.20.1