Merge branch 'f-use-proper-selects-and-pickers'

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

diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index 2ccdf5f..4fcc5ac 100644 (file)
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -1,14 +1,12 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
-[%- USE L %]
-[%- SET follow_up_trans_info = invnumber _ ' (' _ customer_name _ ')' %]
+[%- USE L %][%- USE P -%]
+[%- SET follow_up_trans_info = invnumber _ ' (' _ customer_obj.name _ ')' %]
 <script type="text/javascript" src="js/common.js"></script>
 <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
-<script type="text/javascript" src="js/vendor_selection.js"></script>
 <script type="text/javascript" src="js/calculate_qty.js"></script>
 <script type="text/javascript" src="js/follow_up.js"></script>
-<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
 
 <form method="post" name="invoice" action="[% script %]">
 
@@ -25,7 +23,7 @@
 
 <p>[% saved_message %]</p>
 
-[%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'common/flash.html' %]
 [%- INCLUDE 'generic/set_longdescription.html' %]
 
 <div id="is_tabs" class="tabwidget">
@@ -35,8 +33,12 @@
   <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
 [%- END %]
 [%- IF id %]
+  [%- IF AUTH.assert('record_links', 1) %]
   <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Invoice&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
+  [%- END %]
+  [%- IF AUTH.assert('invoice_edit', 1) %]
   <li><a href="[% 'controller.pl?action=AccTrans/list_transactions&trans_id=' _ HTML.url(id) | html %]">[% LxERP.t8('Transactions') %]</a></li>
+  [%- END %]
 [%- END %]
  </ul>
 
@@ -48,23 +50,10 @@
         <tr>
           <th align="right">[% 'Customer' | $T8 %]</th>
           <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 id            = 'customer',
-                 name          = 'customer',
-                 style         = 'width: 250px',
-                 class         = 'initial_focus',
-                 DATA          = ALL_CUSTOMERS,
-                 id_sub        = 'vc_keys',
-                 label_key     = 'name',
-                 select        = vc_select,
-                 limit         = vclimit,
-                 allow_textbox = 1,
-                 onChange      = "document.getElementById('update_button').click();" -%]
-            <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% HTML.escape(vc) %]')">
-          <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
-          <input type="hidden" name="customer_id" value="[% HTML.escape(customer_id) %]">
-          <input type="hidden" name="oldcustomer" value="[% HTML.escape(oldcustomer) %]">
-          <input type="hidden" name="selectcustomer" value="[% HTML.escape(selectcustomer) %]">
+           [% P.customer_vendor_picker("customer_id", customer_id, type="customer", style="width: 250px", class="initial_focus") %]
+           [% L.button_tag("show_vc_details('customer')", LxERP.t8('Details (one letter abbreviation)')) %]
+           [% L.hidden_tag("previous_customer_id", customer_id) %]
+          <input type="hidden" name="customer_pricegroup_id" value="[% HTML.escape(customer_pricegroup_id) %]">
           </td>
         </tr>
 [%- IF ALL_CONTACTS.size %]
@@ -142,11 +131,11 @@
   [%- END %]
           </td>
         </tr>
-[%- IF all_departments %]
+[%- IF ALL_DEPARTMENTS %]
         <tr>
           <th align="right" nowrap>[% 'Department' | $T8 %]</th>
           <td colspan="3">
-            [% L.select_tag('department_id', all_departments, default = department_id, title_sub = \department_labels, with_empty = 1, style = 'width:250px') %]
+            [% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1, style = 'width:250px') %]
           </td>
         </tr>
 [%- END %]
@@ -160,6 +149,8 @@
           <td>
             <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
             <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
+            <input type="hidden" name="rndgain_accno" value="[% rndgain_accno %]">
+            <input type="hidden" name="rndloss_accno" value="[% rndloss_accno %]">
           </td>
         </tr>
 [%- IF show_exchangerate %]
@@ -288,9 +279,9 @@
 [% IF resubmit && is_format_html %]
        window.open('about:blank','Beleg');
        document.invoice.target = 'Beleg';
-       document.invoice.submit();
+       $('#action_print').click();
 [% ELSIF resubmit %]
-       document.invoice.submit();
+       $('#action_print').click();
 [% ELSIF creditwarning != '' %]
        alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
 [% ELSE %]