Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 955f5491

Von Martin Helmling martin.helmling@octosoft.eu vor fast 8 Jahren hinzugefügt

  • ID 955f549119d040e14ce67177ed388ca0d205c30a
  • Vorgänger 2bc58307
  • Nachfolger 5cd931eb

Banktransaction: Kontoauszug verbuchen überarbeitet(3)

Bewertung von SEPA-Export überarbeitet

Unterschiede anzeigen:

SL/Controller/BankTransaction.pm
185 185 
          #$main::lxdebug->message(LXDebug->DEBUG2(),"remote account '".$bt->{remote_account_number}."' bt_amount=". ($bt->amount * $factor));
186 186 
          #$main::lxdebug->message(LXDebug->DEBUG2(),"compare with   '".$_->vc_iban."'    amount=".$_->amount);
187 187 
          if ( $bt->{remote_account_number} eq $_->vc_iban && abs(( $_->amount *1 ) - ($bt->amount * $factor)) < 0.01 ) {
188 
            ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
189 
            $open_invoice->{agreement} += 5;
190 
            $open_invoice->{rule_matches} .= 'sepa_export_item(5) ';
191 
            $main::lxdebug->message(LXDebug->DEBUG2(),"sepa invoice_id=".$open_invoice->id." agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches});
192 
            $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
188 
            my $iban;
189 
            $iban = $open_invoice->customer->iban if $open_invoice->is_sales;
190 
            $iban = $open_invoice->vendor->iban   if ! $open_invoice->is_sales;
191 
            if($bt->{remote_account_number} eq $iban && abs(abs($open_invoice->amount) - abs($bt->amount)) < 0.01 ) {
192 
              ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
193 
              $open_invoice->{agreement} += 5;
194 
              $open_invoice->{rule_matches} .= 'sepa_export_item(5) ';
195 
              $main::lxdebug->message(LXDebug->DEBUG2(),"sepa invoice_id=".$open_invoice->id." agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches});
196 
              $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
197 
            }
193 198 
          }
194 199 
        }
195 200 
      }
......
207 212 
    foreach my $open_invoice (@all_non_sepa_invoices){
208 213 
      ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
209 214 
      $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*($open_invoice->{is_ar}?1:-1),2);
210 
      $main::lxdebug->message(LXDebug->DEBUG2(),"nons invoice_id=".$open_invoice->id." agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches});
215 
      $main::lxdebug->message(LXDebug->DEBUG2(),"nons invoice_id=".$open_invoice->id." agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches}) if $open_invoice->{agreement} > 2;
211 216 
    };
212 217 

  		




  213
  218
  
    
    my $agreement = 15;


  		












Auch abrufbar als:  Unified diff