X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fio%2Fship_to.html;h=e3e6500ba5a3221bbe18a28bf5eb895bf5745a5e;hb=219d88ab03186a74e5dd474175e49bd74dacf15f;hp=476aaebb093840d4d6ca930d16c830f3ad174f24;hpb=1c181c11d5637d4388b138942f2edcd3c97e23c4;p=kivitendo-erp.git diff --git a/templates/webpages/io/ship_to.html b/templates/webpages/io/ship_to.html index 476aaebb0..e3e6500ba 100644 --- a/templates/webpages/io/ship_to.html +++ b/templates/webpages/io/ship_to.html @@ -15,6 +15,9 @@ shiptophone: "[% JavaScript.escape(vc_obj.phone) %]", shiptofax: "[% JavaScript.escape(vc_obj.fax) %]", shiptoemail: "[% JavaScript.escape(vc_obj.email) %]" +[% FOREACH var = cvars %] + , "shiptocvar_[% JavaScript.escape(var.config.name) %]": "" +[% END %] } [% FOREACH shipto = vc_obj.shipto %] @@ -32,6 +35,9 @@ shiptophone: "[% JavaScript.escape(shipto.shiptophone) %]", shiptofax: "[% JavaScript.escape(shipto.shiptofax) %]", shiptoemail: "[% JavaScript.escape(shipto.shiptoemail) %]" + [% FOREACH var = shipto.cvars_by_config %] + , "shiptocvar_[% JavaScript.escape(var.config.name) %]": "[% JavaScript.escape(var.value_as_text) %]" + [% END %] } [% END %] ]; @@ -63,9 +69,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 ; '' %] @@ -156,6 +162,13 @@