projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e69e365
)
Fix für Bug 1150 - Dialogbuchen geht auf Überschriften. Entsprechend im Backend den...
author
Jan Büren
<jan@weitan.org>
Sat, 19 Sep 2009 20:07:24 +0000
(22:07 +0200)
committer
Jan Büren
<jan@weitan.org>
Sat, 19 Sep 2009 20:07:24 +0000
(22:07 +0200)
SL/Form.pm
patch
|
blob
|
history
bin/mozilla/gl.pl
patch
|
blob
|
history
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
e034a20
..
f0bb0e2
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-2196,7
+2196,7
@@
sub _get_charts {
my $transdate = quote_db_date($params->{transdate});
my $query =
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 | .
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
7516cf8
..
ae476bd
100644
(file)
--- 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
$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 {
GL->transaction(\%myconfig, \%$form);
map {
@@
-796,6
+797,9
@@
sub display_rows {
my %charts = ();
my $taxchart_init;
foreach my $item (@{ $form->{ALL_CHARTS} }) {
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);
my $key = $item->{accno} . "--" . $item->{tax_id};
$taxchart_init = $item->{tax_id} unless (@chart_values);
push(@chart_values, $key);