X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=templates%2Fwebpages%2Fdo%2Fform_header.html;h=59fa98edc43b4a6d0d0910d3abe7ba2ed488df8e;hb=c05124af6ffb9ab2244234a6f09e6e089109c397;hp=012c3d30cae97d8b43085a2f1e0461f8c25a49b6;hpb=1c181c11d5637d4388b138942f2edcd3c97e23c4;p=kivitendo-erp.git
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 012c3d30c..59fa98edc 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -1,15 +1,33 @@
[%- USE T8 %]
[%- USE HTML %]
[%- USE LxERP %]
-[%- USE L %]
+[%- USE L %][%- USE P -%]
+
+[%# Determine which shipping address to show if the delivery order has been shipped already. %]
+[%- IF delivered;
+ SET shipto_label = [];
+ IF shipto_id;
+ FOREACH row = ALL_SHIPTO ;
+ IF row.shipto_id == shipto_id ;
+ SET shipto_label = [ row.shiptoname, row.shiptodepartment_1, row.shiptostreet, row.shiptocity ] ;
+ END ;
+ END ;
+ ELSE ;
+ SET shipto_label = [ shiptoname, shiptodepartment_1, shiptostreet, shiptocity ] ;
+ END ;
+
+ SET shipto_label = shipto_label.grep('.') ;
+ IF !shipto_label.size ;
+ shipto_label = [ LxERP.t8('no shipping address') ] ;
+ END ;
+ END ; %]
+
[% title %]
-
-
@@ -22,18 +40,12 @@
[%- IF vc == 'customer' %]
- [%- SET vc = 'customer' %]
- [%- SET the_vc_id = customer_id %]
- [%- SET the_vc = customer %]
- [%- SET the_oldvc = oldcustomer %]
[%- SET is_customer = '1' %]
[%- ELSE %]
[%- SET vc = 'vendor' %]
- [%- SET the_vc_id = vendor_id %]
- [%- SET the_vc = vendor %]
- [%- SET the_oldvc = oldvendor %]
[%- SET is_customer = '0' %]
[%- END %]
+ [%- SET vc_id = vc _ "_id" %]
[%- IF delivered %]
[%- SET DISABLED = ' disabled' %]
[%- END %]
@@ -45,7 +57,7 @@