Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e9b48f2e

Von Jan Büren vor fast 2 Jahren hinzugefügt

  • ID e9b48f2e341ecccf81d7c34825760bf1c808aab4
  • Vorgänger 3ac8234a
  • Nachfolger d73d1806

update_exchangerate für Zahlungen auch bei manueller Verbuchung

Unterschiede anzeigen:

SL/AP.pm
396 396

  
397 397
      # update exchange rate record
398 398
      if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
399
        $form->{script} = 'ap.pl';
399 400
        $form->update_exchangerate($dbh, $form->{currency},
400 401
                                   $form->{"datepaid_$i"},
401 402
                                   0, $form->{"exchangerate_$i"});
SL/Form.pm
1435 1435
                 { type => SCALAR, callbacks  => { is_valid_kivi_date => sub { shift =~ m/\d+\d+\d+/ } } }, # we have three numers
1436 1436
                 { type => SCALAR, callbacks  => { is_null_or_ar_int  => sub {    $_[0] == 0
1437 1437
                                                                               || $_[0] >  0
1438
                                                                               && $_[1]->[0]->{script} =~ m/ar\.pl|is\.pl/ } } }, # value buy fxrate
1438
                                                                               && $_[1]->[0]->{script} =~ m/cp\.pl|ar\.pl|is\.pl/ } } }, # value buy fxrate
1439 1439
                 { type => SCALAR, callbacks  => { is_null_or_ap_int  => sub {    $_[0] == 0
1440 1440
                                                                               || $_[0] >  0
1441
                                                                               && $_[1]->[0]->{script} =~ m/ap\.pl|ir\.pl/  } } }, # value sell fxrate
1441
                                                                               && $_[1]->[0]->{script} =~ m/cp\.pl|ap\.pl|ir\.pl/  } } }, # value sell fxrate
1442 1442
                 { type => SCALAR, callbacks  => { is_current_form_id => sub { $_[0] == $_[1]->[0]->{id} } },              optional => 1 },
1443 1443
                 { type => SCALAR, callbacks  => { is_valid_fx_table  => sub { shift =~ m/(ar|ap|bank_transactions)/  } }, optional => 1 }
1444 1444
              );
SL/IR.pm
698 698
    $paiddiff = 0;
699 699

  
700 700
    # update exchange rate for PAYMENTS
701
    $form->{script} = 'ir.pl';
701 702
    $form->update_exchangerate($dbh, $form->{currency}, $form->{"datepaid_$i"}, 0, $form->{"exchangerate_$i"})
702 703
      if ($form->{currency} ne $defaultcurrency) && !$exchangerate;
703 704
  }
SL/IS.pm
1441 1441
      # update exchange rate for PAYMENTS
1442 1442
      # exchangerate contains a new exchangerate of the payment date
1443 1443
      if (($form->{currency} ne $defaultcurrency) && !$exchangerate) {
1444
        $form->{script} = 'is.pl';
1444 1445
        $form->update_exchangerate($dbh, $form->{currency},
1445 1446
                                   $form->{"datepaid_$i"},
1446 1447
                                   $form->{"exchangerate_$i"}, 0);
bin/mozilla/cp.pl
235 235
  if (!$form->{forex}) {        # read exchangerate from input field (not hidden)
236 236
    $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate});
237 237
  }
238
  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{datepaid}, $buysell);
238
  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{datepaid}, $buysell)
239
    if $form->{defaultcurrency} ne $form->{currency} && $form->{datepaid};
239 240
  $form->{exchangerate} = $form->{forex} if $form->{forex};
240 241

  
241 242
  $amount = $form->{amount} = $form->parse_amount(\%myconfig, $form->{amount});

Auch abrufbar als: Unified diff