Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 36a93d2e

Von Jan Büren vor mehr als 1 Jahr hinzugefügt

  • ID 36a93d2e364e357983c1fd3420721b70fbf1c117
  • Vorgänger 9911cb13
  • Nachfolger b15c7890

Wechselkurse für Belege oder Zahlungen für ar und ap holen und berechnen

Unterschiede anzeigen:

bin/mozilla/ap.pl
403 403

  
404 404
  # currencies
405 405
  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
406
  if ($form->{currency} ne $form->{defaultcurrency}) {
407
    ($form->{exchangerate}, $form->{record_forex}) = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, "sell", $form->{id}, 'ap');
406
  if ($form->{currency} ne $form->{defaultcurrency} && !$form->{exchangerate}) {
407
    ($form->{exchangerate}, $form->{record_forex}) = $form->{id}
408
                                                  ?  $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, "sell", $form->{id}, 'ap')
409
                                                  :  $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, "sell");
408 410
  }
409 411

  
410 412
  # format amounts
......
540 542
  $form->{accno_arap} = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
541 543

  
542 544
  for my $i (1 .. $form->{paidaccounts}) {
545
    # hook for calc of of fx_paid and check if banktransaction has a record exchangerate
546
    if ($form->{"exchangerate_$i"}) {
547
      my $bt_acc_trans;
548
      my $bt_acc_trans = SL::DB::Manager::BankTransactionAccTrans->find_by(acc_trans_id => $form->{"acc_trans_id_$i"});
549
      if ($bt_acc_trans) {
550
        if ($bt_acc_trans->bank_transaction->exchangerate > 0) {
551
          $form->{"exchangerate_$i"} = $bt_acc_trans->bank_transaction->exchangerate;
552
          $form->{"forex_$i"}        = $form->{"exchangerate_$i"};
553
          $form->{"record_forex_$i"} = 1;
554
        }
555
      }
556
      $form->{"fx_paid_$i"} = $form->{"paid_$i"} / $form->{"exchangerate_$i"};
557
      $form->{"fx_totalpaid"} +=  $form->{"fx_paid_$i"};
558
    } # end hook fx_paid
543 559
    # format amounts
544 560
    if ($form->{"paid_$i"}) {
545 561
      $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
......
574 590
       $form->{'AP_paid_' . $i} . " " . SL::DB::Manager::Chart->find_by(accno => $form->{'AP_paid_' . $i})->description
575 591
     : '';
576 592
  }
577

  
578
  $form->{paid_missing} = $form->{invtotal_unformatted} - $form->{totalpaid};
593
  $form->{paid_missing} =  $::form->{is_linked_bank_transaction} && $form->{invoice_obj}->forex ?
594
                           $form->{invoice_obj}->open_amount
595
                        :  $form->{invtotal_unformatted} - $form->{totalpaid};
579 596

  
580 597
  $form->{payment_id} = $form->{invoice_obj}->{payment_id} // $form->{payment_id};
581 598
  print $form->parse_html_template('ap/form_header', {
......
1407 1424
                      : $is_linked_bank_transaction                 ? 1
1408 1425
                      : $has_sepa_exports                           ? 1
1409 1426
                      : 0;
1427
  # and is_linked_bank_transaction
1428
  $::form->{is_linked_bank_transaction} = $is_linked_bank_transaction;
1410 1429

  
1411 1430
  my $create_post_action = sub {
1412 1431
    # $_[0]: description
1413 1432
    # $_[1]: after_action
1414 1433
    action => [
1434

  
1415 1435
      $_[0],
1416 1436
      submit   => [ '#form', { action => "post", after_action => $_[1] } ],
1417 1437
      checks   => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting', 'kivi.AP.check_duplicate_invnumber' ],

Auch abrufbar als: Unified diff