Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 09685616

Von Moritz Bunkus vor etwa 16 Jahren hinzugefügt

  • ID 09685616f65f95b3189049855dfc53d2bf1ef271
  • Vorgänger 2654e8ee
  • Nachfolger 82498fb7

Bei Kreditorenbuchungsberichten in der Typ-Spalte auch Stornos gesondert ausweisen.

Unterschiede anzeigen:

SL/AP.pm
399 399
  my $query =
400 400
    qq|SELECT a.id, a.invnumber, a.transdate, a.duedate, a.amount, a.paid, | .
401 401
    qq|  a.ordnumber, v.name, a.invoice, a.netamount, a.datepaid, a.notes, | .
402
    qq|  a.globalproject_id, | .
402
    qq|  a.globalproject_id, a.storno, a.storno_id, | .
403 403
    qq|  pr.projectnumber AS globalprojectnumber, | .
404 404
    qq|  e.name AS employee | .
405 405
    qq|FROM ap a | .
......
407 407
    qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
408 408
    qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) |;
409 409

  
410
  my $where = qq| WHERE COALESCE(storno, false) != true |;
410
  my $where = '';
411 411
  my @values;
412 412

  
413 413
  if ($form->{vendor_id}) {
......
458 458
  }
459 459

  
460 460
  if ($where) {
461
#     substr($where, 0, 4) = "WHERE";
461
    substr($where, 0, 4, " WHERE ");
462 462
    $query .= $where;
463 463
  }
464 464

  
bin/mozilla/ap.pl
1493 1493

  
1494 1494
    map { $ap->{$_} = $form->format_amount(\%myconfig, $ap->{$_}, 2) } qw(netamount tax amount paid due);
1495 1495

  
1496
    $ap->{type} =
1497
      $ap->{invoice} ? $locale->text("Invoice (one letter abbreviation)") :
1498
                       $locale->text("AP Transaction (abbreviation)");
1496
    my $is_storno  = $ap->{storno} &&  $ap->{storno_id};
1497
    my $has_storno = $ap->{storno} && !$ap->{storno_id};
1498

  
1499
    if ($ap->{invoice}) {
1500
      $ap->{type} =
1501
          $has_storno       ? $locale->text("Invoice with Storno (abbreviation)")
1502
        : $is_storno        ? $locale->text("Storno (one letter abbreviation)")
1503
        :                     $locale->text("Invoice (one letter abbreviation)");
1504
    } else {
1505
      $ap->{type} =
1506
          $has_storno       ? $locale->text("AP Transaction with Storno (abbreviation)")
1507
        : $is_storno        ? $locale->text("AP Transaction Storno (one letter abbreviation)")
1508
        :                     $locale->text("AP Transaction (abbreviation)");
1509
    }
1499 1510

  
1500 1511
    my $row = { };
1501 1512

  
locale/de/all
42 42
  'AP Aging'                    => 'Offene Verbindlichkeiten',
43 43
  'AP Transaction'              => 'Kreditorenbuchung',
44 44
  'AP Transaction (abbreviation)' => 'K',
45
  'AP Transaction Storno (one letter abbreviation)' => 'S',
46
  'AP Transaction with Storno (abbreviation)' => 'K(S)',
45 47
  'AP Transactions'             => 'Kreditorenbuchungen',
46 48
  'AR'                          => 'Verkauf',
47 49
  'AR Aging'                    => 'Offene Forderungen',
......
474 476
  'Difference'                  => 'Differenz',
475 477
  'Dimension unit'              => 'Maßeinheit',
476 478
  'Directory'                   => 'Verzeichnis',
477
  'direct debit'		=> 'Lastschrift',
478 479
  'Discount'                    => 'Rabatt',
479 480
  'Display'                     => 'Anzeigen',
480 481
  'Display file'                => 'Datei anzeigen',
......
1679 1680
  'debug'                       => 'Debug',
1680 1681
  'delete'                      => 'L?schen',
1681 1682
  'deliverydate'                => 'Lieferdatum',
1683
  'direct debit'                => 'Lastschrift',
1682 1684
  'disposed'                    => 'Entsorgung',
1683 1685
  'done'                        => 'erledigt',
1684 1686
  'down'                        => 'runter',
locale/de/ap
6 6
  'AP'                          => 'Einkauf',
7 7
  'AP Transaction'              => 'Kreditorenbuchung',
8 8
  'AP Transaction (abbreviation)' => 'K',
9
  'AP Transaction Storno (one letter abbreviation)' => 'S',
10
  'AP Transaction with Storno (abbreviation)' => 'K(S)',
9 11
  'AP Transactions'             => 'Kreditorenbuchungen',
10 12
  'AR'                          => 'Verkauf',
11 13
  'AR Transaction'              => 'Debitorenbuchung',
......
106 108
  'Invoice Date'                => 'Rechnungsdatum',
107 109
  'Invoice Date missing!'       => 'Rechnungsdatum fehlt!',
108 110
  'Invoice Number'              => 'Rechnungsnummer',
111
  'Invoice with Storno (abbreviation)' => 'R(S)',
109 112
  'Jan'                         => 'Jan',
110 113
  'January'                     => 'Januar',
111 114
  'Jul'                         => 'Jul',
......
199 202
  'Skip'                        => '?berspringen',
200 203
  'Source'                      => 'Beleg',
201 204
  'Storno'                      => 'Storno',
205
  'Storno (one letter abbreviation)' => 'S',
202 206
  'Storno Invoice'              => 'Stornorechnung',
203 207
  'Storno Packing List'         => 'Stornolieferschein',
204 208
  'Subject'                     => 'Betreff',

Auch abrufbar als: Unified diff