Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 92361072

Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt

  • ID 923610728cc212616c8e2fd0b50ad0f555ce3cc5
  • Vorgänger 26b288f1
  • Nachfolger d5e79beb

"Zahlung buchen" bei Kreditoren- und Debitorenrechnungen: Konten richtig zuordnen und das richtige Datumsfeld benutzen.

Unterschiede anzeigen:

SL/AR.pm
383 383
  # connect to database, turn off autocommit
384 384
  my $dbh = $form->dbconnect_noauto($myconfig);
385 385

  
386
  $form->{datepaid} = $form->{invdate};
386
  $form->{datepaid} = $form->{transdate};
387 387

  
388 388
  # total payments, don't move we need it here
389 389
  for my $i (1 .. $form->{paidaccounts}) {
......
397 397
  }
398 398

  
399 399
  $form->{exchangerate} =
400
      $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate},
400
      $form->get_exchangerate($dbh, $form->{currency}, $form->{transdate},
401 401
                              "buy");
402 402

  
403
  my ($accno_ar) = split(/--/, $form->{ARselected});
404

  
403 405
  # record payments and offsetting AR
404 406
  for my $i (1 .. $form->{paidaccounts}) {
405 407

  
......
407 409
      my $project_id = conv_i($form->{"paid_project_id_$i"});
408 410

  
409 411
      my ($accno) = split /--/, $form->{"AR_paid_$i"};
410
      $form->{"datepaid_$i"} = $form->{invdate}
412
      $form->{"datepaid_$i"} = $form->{transdate}
411 413
        unless ($form->{"datepaid_$i"});
412 414
      $form->{datepaid} = $form->{"datepaid_$i"};
413 415

  
......
432 434

  
433 435

  
434 436
      $query = qq|DELETE FROM acc_trans WHERE trans_id=$form->{id} AND chart_id=(SELECT c.id FROM chart c
435
                                      WHERE c.accno = '$form->{AR}') AND amount=$amount AND transdate='$form->{"datepaid_$i"}'|;
437
                                      WHERE c.accno = '$accno_ar') AND amount=$amount AND transdate='$form->{"datepaid_$i"}'|;
436 438
      $dbh->do($query) || $form->dberror($query);
437 439

  
438 440
      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
439 441
                  transdate, project_id)
440 442
                  VALUES ($form->{id}, (SELECT c.id FROM chart c
441
                                      WHERE c.accno = '$form->{AR}'),
443
                                      WHERE c.accno = '$accno_ar'),
442 444
                  $amount, '$form->{"datepaid_$i"}', ?)|;
443 445
      do_query($form, $dbh, $query, $project_id);
444 446

  

Auch abrufbar als: Unified diff