From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Fri, 11 Sep 2020 15:17:30 +0000 (+0200)
Subject: Zahlungsbedingungen auch in Ek-Rechnung angeben können
X-Git-Tag: release-3.5.6.1~31
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0a6ae6c877e88ac9e3d34424d756cd48c5619115;p=kivitendo-erp.git

Zahlungsbedingungen auch in Ek-Rechnung angeben können

Diese werden im Bericht EK-Rechnungen schon aus den DB-Daten der Rechnung
angezeigt und nicht aus den Lieferanten-Stammdaten. Die Zahlungsbedingungen
können ja durchaus mal von denen abweichen, die in den Lieferanten-Stammdaten
hinterlegt sind.

Zudem ist es dann gleich dem Verhalten im Verkauf.

Behebt #35 (redmine)
Refs #36 (redmine)
---

diff --git a/SL/IR.pm b/SL/IR.pm
index 082e2aa57..5c768cf8a 100644
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -737,6 +737,7 @@ SQL
                 invoice      = ?, taxzone_id  = ?, notes         = ?, taxincluded  = ?,
                 intnotes     = ?, storno_id   = ?, storno        = ?,
                 cp_id        = ?, employee_id = ?, department_id = ?, delivery_term_id = ?,
+                payment_id   = ?,
                 currency_id = (SELECT id FROM currencies WHERE name = ?),
                 globalproject_id = ?, direct_debit = ?
               WHERE id = ?|;
@@ -747,6 +748,7 @@ SQL
             '1',                             $taxzone_id, $restricter->process($form->{notes}),               $form->{taxincluded} ? 't' : 'f',
                 $form->{intnotes},           conv_i($form->{storno_id}),     $form->{storno}      ? 't' : 'f',
          conv_i($form->{cp_id}),      conv_i($form->{employee_id}), conv_i($form->{department_id}), conv_i($form->{delivery_term_id}),
+         conv_i($form->{payment_id}),
                 $form->{"currency"},
          conv_i($form->{globalproject_id}),
                 $form->{direct_debit} ? 't' : 'f',
@@ -1004,7 +1006,7 @@ sub retrieve_invoice {
                 ordnumber, quonumber, paid, taxincluded, notes, taxzone_id, storno, gldate,
                 mtime, itime,
                 intnotes, (SELECT cu.name FROM currencies cu WHERE cu.id=ap.currency_id) AS currency, direct_debit,
-                delivery_term_id
+                payment_id, delivery_term_id
               FROM ap
               WHERE id = ?|;
   $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));
diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html
index f9880ad80..30f77c596 100644
--- a/templates/webpages/ir/form_footer.html
+++ b/templates/webpages/ir/form_footer.html
@@ -22,6 +22,12 @@
          </td>
          <td>
            <table>
+             <tr>
+               <th align="right">[% 'Payment Terms' | $T8 %]</th>
+               <td>[% L.select_tag('payment_id', payment_terms, default = payment_id, title_key = 'description', with_empty = 1, style="width: 250px") %]
+                 <script type='text/javascript'>$('#payment_id').change(function(){ kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate"); })</script>
+               </td>
+             </tr>
              <tr>
                <th align="right">[% 'Delivery Terms' | $T8 %] </th>
                <td>