stammdaten -> kunden/lieferanten -> lieferungen waren nicht in der lage rechnungen...

Fix für Bug 1299

diff --git a/SL/CT.pm b/SL/CT.pm
index 1b9d91593e6b93cd03d099e784795f27be376a98..a661e8c58a59174bffcb51206b8ff0e572638dc4 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -941,7 +941,7 @@ sub get_delivery {
     qq|SELECT s.shiptoname, i.qty $qty_sign, | .
     qq|  ${arap}.id, ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
     qq|  i.description, i.unit, i.sellprice, | .
-    qq|  oe.id AS oe_id | .
+    qq|  oe.id AS oe_id, invoice | .
     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"

diff --git a/doc/changelog b/doc/changelog
index 2a84350a24637d1a2442fc4f0da048e6a9fa3519..7e547af99e92c9143432cb552c06b38a87959929 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -167,7 +167,7 @@
   1051 1055 1057 1058 1072 1073 1077 1079 1081 1082 1095 1098 1100 1101 1108
   1110 1118 1125 1127 1130 1133 1135 1136 1138 1144 1146 1147 1150 1151 1155
   1164 1173 1177 1186 1188 1190 1191 1195 1197 1198 1199 1200 1201 1209 1213
-  1243 1248 1250 1262 1286 1287 1289 1294
+  1243 1248 1250 1262 1286 1287 1289 1294 1299
 
 
 2009-06-02 - Version 2.6.0

diff --git a/templates/webpages/ct/get_delivery_de.html b/templates/webpages/ct/get_delivery_de.html
index b7b1823c7675bf32b37ab7700f0102be84a9e28e..a8c0d97984a5eb95829815080eea22d09663843c 100644 (file)
--- a/templates/webpages/ct/get_delivery_de.html
+++ b/templates/webpages/ct/get_delivery_de.html
@@ -18,9 +18,13 @@
 [%- END %]
         </tr>
 [%- FOREACH row = DELIVERY %]
+[%-
+    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
+                             :  ( row.invoice ? 'ir' : 'ap' )
+-%]
         <tr class="listrow[% loop.count % 2 %]">
           <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% IF row.id %]<a href='[% IF is_customer %]is[% ELSE %]ir[% END %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+          <td>[% IF row.id %]<a href='[% row.script %].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=[% IF is_customer %]sales_order[% ELSE %]purchase_order[% END %]&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>

diff --git a/templates/webpages/ct/get_delivery_master.html b/templates/webpages/ct/get_delivery_master.html
index 1d1833c626ec1e08ae5ce091cfd7886cd93fc467..156bd11e88761f895c5d9578533b061f614b9b46 100644 (file)
--- a/templates/webpages/ct/get_delivery_master.html
+++ b/templates/webpages/ct/get_delivery_master.html
@@ -18,9 +18,13 @@
 [%- END %]
         </tr>
 [%- FOREACH row = DELIVERY %]
+[%-
+    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
+                             :  ( row.invoice ? 'ir' : 'ap' )
+-%]
         <tr class="listrow[% loop.count % 2 %]">
           <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% IF row.id %]<a href='[% IF is_customer %]is[% ELSE %]ir[% END %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+          <td>[% IF row.id %]<a href='[% row.script %].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=[% IF is_customer %]sales_order[% ELSE %]purchase_order[% END %]&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>