Revision 03ff37cb
Von Niclas Zimmermann vor mehr als 11 Jahren hinzugefügt
| SL/AP.pm | ||
|---|---|---|
| 208 | 208 |
# insert detail records in acc_trans |
| 209 | 209 |
$query = |
| 210 | 210 |
qq|INSERT INTO acc_trans | . |
| 211 |
qq| (trans_id, chart_id, amount, transdate, project_id, taxkey)| . |
|
| 211 |
qq| (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id)| .
|
|
| 212 | 212 |
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), | . |
| 213 |
qq| ?, ?, ?, ?)|; |
|
| 213 |
qq| ?, ?, ?, ?, ?)|;
|
|
| 214 | 214 |
@values = ($form->{id}, $form->{AP_amounts}{"amount_$i"},
|
| 215 | 215 |
$form->{"amount_$i"}, conv_date($form->{transdate}),
|
| 216 |
$project_id, $form->{"taxkey_$i"});
|
|
| 216 |
$project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}));
|
|
| 217 | 217 |
do_query($form, $dbh, $query, @values); |
| 218 | 218 |
|
| 219 | 219 |
if ($form->{"tax_$i"} != 0) {
|
| 220 | 220 |
# insert detail records in acc_trans |
| 221 | 221 |
$query = |
| 222 | 222 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, | . |
| 223 |
qq| project_id, taxkey) | . |
|
| 223 |
qq| project_id, taxkey, tax_id) | .
|
|
| 224 | 224 |
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), | . |
| 225 |
qq| ?, ?, ?, ?)|; |
|
| 225 |
qq| ?, ?, ?, ?, ?)|;
|
|
| 226 | 226 |
@values = ($form->{id}, $form->{AP_amounts}{"tax_$i"},
|
| 227 | 227 |
$form->{"tax_$i"}, conv_date($form->{transdate}),
|
| 228 |
$project_id, $form->{"taxkey_$i"});
|
|
| 228 |
$project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}));
|
|
| 229 | 229 |
do_query($form, $dbh, $query, @values); |
| 230 | 230 |
} |
| 231 | 231 |
|
| ... | ... | |
| 234 | 234 |
|
| 235 | 235 |
# add payables |
| 236 | 236 |
$query = |
| 237 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey) | . |
|
| 237 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id) | .
|
|
| 238 | 238 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, | . |
| 239 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
| 239 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?),| . |
|
| 240 |
qq| (SELECT tax_id FROM taxkeys WHERE chart_id= (SELECT id FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|; |
|
| 240 | 241 |
@values = ($form->{id}, $form->{AP_amounts}{payables}, $form->{payables},
|
| 241 |
conv_date($form->{transdate}), $form->{AP_amounts}{payables});
|
|
| 242 |
conv_date($form->{transdate}), $form->{AP_amounts}{payables}, $form->{AP_amounts}{payables}, conv_date($form->{transdate}));
|
|
| 242 | 243 |
do_query($form, $dbh, $query, @values); |
| 243 | 244 |
} |
| 244 | 245 |
|
| ... | ... | |
| 282 | 283 |
2); |
| 283 | 284 |
if ($form->{payables}) {
|
| 284 | 285 |
$query = |
| 285 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) | . |
|
| 286 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id) | .
|
|
| 286 | 287 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, | . |
| 287 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
| 288 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?),| . |
|
| 289 |
qq| (SELECT tax_id FROM taxkeys WHERE chart_id= (SELECT id FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|; |
|
| 288 | 290 |
@values = ($form->{id}, $form->{AP_payables}, $amount,
|
| 289 | 291 |
conv_date($form->{"datepaid_$i"}), $project_id,
|
| 290 |
$form->{AP_payables});
|
|
| 292 |
$form->{AP_payables}, $form->{AP_payables}, conv_date($form->{"datepaid_$i"}));
|
|
| 291 | 293 |
do_query($form, $dbh, $query, @values); |
| 292 | 294 |
} |
| 293 | 295 |
$form->{payables} = $amount;
|
| ... | ... | |
| 295 | 297 |
# add payment |
| 296 | 298 |
my $gldate = (conv_date($form->{"gldate_$i"}))? conv_date($form->{"gldate_$i"}) : conv_date($form->current_date($myconfig));
|
| 297 | 299 |
$query = |
| 298 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, project_id, taxkey) | . |
|
| 300 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, project_id, taxkey, tax_id) | .
|
|
| 299 | 301 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, ?, | . |
| 300 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
| 302 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?), | . |
|
| 303 |
qq| (SELECT tax_id FROM taxkeys WHERE chart_id= (SELECT id FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|; |
|
| 301 | 304 |
@values = ($form->{id}, $form->{"AP_paid_account_$i"}, $form->{"paid_$i"},
|
| 302 | 305 |
conv_date($form->{"datepaid_$i"}), $gldate, $form->{"source_$i"},
|
| 303 |
$form->{"memo_$i"}, $project_id, $form->{"AP_paid_account_$i"});
|
|
| 306 |
$form->{"memo_$i"}, $project_id, $form->{"AP_paid_account_$i"},
|
|
| 307 |
$form->{"AP_paid_account_$i"}, conv_date($form->{"datepaid_$i"}));
|
|
| 304 | 308 |
do_query($form, $dbh, $query, @values); |
| 305 | 309 |
|
| 306 | 310 |
# add exchange rate difference |
| ... | ... | |
| 309 | 313 |
($form->{"exchangerate_$i"} - 1), 2);
|
| 310 | 314 |
if ($amount != 0) {
|
| 311 | 315 |
$query = |
| 312 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey) | . |
|
| 316 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey, tax_id) | .
|
|
| 313 | 317 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | . |
| 314 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
| 318 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?), | . |
|
| 319 |
qq| (SELECT tax_id FROM taxkeys WHERE chart_id= (SELECT id FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|; |
|
| 315 | 320 |
@values = ($form->{id}, $form->{"AP_paid_account_$i"}, $amount,
|
| 316 | 321 |
conv_date($form->{"datepaid_$i"}), $project_id,
|
| 317 |
$form->{"AP_paid_account_$i"});
|
|
| 322 |
$form->{"AP_paid_account_$i"},
|
|
| 323 |
$form->{"AP_paid_account_$i"}, conv_date($form->{"datepaid_$i"}));
|
|
| 318 | 324 |
do_query($form, $dbh, $query, @values); |
| 319 | 325 |
} |
| 320 | 326 |
|
| ... | ... | |
| 326 | 332 |
|
| 327 | 333 |
if ($amount != 0) {
|
| 328 | 334 |
$query = |
| 329 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey) | . |
|
| 335 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey, tax_id) | .
|
|
| 330 | 336 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | . |
| 331 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
| 337 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?)| . |
|
| 338 |
qq| (SELECT tax_id FROM taxkeys WHERE chart_id= (SELECT id FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|; |
|
| 332 | 339 |
@values = ($form->{id}, ($amount > 0) ?
|
| 333 | 340 |
$form->{fxgain_accno} : $form->{fxloss_accno},
|
| 334 | 341 |
$amount, conv_date($form->{"datepaid_$i"}), $project_id,
|
| 335 | 342 |
($amount > 0) ? |
| 336 |
$form->{fxgain_accno} : $form->{fxloss_accno});
|
|
| 343 |
$form->{fxgain_accno} : $form->{fxloss_accno},
|
|
| 344 |
($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno}, conv_date($form->{"datepaid_$i"}));
|
|
| 337 | 345 |
do_query($form, $dbh, $query, @values); |
| 338 | 346 |
} |
| 339 | 347 |
|
Auch abrufbar als: Unified diff
tax_id in acc_trans
Dieser Commit enthält das Update-Script um eine neue Spalte Namens
'tax_id' in die Tabelle 'acc_trans' einzufügen. Diese Spalte hat
Constrait NOT NULL und einen Fremdschlüssel auf die id von tax.
Das Pflichtfeld wird jetzt immer geschrieben bei:
-VK-Rechnungen (auch automatisch erzeugten)
-EK-Rechnungen
-Kreditorenbuchungen
-Debitorenbuchungen
-Dialogbuchungen
Durch das Feld 'tax_id' können in der Tabelle tax der
Steuerschlüssel und der Steuersatz ausgelesen werden.
In diesem Commit wird allerdings der Wert in tax_id nur geschrieben,
im Moment wird er noch nirgendwo ausgelesen.