X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fis%2Fform_header.html;h=0d4a255becb368f20009e28e5f7aa5d283f64728;hb=e41671e06344bfc4a1c5399f1c6014423bd2be29;hp=c1c4c9e8913d08f38b725c26adeae5beeea7c744;hpb=18b1b18015503fb46e8e1201f79e968f097f66e0;p=kivitendo-erp.git

diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index c1c4c9e89..0d4a255be 100644
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -25,11 +25,12 @@
 <p>[% saved_message %]</p>
 
 [%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'generic/set_longdescription.html' %]
 
-<div class="tabwidget">
+<div id="is_tabs" class="tabwidget">
  <ul>
   <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
-[%- IF conf_webdav %]
+[%- IF INSTANCE_CONF.get_webdav %]
   <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
 [%- END %]
 [%- IF id %]
@@ -49,6 +50,7 @@
                  id            = 'customer',
                  name          = 'customer',
                  style         = 'width: 250px',
+                 class         = 'initial_focus',
                  DATA          = ALL_CUSTOMERS,
                  id_sub        = 'vc_keys',
                  label_key     = 'name',
@@ -75,7 +77,8 @@
         <tr>
           <th align="right">[% 'Shipping Address' | $T8 %]</th>
           <td>
-            [% L.select_tag('shipto_id', ALL_SHIPTO, default = shipto_id, value_key = 'shipto_id', title_key = 'displayable_id', with_empty = 1, style='width: 250px', onChange = "document.getElementById('update_button').click();") %]
+            [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
+               L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', style='width: 250px') %]
           </td>
         </tr>
 [%- END %]
@@ -110,7 +113,7 @@
         <tr>
           <th align="right">[% 'Steuersatz' | $T8 %]</th>
           <td>
-            [% L.select_tag('taxzone_id', ALL_TAXZONES, default = taxzone_id, title_key = 'description', disabled = (id ? 1 : 0), style='width: 250px', onchange = "document.getElementById('update_button').click();") %]
+            [% L.select_tag('taxzone_id', ( id ? ALL_TAXZONES : ALL_ACTIVE_TAXZONES) , default = taxzone_id, title_key = 'description', disabled = (id ? 1 : 0), style='width: 250px', onchange = "document.getElementById('update_button').click();") %]
   [%- IF id %]
           <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
   [%- END %]
@@ -158,7 +161,7 @@
         </tr>
         <tr>
           <th align="right">[% 'Transaction description' | $T8 %]</th>
-          <td colspan="3"><input size='35' name="transaction_description" value="[% HTML.escape(transaction_description) %]"></td>
+          <td colspan="3"><input size='35' name="transaction_description" id="transaction_description" value="[% HTML.escape(transaction_description) %]"></td>
         </tr>
       </table>
     </td>
@@ -190,7 +193,7 @@
         </tr>
         <tr>
           <th align="right">[% 'Credit Note Date' | $T8 %]</th>
-          <td>[% L.date_tag('invdate', invdate, cal_align='BL', onchange='set_duedate()') %]</td>
+          <td>[% L.date_tag('invdate', invdate, onchange='set_duedate()') %]</td>
         </tr>
 [%- ELSE %]
         <tr>
@@ -199,11 +202,11 @@
         </tr>
         <tr>
           <th align="right">[% 'Invoice Date' | $T8 %]</th>
-          <td>[% L.date_tag('invdate', invdate, cal_align='BL', onchange='set_duedate()') %]</td>
+          <td>[% L.date_tag('invdate', invdate, onchange='set_duedate()') %]</td>
         </tr>
         <tr>
           <th align="right">[% 'Due Date' | $T8 %]</th>
-          <td>[% L.date_tag('duedate', duedate, cal_align='BL') %]</td>
+          <td>[% L.date_tag('duedate', duedate) %]</td>
         </tr>
         <tr>
         <th align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
@@ -212,7 +215,7 @@
 [%- END %]
         <tr>
           <th align="right">[% 'Delivery Date' | $T8 %]</th>
-          <td>[% L.date_tag('deliverydate', deliverydate, cal_align='BL') %]</td>
+          <td>[% L.date_tag('deliverydate', deliverydate) %]</td>
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
@@ -220,7 +223,7 @@
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Order Date' | $T8 %]</th>
-          <td>[% L.date_tag('orddate', orddate, cal_align='BL') %]</td>
+          <td>[% L.date_tag('orddate', orddate) %]</td>
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Quotation Number' | $T8 %]</th>
@@ -228,7 +231,7 @@
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Quotation Date' | $T8 %]</th>
-          <td>[% L.date_tag('quodate', quodate, cal_align='BL') %]</td>
+          <td>[% L.date_tag('quodate', quodate) %]</td>
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>