Revision a851fde7
Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt
SL/AR.pm | ||
---|---|---|
244 | 244 |
|
245 | 245 |
# add recievables |
246 | 246 |
$query = |
247 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate) | . |
|
248 |
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?)|; |
|
249 |
@values = (conv_i($form->{id}), conv_i($form->{AR_amounts}{receivables}), |
|
250 |
conv_i($form->{receivables}), conv_date($form->{transdate})); |
|
247 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey) | . |
|
248 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, | . |
|
249 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
250 |
@values = (conv_i($form->{id}), $form->{AR_amounts}{receivables}, |
|
251 |
conv_i($form->{receivables}), conv_date($form->{transdate}), |
|
252 |
$form->{AR_amounts}{receivables}); |
|
251 | 253 |
do_query($form, $dbh, $query, @values); |
252 | 254 |
|
253 | 255 |
# add paid transactions |
... | ... | |
286 | 288 |
if ($form->{receivables} != 0) { |
287 | 289 |
# add receivable |
288 | 290 |
$query = |
289 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id) | . |
|
290 |
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?)|; |
|
291 |
@values = (conv_i($form->{id}), conv_i($form->{AR}{receivables}), |
|
292 |
$amount, conv_date($form->{"datepaid_$i"}), $project_id); |
|
291 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) | . |
|
292 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, | . |
|
293 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
294 |
@values = (conv_i($form->{id}), $form->{AR}{receivables}, |
|
295 |
$amount, conv_date($form->{"datepaid_$i"}), $project_id, |
|
296 |
$form->{AR}{receivables}); |
|
293 | 297 |
do_query($form, $dbh, $query, @values); |
294 | 298 |
} |
295 | 299 |
$form->{receivables} = $amount; |
... | ... | |
299 | 303 |
# add payment |
300 | 304 |
$amount = $form->{"paid_$i"} * -1; |
301 | 305 |
$query = |
302 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id) | . |
|
303 |
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?, ?)|; |
|
304 |
@values = (conv_i($form->{id}), conv_i($form->{AR}{"paid_$i"}), $amount, |
|
306 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey) | . |
|
307 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, | . |
|
308 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
309 |
@values = (conv_i($form->{id}), $form->{AR}{"paid_$i"}, $amount, |
|
305 | 310 |
conv_date($form->{"datepaid_$i"}), $form->{"source_$i"}, |
306 |
$form->{"memo_$i"}, $project_id); |
|
311 |
$form->{"memo_$i"}, $project_id, $form->{AR}{"paid_$i"});
|
|
307 | 312 |
do_query($form, $dbh, $query, @values); |
308 | 313 |
|
309 | 314 |
# exchangerate difference for payment |
... | ... | |
314 | 319 |
|
315 | 320 |
if ($amount != 0) { |
316 | 321 |
$query = |
317 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id) | . |
|
318 |
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 't', 'f', ?)|; |
|
319 |
@values = (conv_i($form->{id}), conv_i($form->{AR}{"paid_$i"}), |
|
320 |
$amount, conv_date($form->{"datepaid_$i"}), $project_id); |
|
322 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey) | . |
|
323 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | . |
|
324 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
325 |
@values = (conv_i($form->{id}), $form->{AR}{"paid_$i"}, |
|
326 |
$amount, conv_date($form->{"datepaid_$i"}), $project_id, |
|
327 |
$form->{AR}{"paid_$i"}); |
|
321 | 328 |
do_query($form, $dbh, $query, @values); |
322 | 329 |
} |
323 | 330 |
|
... | ... | |
332 | 339 |
$accno = |
333 | 340 |
($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno}; |
334 | 341 |
$query = |
335 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id) | . |
|
336 |
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 't', 'f', ?)|; |
|
342 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey) | . |
|
343 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | . |
|
344 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
337 | 345 |
@values = (conv_i($form->{id}), $accno, $amount, |
338 |
conv_date($form->{"datepaid_$i"}), $project_id); |
|
346 |
conv_date($form->{"datepaid_$i"}), $project_id, $accno);
|
|
339 | 347 |
do_query($form, $dbh, $query, @values); |
340 | 348 |
} |
341 | 349 |
} |
... | ... | |
424 | 432 |
do_query($form, $dbh, $query, @values); |
425 | 433 |
|
426 | 434 |
$query = |
427 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id) | . |
|
428 |
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?)|; |
|
435 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) | . |
|
436 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, | . |
|
437 |
qq| (SELECT taxkey_ FROM chart WHERE accno = ?))|; |
|
429 | 438 |
@values = (conv_i($form->{id}), $accno_ar, conv_i($amount), |
430 | 439 |
conv_date($form->{"datepaid_$i"}), $project_id); |
431 | 440 |
do_query($form, $dbh, $query, @values); |
... | ... | |
444 | 453 |
do_query($form, $dbh, $query, @values); |
445 | 454 |
|
446 | 455 |
$query = |
447 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id) | . |
|
448 |
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?, ?)|; |
|
456 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey) | . |
|
457 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, | . |
|
458 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
449 | 459 |
@values = (conv_i($form->{id}), $accno, conv_i($form->{"paid_$i"}), |
450 | 460 |
conv_date($form->{"datepaid_$i"}), |
451 | 461 |
$form->{"source_$i"}, $form->{"memo_$i"}, $project_id); |
... | ... | |
493 | 503 |
do_query($form, $dbh, $query, @values); |
494 | 504 |
|
495 | 505 |
$query = |
496 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction, project_id) | . |
|
497 |
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 'f', 't', ?)|; |
|
506 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction, project_id, taxkey) | . |
|
507 |
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 'f', 't', ?, | . |
|
508 |
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|; |
|
498 | 509 |
@values = (conv_i($form->{id}), $accno, |
499 |
conv_i($form->{fx}{$accno}{$transdate}), |
|
500 |
conv_date($transdate), $project_id); |
|
510 |
$form->{fx}{$accno}{$transdate}, |
|
511 |
conv_date($transdate), $project_id, |
|
512 |
$form->{fx}{$accno}{$transdate}); |
|
501 | 513 |
do_query($form, $dbh, $query, @values); |
502 | 514 |
} |
503 | 515 |
} |
Auch abrufbar als: Unified diff
Debitoren- und Kreditorenrechnungen: Beim Erstellen der Einträge in acc_trans keine leeren Felder für taxkey erzeugen.