From ba8e82fec038819527301ee344d2016f0c83983a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= <bernd@kivitendo-premium.de>
Date: Mon, 18 May 2015 08:59:30 +0200
Subject: [PATCH] =?utf8?q?Berichte->Auftr=C3=A4ge/Lieferantenauftr=C3=A4ge?=
 =?utf8?q?:=20Zahlungsbedingungen=20anzeigen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/OE.pm                          | 3 +++
 bin/mozilla/oe.pl                 | 4 +++-
 templates/webpages/oe/search.html | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/SL/OE.pm b/SL/OE.pm
index b8dd56072..8430e2aa4 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -111,6 +111,7 @@ sub transactions {
     qq|  o.marge_total, o.marge_percent, | .
     qq|  o.itime::DATE AS insertdate, | .
     qq|  ex.$rate AS exchangerate, | .
+    qq|  pt.description AS payment_terms, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  e.name AS employee, s.name AS salesman, | .
     qq|  ct.${vc}number AS vcnumber, ct.country, ct.ustid, ct.business_id,  | .
@@ -125,6 +126,7 @@ sub transactions {
     qq|LEFT JOIN exchangerate ex ON (ex.currency_id = o.currency_id | .
     qq|  AND ex.transdate = o.transdate) | .
     qq|LEFT JOIN project pr ON (o.globalproject_id = pr.id) | .
+    qq|LEFT JOIN payment_terms pt ON (pt.id = o.payment_id)| .
     qq|LEFT JOIN tax_zones tz ON (o.taxzone_id = tz.id) | .
     qq|$periodic_invoices_joins | .
     qq|WHERE (o.quotation = ?) |;
@@ -307,6 +309,7 @@ SQL
     "shippingpoint"           => "o.shippingpoint",
     "insertdate"              => "o.itime",
     "taxzone"                 => "tz.description",
+    "payment_terms"           => "pt.description",
   );
   if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
     $sortorder = $allowed_sort_columns{$form->{sort}} . " ${sortdir}"  . ", o.itime ${sortdir}";
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 93e9f2a2f..9d297b8ae 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -853,6 +853,7 @@ sub orders {
     "country",                 "shippingpoint",
     "taxzone",                 "insertdate",
     "order_probability",       "expected_billing_date", "expected_netamount",
+    "payment_terms",
   );
 
   # only show checkboxes if gotten here via sales_order form.
@@ -944,10 +945,11 @@ sub orders {
     'order_probability'       => { 'text' => $locale->text('Order probability'), },
     'expected_billing_date'   => { 'text' => $locale->text('Exp. bill. date'), },
     'expected_netamount'      => { 'text' => $locale->text('Exp. netamount'), },
+    'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
     %column_defs_cvars,
   );
 
-  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate)) {
+  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms)) {
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }
diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
index 323fd2383..b7a24913a 100644
--- a/templates/webpages/oe/search.html
+++ b/templates/webpages/oe/search.html
@@ -281,6 +281,10 @@
          <input name="l_marge_percent" id="l_marge_percent" class="checkbox" type="checkbox" value="Y">
          <label for="l_marge_percent">[% 'Ertrag prozentual' | $T8 %]</label>
         </td>
+        <td>
+         <input name="l_payment_terms" id="l_payment_terms" class="checkbox" type="checkbox" value="Y">
+         <label for="l_payment_terms">[% 'Payment Terms' | $T8 %]</label>
+        </td>
        </tr>
        <tr>
         <td>
-- 
2.20.1