date error in mapping

[mfinanz.git] / templates / webpages / is / _payments.html

diff --git a/templates/webpages/is/_payments.html b/templates/webpages/is/_payments.html
index 93a0fb879775c36ac23aa81d4b23fe320f2d8e93..4c9cca6624d57ced4fde15c65e761106c667c636 100644 (file)
--- a/templates/webpages/is/_payments.html
+++ b/templates/webpages/is/_payments.html
@@ -88,9 +88,13 @@
      <td align="center">
   [% SET forex        = 'forex_'        _ i %]
   [% SET exchangerate = 'exchangerate_' _ i %]
      <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, 5) %]">
   [% IF $forex %]
         <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">

-        [% LxERP.format_amount($forex, 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, 5, 1) %]">
   [% ELSE %]
      [% IF $changeable %]
         <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">


@@ -118,13 +122,17 @@
       <td></td>
       <td></td>
       <td align="center">[%- 'Total' | $T8 %]</td>
       <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>
     </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>
     </tr>
     <tr style='display:none'>
      <td>


@@ -140,5 +148,5 @@
     </td>
   </tr>
     <script type='text/javascript'>
     </td>
   </tr>
     <script type='text/javascript'>

-     $('#is_set_to_paid_missing').click(function(){ $('input[name^="paid_"]:last').val('[% LxERP.format_amount(paid_missing, 2) %]') });
+     $('#is_set_to_paid_missing').click(function(){ $('input[name^="paid_"]:last').val("[% LxERP.format_amount(paid_missing, 2) %]") });

     </script>
     </script>