X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fdo%2Fform_footer.html;h=eea92171aa8f12fc06b47883e50b6064b6bc67c3;hb=7482e44da683adb4bcd43fa272c4418e6c09d5f0;hp=a37e94239510bf7b0f163af711e027b92e14560f;hpb=fc41222c61dbee590005f04c50e8603581462543;p=kivitendo-erp.git

diff --git a/templates/webpages/do/form_footer.html b/templates/webpages/do/form_footer.html
index a37e94239..eea92171a 100644
--- a/templates/webpages/do/form_footer.html
+++ b/templates/webpages/do/form_footer.html
@@ -1,5 +1,5 @@
 [%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
+[% USE HTML %][% USE LxERP %][%- USE L -%]
  [%- IF delivered %]
  [%- SET RO = ' readonly' %]
  [%- END %]
@@ -16,37 +16,46 @@
         <td><textarea name="notes" rows="[% LxERP.numtextrows(notes, 25, 8, 2) %]" cols="25" wrap="soft"[% RO %]>[% HTML.escape(notes) %]</textarea></td>
         <td><textarea name="intnotes" rows="[% LxERP.numtextrows(intnotes, 35, 8, 2) %]" cols="35" wrap="soft"[% RO %]>[% HTML.escape(intnotes) %]</textarea></td>
        </tr>
+
+       <tr>
+         <th align="right">[% 'Delivery Terms' | $T8 %]</th>
+         <td>[% L.select_tag('delivery_term_id', ALL_DELIVERY_TERMS, default = delivery_term_id, with_empty = 1, title_key = 'description') %]</td>
+       </tr>
       </table>
 
      </td>
     </tr>
+[%- IF show_weight %]
+  <tr>
+    <td>
+      <table width="100%">
+        <tr valign="bottom">
+          <td align="right">
+            <table>
+            <tr>
+              <th  align="left">[% 'Total weight' | $T8 %]</th>
+              <td align="right">
+                [% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %]
+              </td>
+            </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+[%- END %]
    </table>
   </p>
 
-  <hr size="3" noshade>
+ </div>
+[% PROCESS 'webdav/_list.html' %]
+ <div id="ui-tabs-1">
+  [%- LxERP.t8("Loading...") %]
+ </div>
+</div>
 
-  [%- IF conf_webdav %]
-  <div class="listtop" align="left">[% 'Documents in the WebDAV repository' | $T8 %]</div>
-
-  <p>
-   <table width="100%">
-    <tr>
-     <td align="left" width="30%"><b>[% 'File name' | $T8 %]</b></td>
-     <td align="left" width="70%"><b>[% 'WebDAV link' | $T8 %]</b></td>
-    </tr>
-
-    [%- FOREACH file = WEBDAV %]
-    <tr>
-     <td align="left">[% HTML.escape(file.name) %]</td>
-     <td align="left"><a href="[% HTML.escape(file.link) %]">[% HTML.escape(file.type) %]</a></td>
-    </tr>
-    [%- END %]
-
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-  [%- END %]
+<hr size="3" noshade>
 
   <p>[% PRINT_OPTIONS %]</p>
 
@@ -65,8 +74,14 @@
    <input class="submit" type="submit" name="action_save" value="[% 'Save' | $T8 %]">
    [%- IF vc == 'customer' %]
    <input class="submit" type="submit" name="action_transfer_out" onclick="return check_transfer_qty()" value="[% 'Transfer out' | $T8 %]">
+   [% IF transfer_default %]
+   <input class="submit" type="submit" name="action_transfer_out_default" value="[% 'Transfer out via default' | $T8 %]">
+   [%- END %]
    [%- ELSE %]
    <input class="submit" type="submit" name="action_transfer_in"  onclick="return check_transfer_qty()" value="[% 'Transfer in' | $T8 %]">
+   [% IF transfer_default %]
+   <input class="submit" type="submit" name="action_transfer_in_default" value="[% 'Transfer in via default' | $T8 %]">
+   [%- END %]
    [%- END %]
    [%- END %]
    [%- IF id %]
@@ -82,8 +97,8 @@
   <p>
    [% 'Workflow Delivery Order' | $T8 %]<br>
    <input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
-   [% UNLESS delivered %]
-   <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+   [% UNLESS delivered || (vc == 'customer' && !INSTANCE_CONF.get_sales_delivery_order_show_delete) || (vc == 'vendor' && !INSTANCE_CONF.get_purchase_delivery_order_show_delete) %]
+    [% L.submit_tag('action_delete', LxERP.t8('Delete'), confirm=LxERP.t8('Are you sure?')) %]
    [% END %]
    <input class="submit" type="submit" name="action_invoice" value="[% 'Invoice' | $T8 %]">
   </p>