Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 7e0ea1c2

Von Udo Spallek vor etwa 17 Jahren hinzugefügt

  • ID 7e0ea1c23859d1839c9ce4574de45ec7fcf92c15
  • Vorgänger d890f886
  • Nachfolger acaca478

Diverse Bugs im Zusammenhang mit Steuerautomatiken, mit chart_id=0 oder mit rate=0.
Beides sollte jedoch moeglich sein fuer Konten wie 'steuerfrei'.

Unterschiede anzeigen:

SL/AM.pm
2068 2068
                   t.taxkey,
2069 2069
                   t.taxdescription,
2070 2070
                   round(t.rate * 100, 2) AS rate,
2071
                   c.accno AS taxnumber,
2072
                   c.description AS account_description
2071
                   (SELECT accno FROM chart WHERE id = chart_id) AS taxnumber,
2072
                   (SELECT description FROM chart WHERE id = chart_id) AS account_description
2073 2073
                 FROM tax t
2074
                 JOIN chart c on (chart_id = c.id)
2075 2074
                 ORDER BY taxkey|;
2076 2075

  
2077 2076
  $sth = $dbh->prepare($query);
......
2146 2145

  
2147 2146
  # see if it is used by a taxkey
2148 2147
  $query = qq|SELECT count(*) FROM taxkeys
2149
              WHERE tax_id = ?|;
2148
              WHERE tax_id = ? AND chart_id >0|;
2150 2149

  
2151 2150
  ($form->{orphaned}) = selectrow_query($form, $dbh, $query, $form->{id});
2152 2151

  
......
2156 2155
  if (!$form->{orphaned} ) {
2157 2156
    $query = qq|SELECT DISTINCT c.id, c.accno
2158 2157
                FROM taxkeys tk
2159
                LEFT JOIN   tax t ON (t.id = tk.tax_id)
2160
                LEFT JOIN chart c ON (c.id = tk.chart_id)
2158
                JOIN   tax t ON (t.id = tk.tax_id)
2159
                JOIN chart c ON (c.id = tk.chart_id)
2161 2160
                WHERE tk.tax_id = ?|;
2162 2161

  
2163 2162
    $sth = $dbh->prepare($query);
......
2187 2186
  $form->{rate} = $form->{rate} / 100;
2188 2187

  
2189 2188
  my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, $form->{chart_id}, $form->{chart_id} );
2190
  if ($form->{id}) {
2189
  if ($form->{id} ne "") {
2191 2190
    $query = qq|UPDATE tax SET
2192 2191
                  taxkey         = ?,
2193 2192
                  taxdescription = ?,

Auch abrufbar als: Unified diff