Lieferantentyp und -Rabatt oben in Einkaufmasken richtig anzeigen.

[kivitendo-erp.git] / templates / webpages / ir / form_header.html

diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html
index 6f6bf23..362bd89 100644 (file)
--- a/templates/webpages/ir/form_header.html
+++ b/templates/webpages/ir/form_header.html
@@ -2,6 +2,8 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+<h1>[% title %]</h1>
+
 [%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %]
 <script type="text/javascript" src="js/common.js"></script>
 <script type="text/javascript" src="js/vendor_selection.js"></script>
@@ -21,18 +23,18 @@
 <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
 <input type="hidden" name="follow_up_rowcount" value="1">
 
-<p><div class="listtop" width="100%">[% title %]</div></p>
-
 [%- INCLUDE 'common/flash.html' %]
+[%- INCLUDE 'generic/set_longdescription.html' %]
 
-<div class="tabwidget">
+<div id="ir_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 %]
   <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=PurchaseInvoice&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
+  <li><a href="[% 'controller.pl?action=AccTrans/list_transactions&trans_id=' _ HTML.url(id) | html %]">[% LxERP.t8('Transactions') %]</a></li>
 [%- END %]
  </ul>
 
@@ -48,6 +50,7 @@
                  id            = 'vendor',
                  name          = 'vendor',
                  style         = 'width: 250px',
+                 class         = 'initial_focus',
                  DATA          = ALL_VENDORS,
                  id_sub        = 'vc_keys',
                  label_key     = 'name',
@@ -77,6 +80,12 @@
             <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
           </td>
         </tr>
+[%- IF business %]
+        <tr>
+          <th align="right">[% 'Vendor type' | $T8 %]</th>
+          <td>[% business %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_amount(tradediscount * 100) %] %</td>
+        </tr>
+[%- END %]
         <tr>
           <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
           <td colspan="3"><select name="AP" style="width:250px;">[% selectAP %]</select></td>
@@ -147,7 +156,7 @@
         </tr>
         <tr>
           <th align="right">[% 'Credit Note Date' | $T8 %]</th>
-          <td>[% L.date_tag('invdate', invdate, onBlur='check_right_date_format(this)', cal_align='BL', onChange='set_duedate(this)') %]</td>
+          <td>[% L.date_tag('invdate', invdate, onChange='set_duedate(this)') %]</td>
         </tr>
 [%- ELSE %]
         <tr>
@@ -156,11 +165,11 @@
         </tr>
         <tr>
           <th align="right">[% 'Invoice Date' | $T8 %]</th>
-          <td>[% L.date_tag('invdate', invdate, onBlur='check_right_date_format(this)', cal_align='BL', onChange='set_duedate(this)') %]</td>
+          <td>[% L.date_tag('invdate', invdate, onChange='set_duedate(this)') %]</td>
         </tr>
         <tr>
           <th align="right">[% 'Due Date' | $T8 %]</th>
-          <td>[% L.date_tag('duedate', duedate, onBlur='check_right_date_format(this)', cal_align='BL') %]</td>
+          <td>[% L.date_tag('duedate', duedate) %]</td>
         </tr>
 [%- END %]
 
@@ -170,11 +179,11 @@
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Order Date' | $T8 %]</th>
-          <td>[% L.date_tag('orddate', orddate, onBlur='check_right_date_format(this)', cal_align='BL') %]</td>
+          <td>[% L.date_tag('orddate', orddate) %]</td>
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Quotation Date' | $T8 %]</th>
-          <td>[% L.date_tag('quodate', quodate, onBlur='check_right_date_format(this)', cal_align='BL') %]</td>
+          <td>[% L.date_tag('quodate', quodate) %]</td>
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Project Number' | $T8 %]</th>
@@ -210,18 +219,19 @@
 [% END %]
      });
      function set_duedate() {
-       $.ajax({
-         url: 'ir.pl?action=get_duedate_vendor',
-         data: {
-           invdate:     $('#invdate').val(),
-           vendor_id:   $('input[name="vendor_id"]').val(),
-           old_duedate: $('#duedate').val(),
-         },
-         dataType: 'text',
-         success: function (data) { $('#duedate').val(data); }
-       })
+       setTimeout(function() {
+         $.ajax({
+           url: 'ir.pl?action=get_duedate_vendor',
+           data: {
+             invdate:     $('#invdate').val(),
+             vendor_id:   $('input[name="vendor_id"]').val(),
+             old_duedate: $('#duedate').val(),
+           },
+           dataType: 'text',
+           success: function (data) { $('#duedate').val(data); }
+         })
+       }, 0);
      }
    //-->
   </script>
-
-  <input type="hidden" name="webdav" value="[% webdav %]">
+  <input type="hidden" name="webdav" value="[% webdav | html %]">