Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 797ad4c5

Von Moritz Bunkus vor fast 16 Jahren hinzugefügt

  • ID 797ad4c506d8e96342249155ddde80361b5ff9f9
  • Vorgänger 5d44361c
  • Nachfolger c04c1509

Bei Kreditorenbuchungen die Umsatzsteuer-Steuerschlüssel und bei Debitorenbuchungen die Vorsteuer-Steuerschlüssel nicht anzeigen.

Unterschiede anzeigen:

SL/Form.pm
2077 2077
sub _get_taxcharts {
2078 2078
  $main::lxdebug->enter_sub();
2079 2079

  
2080
  my ($self, $dbh, $key) = @_;
2080
  my ($self, $dbh, $params) = @_;
2081

  
2082
  my $key = "all_taxcharts";
2083
  my @where;
2084

  
2085
  if (ref $params eq 'HASH') {
2086
    $key = $params->{key} if ($params->{key});
2087
    if ($params->{module} eq 'AR') {
2088
      push @where, 'taxkey NOT IN (8, 9, 18, 19)';
2089

  
2090
    } elsif ($params->{module} eq 'AP') {
2091
      push @where, 'taxkey NOT IN (1, 2, 3, 12, 13)';
2092
    }
2093

  
2094
  } elsif ($params) {
2095
    $key = $params;
2096
  }
2081 2097

  
2082
  $key = "all_taxcharts" unless ($key);
2098
  my $where = ' WHERE ' . join(' AND ', map { "($_)" } @where) if (@where);
2083 2099

  
2084
  my $query = qq|SELECT * FROM tax ORDER BY taxkey|;
2100
  my $query = qq|SELECT * FROM tax $where ORDER BY taxkey|;
2085 2101

  
2086 2102
  $self->{$key} = selectall_hashref_query($self, $dbh, $query);
2087 2103

  
bin/mozilla/ap.pl
298 298
  map({ push(@old_project_ids, $form->{"project_id_$_"})
299 299
          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
300 300

  
301
  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
302
                                   "all" => 0,
303
                                   "old_id" => \@old_project_ids },
304
                   "charts" => { "key" => "ALL_CHARTS",
305
                                 "transdate" => $form->{transdate} },
306
                   "taxcharts" => "ALL_TAXCHARTS");
301
  $form->get_lists("projects"  => { "key"       => "ALL_PROJECTS",
302
                                    "all"       => 0,
303
                                    "old_id"    => \@old_project_ids },
304
                   "charts"    => { "key"       => "ALL_CHARTS",
305
                                    "transdate" => $form->{transdate} },
306
                   "taxcharts" => { "key"       => "ALL_TAXCHARTS",
307
                                    "module"    => "AP" },);
307 308

  
308 309
  map({ $_->{link_split} = [ split(/:/, $_->{link}) ]; }
309 310
      @{ $form->{ALL_CHARTS} });
bin/mozilla/ar.pl
340 340
  map({ push(@old_project_ids, $form->{"project_id_$_"})
341 341
          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
342 342

  
343
  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
344
                                   "all" => 0,
345
                                   "old_id" => \@old_project_ids },
346
                   "charts" => { "key" => "ALL_CHARTS",
347
                                 "transdate" => $form->{transdate} },
348
                   "taxcharts" => "ALL_TAXCHARTS");
343
  $form->get_lists("projects"  => { "key"       => "ALL_PROJECTS",
344
                                    "all"       => 0,
345
                                    "old_id"    => \@old_project_ids },
346
                   "charts"    => { "key"       => "ALL_CHARTS",
347
                                    "transdate" => $form->{transdate} },
348
                   "taxcharts" => { "key"       => "ALL_TAXCHARTS",
349
                                    "module"    => "AR" },);
349 350

  
350 351
  map({ $_->{link_split} = [ split(/:/, $_->{link}) ]; }
351 352
      @{ $form->{ALL_CHARTS} });

Auch abrufbar als: Unified diff