Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

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

diff --git a/templates/webpages/customer_vendor/tabs/shipto.html b/templates/webpages/customer_vendor/tabs/shipto.html
index 97cfa9d..c47d272 100644 (file)
--- a/templates/webpages/customer_vendor/tabs/shipto.html
+++ b/templates/webpages/customer_vendor/tabs/shipto.html
@@ -3,7 +3,7 @@
 [%- USE L %]
 
 <div id="shipto">
-  <table width="100%" id="shipto_table">
+  <table id="shipto_table">
     <tr>
       <th align="right">[% 'Shipping Address' | $T8 %]</th>
 
@@ -16,7 +16,7 @@
              title_key = 'displayable_id',
              with_empty = 1,
              empty_title = LxERP.t8('New shipto'),
-             onchange = "kivi.CustomerVendor.selectShipto({onFormSet: function(){ shiptoMapWidget.testInputs(); local_reinit_widgets(); }});",
+             onchange = "kivi.CustomerVendor.selectShipto({onFormSet: function(){ shiptoMapWidget.testInputs(); kivi.reinit_widgets(); }});",
            )
         %]
       </td>
@@ -31,7 +31,7 @@
     </tr>
 
     <tr>
-      <th align="right" nowrap>[% 'Abteilung' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Department' | $T8 %]</th>
 
       <td>
         [% L.input_tag('shipto.shiptodepartment_1', SELF.shipto.shiptodepartment_1,  size = 16) %]
@@ -72,6 +72,14 @@
       </td>
     </tr>
 
+    <tr>
+      <th align="right" nowrap>[% 'GLN' | $T8 %]</th>
+
+      <td>
+        [% L.input_tag('shipto.shiptogln', SELF.shipto.shiptogln,  size = 35) %]
+      </td>
+    </tr>
+
     <tr>
       <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
 
@@ -103,9 +111,31 @@
         [% L.input_tag('shipto.shiptoemail', SELF.shipto.shiptoemail,  size = 45) %]
       </td>
     </tr>
+
+    [% shipto_cvars = SELF.shipto.cvars_by_config %]
+
+    [% IF ( shipto_cvars.size ) %]
+      <tr>
+        <td colspan="2">
+          <hr>
+        </td>
+      </tr>
+
+      [% FOREACH var = shipto_cvars %]
+        <tr>
+          <th align="right" valign="top" nowrap>[% var.config.description | html %]</th>
+
+          <td valign="top">
+            [% INCLUDE 'common/render_cvar_input.html'
+                       cvar_name_prefix = 'shipto_cvars.'
+            %]
+          </td>
+        </tr>
+      [% END %]
+    [% END %]
   </table>
 
-  [% L.button_tag('submitInputButton(this);', LxERP.t8('Delete Shipto'), name = 'action_delete_shipto', class = 'submit') %]
+  [% L.button_tag('submitInputButton("delete_shipto");', LxERP.t8('Delete Shipto'), class = 'submit') %]
   [% IF ( !SELF.shipto.shipto_id ) %]
     <script type="text/javascript">
       $('#action_delete_shipto').hide();