Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 361d8846

Von Sven Schöling vor mehr als 11 Jahren hinzugefügt

  • ID 361d8846ed83e99bb34b13c46b4e6b5a7090c70f
  • Vorgänger e2a31c82
  • Nachfolger 4b26e243

Revert "tax_id in acc_trans"

This reverts commit 357d134d265637fb37ed2cd47da2ce3ef44d015a.

Unterschiede anzeigen:

SL/GL.pm
159 159
    if ($amount != 0) {
160 160
      $query =
161 161
        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
162
                                  source, memo, project_id, taxkey, ob_transaction, cb_transaction, tax_id)
162
                                  source, memo, project_id, taxkey, ob_transaction, cb_transaction)
163 163
           VALUES (?, (SELECT id FROM chart WHERE accno = ?),
164
                   ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
164
                   ?, ?, ?, ?, ?, ?, ?, ?)|;
165 165
      @values = (conv_i($form->{id}), $accno, $amount, conv_date($form->{transdate}),
166
                 $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f', conv_i($form->{"tax_id_$i"}));
166
                 $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f');
167 167
      do_query($form, $dbh, $query, @values);
168 168
    }
169 169

  
......
171 171
      # add taxentry
172 172
      $query =
173 173
        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
174
                                  source, memo, project_id, taxkey, tax_id)
174
                                  source, memo, project_id, taxkey)
175 175
           VALUES (?, (SELECT chart_id FROM tax WHERE id = ?),
176
                   ?, ?, ?, ?, ?, ?, ?)|;
176
                   ?, ?, ?, ?, ?, ?)|;
177 177
      @values = (conv_i($form->{id}), conv_i($form->{"tax_id_$i"}),
178 178
                 $tax, conv_date($form->{transdate}), $form->{"source_$i"},
179
                 $form->{"memo_$i"}, $project_id, $taxkey, conv_i($form->{"tax_id_$i"}));
179
                 $form->{"memo_$i"}, $project_id, $taxkey);
180 180
      do_query($form, $dbh, $query, @values);
181 181
    }
182 182
  }

Auch abrufbar als: Unified diff