Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 052dbdbe

Von Sven Schöling vor mehr als 14 Jahren hinzugefügt

  • ID 052dbdbe21deaa9ecaeacb103cb46b7cb3db9599
  • Vorgänger a00e1b52
  • Nachfolger 754c5e89

stammdaten -> kunden/lieferanten -> lieferungen waren nicht in der lage rechnungen und buchungen zu unterscheiden.

Fix für Bug 1299

Unterschiede anzeigen:

SL/CT.pm
941 941
    qq|SELECT s.shiptoname, i.qty $qty_sign, | .
942 942
    qq|  ${arap}.id, ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
943 943
    qq|  i.description, i.unit, i.sellprice, | .
944
    qq|  oe.id AS oe_id | .
944
    qq|  oe.id AS oe_id, invoice | .
945 945
    qq|FROM $arap | .
946 946
    qq|LEFT JOIN shipto s ON | .
947 947
    ($arap eq "ar"
doc/changelog
167 167
  1051 1055 1057 1058 1072 1073 1077 1079 1081 1082 1095 1098 1100 1101 1108
168 168
  1110 1118 1125 1127 1130 1133 1135 1136 1138 1144 1146 1147 1150 1151 1155
169 169
  1164 1173 1177 1186 1188 1190 1191 1195 1197 1198 1199 1200 1201 1209 1213
170
  1243 1248 1250 1262 1286 1287 1289 1294
170
  1243 1248 1250 1262 1286 1287 1289 1294 1299
171 171

  
172 172

  
173 173
2009-06-02 - Version 2.6.0
templates/webpages/ct/get_delivery_de.html
18 18
[%- END %]
19 19
        </tr>
20 20
[%- FOREACH row = DELIVERY %]
21
[%-
22
    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
23
                             :  ( row.invoice ? 'ir' : 'ap' )
24
-%]
21 25
        <tr class="listrow[% loop.count % 2 %]">
22 26
          <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
23
          <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>
27
          <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>
24 28
          <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>
25 29
          <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
26 30
          <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
templates/webpages/ct/get_delivery_master.html
18 18
[%- END %]
19 19
        </tr>
20 20
[%- FOREACH row = DELIVERY %]
21
[%-
22
    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
23
                             :  ( row.invoice ? 'ir' : 'ap' )
24
-%]
21 25
        <tr class="listrow[% loop.count % 2 %]">
22 26
          <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
23
          <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>
27
          <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>
24 28
          <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>
25 29
          <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
26 30
          <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>

Auch abrufbar als: Unified diff