Merge branch 'debian' into b-3.6.1

[kivitendo-erp.git] / templates / webpages / customer_vendor / form.html

diff --git a/templates/webpages/customer_vendor/form.html b/templates/webpages/customer_vendor/form.html
index 8b4d1c0..2fce8d6 100644 (file)
--- a/templates/webpages/customer_vendor/form.html
+++ b/templates/webpages/customer_vendor/form.html
@@ -20,15 +20,21 @@
   <div class="tabwidget" id="customer_vendor_tabs">
     <ul>
       <li><a href="#billing">[% 'Billing Address' | $T8 %]</a></li>
+      [% IF SELF.is_customer %]
+        <li><a href="#additional_billing_addresses">[% 'Additional Billing Addresses' | $T8 %]</a></li>
+      [% END %]
       <li><a href="#bank">[% 'Bank account' | $T8 %]</a></li>
       <li><a href="#shipto">[% 'Shipping Address' | $T8 %]</a></li>
       <li><a href="#contacts">[% 'Contacts' | $T8 %]</a></li>
       [% IF show_deliveries %]
         <li><a href="#deliveries">[% 'Supplies' | $T8 %]</a></li>
-[%- IF INSTANCE_CONF.get_doc_storage %]
-      <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% FORM.db == 'vendor' ? 'vendor' : 'customer' %]&object_id=[% SELF.cv.id %]">[% 'Attachments' | $T8 %]</a></li>
-[%- END %]
       [% END %]
+      [%- IF INSTANCE_CONF.get_webdav %]
+        <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+      [%- END %]
+      [%- IF INSTANCE_CONF.get_doc_storage %]
+        <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% FORM.db == 'vendor' ? 'vendor' : 'customer' %]&object_id=[% SELF.cv.id %]">[% 'Attachments' | $T8 %]</a></li>
+      [%- END %]
       <li><a href="#vcnotes">[% 'Notes' | $T8 %]</a></li>
 
       [% IF ( cv_cvars.size ) %]
@@ -58,12 +64,16 @@
     </ul>
 
     [% PROCESS "customer_vendor/tabs/billing.html" %]
+    [% IF SELF.is_customer %]
+      [% PROCESS "customer_vendor/tabs/additional_billing_addresses.html" %]
+    [% END %]
     [% PROCESS "customer_vendor/tabs/bank.html" %]
     [% PROCESS "customer_vendor/tabs/shipto.html" %]
     [% PROCESS "customer_vendor/tabs/contacts.html" %]
     [% IF show_deliveries %]
       [% PROCESS "customer_vendor/tabs/deliveries.html" %]
     [% END %]
+    [% PROCESS 'webdav/_list.html' %]
     [% PROCESS "customer_vendor/tabs/vcnotes.html" %]
     [% IF ( cv_cvars.size ) %]
       [% PROCESS "customer_vendor/tabs/custom_variables.html" %]