X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fio%2Fship_to.html;h=2ffed371fcd89286fdddc4c770432382215a4bf7;hb=061f4d6d32ed95055114582ede45e8387b302a53;hp=ca5560c1035e7fbb55daba87cb1f6e8b51cfbb6e;hpb=361a37a3308fd6db743c7dd935955728b3bfcb21;p=kivitendo-erp.git

diff --git a/templates/webpages/io/ship_to.html b/templates/webpages/io/ship_to.html
index ca5560c10..2ffed371f 100644
--- a/templates/webpages/io/ship_to.html
+++ b/templates/webpages/io/ship_to.html
@@ -9,6 +9,7 @@
       shiptozipcode:      "[% JavaScript.escape(vc_obj.zipcode) %]",
       shiptocity:         "[% JavaScript.escape(vc_obj.city) %]",
       shiptocountry:      "[% JavaScript.escape(vc_obj.country) %]",
+      shiptogln:          "[% JavaScript.escape(vc_obj.gln) %]",
       shiptocontact:      "[% JavaScript.escape(vc_obj.contact) %]",
       shiptocp_gender:    "[% JavaScript.escape(vc_obj.cp_gender) %]",
       shiptophone:        "[% JavaScript.escape(vc_obj.phone) %]",
@@ -25,6 +26,7 @@
       shiptozipcode:      "[% JavaScript.escape(shipto.shiptozipcode) %]",
       shiptocity:         "[% JavaScript.escape(shipto.shiptocity) %]",
       shiptocountry:      "[% JavaScript.escape(shipto.shiptocountry) %]",
+      shiptogln:          "[% JavaScript.escape(shipto.shiptogln) %]",
       shiptocontact:      "[% JavaScript.escape(shipto.shiptocontact) %]",
       shiptocp_gender:    "[% JavaScript.escape(shipto.shiptocp_gender) %]",
       shiptophone:        "[% JavaScript.escape(shipto.shiptophone) %]",
@@ -61,9 +63,9 @@
 
 [% select_options = [ [ 0, LxERP.t8("Billing Address") ] ] ;
    FOREACH shipto = vc_obj.shipto ;
-     city  = shipto.shiptozipcode _ ' ' _ shipto.shiptocity ;
-     title = [ shipto.shiptoname, shipto.shiptostreet, city ] ;
-     CALL select_options.import([ [ loop.count, title.grep('\S').join("; ") ] ]) ;
+     tmpcity  = shipto.shiptozipcode _ ' ' _ shipto.shiptocity ;
+     tmptitle = [ shipto.shiptoname, shipto.shiptostreet, tmpcity ] ;
+     CALL select_options.import([ [ loop.count, tmptitle.grep('\S').join("; ") ] ]) ;
    END ;
    '' %]
 
@@ -122,6 +124,11 @@
     <td>[% HTML.escape(country) %]</td>
     <td>[% L.input_tag("shiptocountry", shiptocountry, "size", "35") %]</td>
    </tr>
+   <tr>
+    <th align="right" nowrap>[% LxERP.t8('GLN') %]</th>
+    <td>[% HTML.escape(gln) %]</td>
+    <td>[% L.input_tag("shiptogln", shiptogln, "size", "35") %]</td>
+   </tr>
    <tr>
     <th align="right" nowrap>[% LxERP.t8('Contact') %]</th>
     <td>[% HTML.escape(contact) %]</td>