X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fdo%2Fform_header.html;h=60059a2f905e793a856bc581b4b19e0523c2fd4b;hb=01678c873dfa6fcbe5003789e79d8b7ad7c93551;hp=5af79bedc755511c0e5158fd4a73c4cb988a4969;hpb=267826b1f494c28fd0f5c260df22b3139156f4d5;p=kivitendo-erp.git

diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 5af79bedc..60059a2f9 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -2,6 +2,8 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript" src="js/show_form_details.js"></script>
  <script type="text/javascript" src="js/show_history.js"></script>
  <script type="text/javascript" src="js/show_vc_details.js"></script>
@@ -11,6 +13,7 @@
  <script type="text/javascript" src="js/calculate_qty.js"></script>
  <script type="text/javascript" src="js/stock_in_out.js"></script>
  <script type="text/javascript" src="js/follow_up.js"></script>
+ <script type="text/javascript" src="js/kivi.SalesPurchase.js"></script>
 
  <style type="text/css">
   .fixed_width {
@@ -35,9 +38,8 @@
  [%- SET DISABLED = ' disabled' %]
  [%- END %]
 
- <div class="listtop">[% title %]</div>
-
 [%- INCLUDE 'common/flash.html' %]
+[%- INCLUDE 'generic/set_longdescription.html' %]
 
  [%- IF ERRORS && ERRORS.size %]
  <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
@@ -45,7 +47,7 @@
 
  <form method="post" name="do" action="do.pl">
 
- <div class="tabwidget">
+ <div id="do_tabs" class="tabwidget">
   <ul>
    <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
 [%- IF INSTANCE_CONF.get_webdav %]
@@ -82,6 +84,7 @@
   <input type="hidden" name="max_dunning_level" value="[% HTML.escape(max_dunning_level) %]">
   <input type="hidden" name="media" value="[% HTML.escape(media) %]">
   <input type="hidden" name="message" value="[% HTML.escape(message) %]">
+  <input type="hidden" name="payment_id" value="[% HTML.escape(payment_id) %]">
   <input type="hidden" name="printed" value="[% HTML.escape(printed) %]">
   <input type="hidden" name="proforma" value="[% HTML.escape(proforma) %]">
   <input type="hidden" name="queued" value="[% HTML.escape(queued) %]">
@@ -103,7 +106,6 @@
   <input type="hidden" name="subject" value="[% HTML.escape(subject) %]">
   <input type="hidden" name="taxincluded" value="[% HTML.escape(taxincluded) %]">
   <input type="hidden" name="taxzone_id" value="[% HTML.escape(taxzone_id) %]">
-  <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
   <input type="hidden" name="title" value="[% HTML.escape(title) %]">
   <input type="hidden" name="type" value="[% HTML.escape(type) %]">
   <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
@@ -116,6 +118,7 @@
        <tr>
         <input type="hidden" name="[% vc %]_id" value="[% HTML.escape(the_vc_id) %]">
         <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
+        <input type="hidden" name="tradediscount" value="[% HTML.escape(tradediscount) %]">
         <th align="right">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
         <td>
          [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
@@ -163,7 +166,8 @@
           [%- END %]
 
           [%- ELSE %]
-            [% L.select_tag('shipto_id', ALL_SHIPTO, default = shipto_id, value_key = 'shipto_id', title_key = 'displayable_id', with_empty = 1, class = 'fixed_width') %]
+            [% 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') %]
           [%- END %]
          </td>
         </tr>
@@ -211,7 +215,7 @@
 
        <tr>
         <th align="right">[% 'Transaction description' | $T8 %]</th>
-        <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"[% RO %]></td>
+        <td colspan="3"><input name="transaction_description" id="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"[% RO %]></td>
        </tr>
 
       </table>
@@ -310,6 +314,13 @@
         </td>
        </tr>
 
+       [%- IF is_customer %]
+       <tr>
+        <th align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
+        <td>[% insertdate %]</td>
+       </tr>
+       [%- END %]
+
        <tr>
         <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
         <td>