From: Jan Büren <jan@kivitendo-premium.de>
Date: Fri, 19 May 2017 13:53:27 +0000 (+0200)
Subject: behebt #243
X-Git-Tag: release-3.5.4~1083
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=da6ff55e68bf46e8aef1047f39e59784b090a650;p=kivitendo-erp.git

behebt #243

Kontoauszug verbuchen: Buchung erstellen ist jetzt ein Schritt
Falls die Zahlung für die Buchung entsprechend passend ist, wird
diese automatisch im zweiten Schritt als Vorschlag angezeigt.
Entsprechende Info an den Benutzer.
---

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index 52d43e1d6..b4c7adc17 100644
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -890,17 +890,16 @@ sub load_ap_record_template_url {
   my ($self, $template) = @_;
 
   return $self->url_for(
-    controller                 => 'ap.pl',
-    action                     => 'load_record_template',
-    id                         => $template->id,
-    'form_defaults.amount_1'   => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
-    'form_defaults.transdate'  => $self->transaction->transdate_as_date,
-    'form_defaults.duedate'    => $self->transaction->transdate_as_date,
-    'form_defaults.datepaid_1' => $self->transaction->transdate_as_date,
-    'form_defaults.paid_1'     => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
-    'form_defaults.currency'   => $self->transaction->currency->name,
-    'form_defaults.AP_paid_1'  => $self->transaction->local_bank_account->chart->accno,
-    'form_defaults.callback'   => $self->callback,
+    controller                           => 'ap.pl',
+    action                               => 'load_record_template',
+    id                                   => $template->id,
+    'form_defaults.amount_1'             => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
+    'form_defaults.transdate'            => $self->transaction->transdate_as_date,
+    'form_defaults.duedate'              => $self->transaction->transdate_as_date,
+    'form_defaults.no_payment_bookings'  => 1,
+    'form_defaults.paid_1_suggestion'    => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
+    'form_defaults.AP_paid_1_suggestion' => $self->transaction->local_bank_account->chart->accno,
+    'form_defaults.callback'             => $self->callback,
   );
 }
 
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index a6e36daaa..0e7baf388 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -154,6 +154,12 @@ sub load_record_template {
   $::form->{$_} = $form_defaults->{$_} for keys %{ $form_defaults // {} };
 
   flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
+  flash('info', $::locale->text("Payment bookings disallowed. After the booking this record may be
+                                 suggested with the amount of '#1' or otherwise has to be choosen manually.
+                                 No automatic payment booking will be done to chart '#2'.",
+                                  $form_defaults->{paid_1_suggestion},
+                                  $form_defaults->{AP_paid_1_suggestion},
+                                )) if $::form->{no_payment_bookings};
 
   update(
     keep_rows_without_amount => 1,
diff --git a/templates/webpages/ap/form_header.html b/templates/webpages/ap/form_header.html
index dc3f96fac..66555bdc2 100644
--- a/templates/webpages/ap/form_header.html
+++ b/templates/webpages/ap/form_header.html
@@ -244,6 +244,7 @@
   </tr>
   <tr>
     <td>
+      [% UNLESS no_payment_bookings %]
       <table width="100%">
         <tr class="listheading">
           <th class="listheading" colspan="7">[% 'Payments' | $T8 %]</th>
@@ -365,6 +366,7 @@
           <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
         </tr>
       </table>
+      [% END %]
     </td>
   </tr>
 </table>