X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=templates%2Fwebpages%2Fdo%2Fform_header.html;h=62ba79f4a3c0c972cd76ea5f3f67aa71712e116b;hb=511d3561ad2e8fd8bc16cffe9b085f043062f7f3;hp=2961b5c6894134f00eb0a38c252e790567102e7d;hpb=efb9a24f2252104ab4af5c25334119d7c5c70a8c;p=kivitendo-erp.git
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 2961b5c68..62ba79f4a 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -1,16 +1,37 @@
[%- 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 %]
+
-
-
+
[%- 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 %]
-
[% title %]
-
[%- INCLUDE 'common/flash.html' %]
[%- INCLUDE 'generic/set_longdescription.html' %]
@@ -44,70 +57,72 @@