Kontoauszug verbuchen: »Beleg«/»Memo« bei Vorschlägen angeben können

[mfinanz.git] / SL / Controller / BankTransaction.pm

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index 8b0c9216abfcae962b2446f37747a3b3a6f2a0b9..f2f16b551f06ae101435c7cebd72f5fdc363859d 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -511,6 +511,8 @@ sub save_invoices {
       push @{ $self->problems }, $self->save_single_bank_transaction(
         bank_transaction_id => $bank_transaction_id,
         invoice_ids         => $invoice_ids,
       push @{ $self->problems }, $self->save_single_bank_transaction(
         bank_transaction_id => $bank_transaction_id,
         invoice_ids         => $invoice_ids,

+        sources             => ($::form->{sources} // {})->{$_},
+        memos               => ($::form->{memos}   // {})->{$_},

       );
       $count += scalar( @{$invoice_ids} );
     }
       );
       $count += scalar( @{$invoice_ids} );
     }


@@ -537,6 +539,7 @@ sub action_save_invoices {
 
 sub action_save_proposals {
   my ($self) = @_;
 
 sub action_save_proposals {
   my ($self) = @_;

+

   if ( $::form->{proposal_ids} ) {
     my $propcount = scalar(@{ $::form->{proposal_ids} });
     if ( $propcount > 0 ) {
   if ( $::form->{proposal_ids} ) {
     my $propcount = scalar(@{ $::form->{proposal_ids} });
     if ( $propcount > 0 ) {


@@ -620,6 +623,8 @@ sub save_single_bank_transaction {
     my $n_invoices   = 0;
 
     foreach my $invoice (@{ $data{invoices} }) {
     my $n_invoices   = 0;
 
     foreach my $invoice (@{ $data{invoices} }) {

+      my $source = ($data{sources} // [])->[$n_invoices];
+      my $memo   = ($data{memos}   // [])->[$n_invoices];

 
       $n_invoices++ ;
 
 
       $n_invoices++ ;
 


@@ -665,6 +670,8 @@ sub save_single_bank_transaction {
                               trans_id     => $invoice->id,
                               amount       => $open_amount,
                               payment_type => $payment_type,
                               trans_id     => $invoice->id,
                               amount       => $open_amount,
                               payment_type => $payment_type,

+                              source       => $source,
+                              memo         => $memo,

                               transdate    => $bank_transaction->transdate->to_kivitendo);
       } elsif ( $invoice->is_sales && $invoice->type eq 'credit_note' ) {
         # no check for overpayment/multiple payments
                               transdate    => $bank_transaction->transdate->to_kivitendo);
       } elsif ( $invoice->is_sales && $invoice->type eq 'credit_note' ) {
         # no check for overpayment/multiple payments


@@ -672,6 +679,8 @@ sub save_single_bank_transaction {
                               trans_id     => $invoice->id,
                               amount       => $invoice->open_amount,
                               payment_type => $payment_type,
                               trans_id     => $invoice->id,
                               amount       => $invoice->open_amount,
                               payment_type => $payment_type,

+                              source       => $source,
+                              memo         => $memo,

                               transdate    => $bank_transaction->transdate->to_kivitendo);
       } else { # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary
         my $overpaid_amount = $amount_of_transaction - $invoice->open_amount;
                               transdate    => $bank_transaction->transdate->to_kivitendo);
       } else { # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary
         my $overpaid_amount = $amount_of_transaction - $invoice->open_amount;


@@ -679,6 +688,8 @@ sub save_single_bank_transaction {
                               trans_id     => $invoice->id,
                               amount       => $amount_of_transaction,
                               payment_type => $payment_type,
                               trans_id     => $invoice->id,
                               amount       => $amount_of_transaction,
                               payment_type => $payment_type,

+                              source       => $source,
+                              memo         => $memo,

                               transdate    => $bank_transaction->transdate->to_kivitendo);
         $bank_transaction->invoice_amount($bank_transaction->amount);
         $amount_of_transaction = 0;
                               transdate    => $bank_transaction->transdate->to_kivitendo);
         $bank_transaction->invoice_amount($bank_transaction->amount);
         $amount_of_transaction = 0;