Berichte->Aufträge/Lieferantenaufträge: Zahlungsbedingungen anzeigen

diff --git a/SL/OE.pm b/SL/OE.pm
index b8dd56072cdc48807cb10995ad5aab560baf1d90..8430e2aa472a310fb4bf007f733cefff34295da9 100644 (file)
--- 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|  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,  | .
     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 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 = ?) |;
     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",
     "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}";
   );
   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 93e9f2a2f8e1072aa2d92249477746b26bf6406b..9d297b8ae5be8aafd95fffb0aa7f7bcf2f9ac565 100644 (file)
--- 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",
     "country",                 "shippingpoint",
     "taxzone",                 "insertdate",
     "order_probability",       "expected_billing_date", "expected_netamount",

+    "payment_terms",

   );
 
   # only show checkboxes if gotten here via sales_order form.
   );
 
   # 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'), },
     '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,
   );
 
     %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";
   }
     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 323fd2383fd4b647537b44d69b9a990dcaf87f09..b7a24913a4460463e581c6daabf5b63b29cf4b88 100644 (file)
--- 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>
          <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>
        </tr>
        <tr>
         <td>