Merge branch 'test' of ../kivitendo-erp_20220811

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

diff --git a/templates/webpages/is/_payments.html b/templates/webpages/is/_payments.html
index 771cede..8072df3 100644 (file)
--- a/templates/webpages/is/_payments.html
+++ b/templates/webpages/is/_payments.html
@@ -1,4 +1,6 @@
-[%- USE LxERP %][% USE T8 %]
+[%- USE LxERP %]
+[%- USE T8 %]
+[%- USE L %]
   <tr>
    <td>
     <table width="100%">
@@ -16,6 +18,7 @@
       <th>[%- 'Source' | $T8 %]</th>
       <th>[%- 'Memo' | $T8 %]</th>
       <th>[%- 'Amount' | $T8 %]</th>
+      <th></th>
 [% IF show_exchangerate %]
       <th>[%- 'Exch' | $T8 %]</th>
 [% END %]
@@ -26,7 +29,7 @@
 [% FOREACH i = paid_indices %]
   [% SET changeable    = 'changeable_'    _ i %]
   [% SET acc_trans_id  = 'acc_trans_id_'  _ i %]
-  [% SET gldate        = 'gldate_'        _ i %]
+  [% SET p_gldate      = 'gldate_'        _ i %]
   [% SET datepaid      = 'datepaid_'      _ i %]
   [% SET source        = 'source_'        _ i %]
   [% SET memo          = 'memo_'          _ i %]
@@ -36,15 +39,18 @@
      <tr style='display:none'>
        <td>
          <input type=hidden name="acc_trans_id_[% i %]" value="[% $acc_trans_id %]">
-         <input type=hidden name="gldate_[% i %]" value="[% $gldate %]">
+         <input type=hidden name="gldate_[% i %]" value="[% $p_gldate %]">
        </td>
      </tr>
 
      <tr>
      <td align="center">
      [% IF $changeable %]
-       <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
-       <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
+       [% IF $datepaid %]
+         [% L.date_tag('datepaid_'_ i, $datepaid) %]
+       [% ELSE %]
+         [% L.date_tag('datepaid_'_ i, today) %]
+       [% END %]
      [% ELSE %]
        <input type="hidden" name="datepaid_[% i %]" value="[% $datepaid %]"> [% $datepaid %]
      [% END %]
@@ -66,26 +72,31 @@
      </td>
      <td align="center">
      [% IF $changeable %]
-       <input name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]">
+       <input name="paid_[% i %]" size="11" data-validate="number" class="numeric" value="[% LxERP.format_amount($paid, 2, 1) %]">
      [% ELSE %]
        <input type="hidden" name="paid_[% i %]" value="[% LxERP.format_amount($paid, 2, 1) %]">
        [% LxERP.format_amount($paid, 2, 1) %]
      [% END %]
      </td>
+     <td>
+       [% IF $changeable && loop.last && paid_missing > 0 %]
+         <input type='button' id='is_set_to_paid_missing' value='[% 'Set to paid missing' | $T8 %]'>
+       [% END %]
+     </td>
 
 [% IF show_exchangerate %]
      <td align="center">
   [% SET forex        = 'forex_'        _ i %]
   [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
-        [% LxERP.format_amount($forex, 2) %]
+  [% IF $forex %]
+        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
+        [% LxERP.format_amount($forex, 5) %]
   [% ELSE %]
      [% IF $changeable %]
-        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
+        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">
      [% ELSE %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
-        [% LxERP.format_amount($exchangerate, 2, 1) %]
+        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">
+        [% LxERP.format_amount($exchangerate, 5, 1) %]
      [% END %]
   [% END %]
         <input type="hidden" name="forex_[% i %]" value="[% $forex %]">
@@ -101,18 +112,6 @@
      </td>
 
     </tr>
-  [% IF $changeable %]
-    <tr style='display:none'>
-     <td>
-    <script type='text/javascript'>
-     Calendar.setup({ inputField : "datepaid_[% i %]", ifFormat :"[% myconfig_jsc_dateformat %]", align : "TR", button : "trigger_datepaid_[% i %]" });
-     $('input[name="paid_[% i %]"]').blur(function(){ check_right_number_format(this) });
-     $('#datepaid_[% i %]').blur(function(){ check_right_date_format(this) });
-    </script>
-     </td>
-    </tr>
-  [% END %]
-
 [% END # foreach %]
 
     <tr>
@@ -140,3 +139,6 @@
 
     </td>
   </tr>
+    <script type='text/javascript'>
+     $('#is_set_to_paid_missing').click(function(){ $('input[name^="paid_"]:last').val("[% LxERP.format_amount(paid_missing, 2) %]") });
+    </script>