X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/175dd1fb247e46407ebc773b8103fc773a806fdf..HEAD:/templates/webpages/is/_payments.html?ds=sidebyside

diff --git a/templates/webpages/is/_payments.html b/templates/webpages/is/_payments.html
index 41b018615..4c9cca662 100644
--- a/templates/webpages/is/_payments.html
+++ b/templates/webpages/is/_payments.html
@@ -18,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 %]
@@ -45,7 +46,11 @@
      <tr>
      <td align="center">
      [% IF $changeable %]
-       [% L.date_tag('datepaid_'_ i, $datepaid) %]
+       [% 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 %]
@@ -67,26 +72,35 @@
      </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 %]
+  [% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
+  [% SET record_forex = 'record_forex_' _ i %]
   [% IF $forex %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
-        [% LxERP.format_amount($forex, 2) %]
+        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
+        <input type="hidden" name="fx_transaction_[% i %]" value="1">
+          [% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($defaultcurrency_paid, 5) %] [% defaultcurrency %] </br>
+          [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
   [% 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 %]">
@@ -102,30 +116,23 @@
      </td>
 
     </tr>
-  [% IF $changeable %]
-    <tr style='display:none'>
-     <td>
-    <script type='text/javascript'>
-     $('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>
       <td></td>
       <td></td>
       <td align="center">[%- 'Total' | $T8 %]</td>
-      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
+      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
+      <td></td>
+      [% IF show_exchangerate %]
+        <td align="center">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
+      [% END %]
     </tr>
     <tr>
       <td></td>
       <td></td>
       <td align="center">[%- 'Missing amount' | $T8 %]</td>
-      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
+      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
     </tr>
     <tr style='display:none'>
      <td>
@@ -140,3 +147,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>