From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 30 Mar 2009 15:53:52 +0000 (+0000)
Subject: Kunden->Lieferanten Dialog mit Links versehen.
X-Git-Tag: release-2.6.0beta2~123
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=88e16972a3c5a76af719c3eff31b6d8163e2e8b3;p=kivitendo-erp.git

Kunden->Lieferanten Dialog mit Links versehen.
---

diff --git a/SL/CT.pm b/SL/CT.pm
index 7e81d66c4..3df827a6d 100644
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -923,8 +923,9 @@ sub get_delivery {
   }
   my $query =
     qq|SELECT s.shiptoname, i.qty, | .
-    qq|  ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
-    qq|  i.description, i.unit, i.sellprice | .
+    qq|  ${arap}.id, ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
+    qq|  i.description, i.unit, i.sellprice, | .
+    qq|  oe.id AS oe_id | .
     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"
@@ -932,6 +933,7 @@ sub get_delivery {
      : qq|(ap.id = s.trans_id) |) .
     qq|LEFT JOIN invoice i ON (${arap}.id = i.trans_id) | .
     qq|LEFT join parts p ON (p.id = i.parts_id) | .
+    qq|LEFT JOIN oe ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = '') | .
     $where .
     qq|ORDER BY ${arap}.transdate DESC LIMIT 15|;
 
diff --git a/templates/webpages/ct/get_delivery_de.html b/templates/webpages/ct/get_delivery_de.html
index 17a75880a..b6daa6717 100644
--- a/templates/webpages/ct/get_delivery_de.html
+++ b/templates/webpages/ct/get_delivery_de.html
@@ -16,13 +16,13 @@
 [%- FOREACH row = DELIVERY %]
         <tr class="listrow[% loop.count % 2 %]">
           <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% HTML.escape(row.invnumber)   %]&nbsp;</td>
-          <td>[% HTML.escape(row.ordnumber)   %]&nbsp;</td>
-          <td>[% HTML.escape(row.transdate)   %]&nbsp;</td>
-          <td>[% HTML.escape(row.description) %]&nbsp;</td>
-          <td>[% HTML.escape(row.qty)         %]&nbsp;</td>
-          <td>[% HTML.escape(row.unit)        %]&nbsp;</td>
-          <td>[% LxERP.format_amount(row.sellprice, 2) %]&nbsp;</td>
+          <td>[% IF row.id %]<a href='is.pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=sales_order&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
+          <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
+          <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
+          <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>
+          <td>[% HTML.escape(row.unit)        || '&nbsp;' %]</td>
+          <td>[% LxERP.format_amount(row.sellprice, 2) || '&nbsp;' %]</td>
         </tr>
 [%- END %]
 
diff --git a/templates/webpages/ct/get_delivery_master.html b/templates/webpages/ct/get_delivery_master.html
index eac63cb76..a8d53a780 100644
--- a/templates/webpages/ct/get_delivery_master.html
+++ b/templates/webpages/ct/get_delivery_master.html
@@ -16,13 +16,13 @@
 [%- FOREACH row = DELIVERY %]
         <tr class="listrow[% loop.count % 2 %]">
           <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% HTML.escape(row.invnumber)   %]&nbsp;</td>
-          <td>[% HTML.escape(row.ordnumber)   %]&nbsp;</td>
-          <td>[% HTML.escape(row.transdate)   %]&nbsp;</td>
-          <td>[% HTML.escape(row.description) %]&nbsp;</td>
-          <td>[% HTML.escape(row.qty)         %]&nbsp;</td>
-          <td>[% HTML.escape(row.unit)        %]&nbsp;</td>
-          <td>[% LxERP.format_amount(row.sellprice, 2) %]&nbsp;</td>
+          <td>[% IF row.id %]<a href='is.pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=sales_order&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
+          <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
+          <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
+          <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>
+          <td>[% HTML.escape(row.unit)        || '&nbsp;' %]</td>
+          <td>[% LxERP.format_amount(row.sellprice, 2) || '&nbsp;' %]</td>
         </tr>
 [%- END %]