X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fir%2F_payments.html;h=6726c8b1dce915df6b982e788febf9f24b7338cb;hb=d4925a8b60f04674885e30d9316dc0263f8b9a84;hp=179e65d5ecfd73104c176bb644423fb77075d809;hpb=2d3f862b7af94f31860dd264eef7c1bc7de7eae2;p=kivitendo-erp.git

diff --git a/templates/webpages/ir/_payments.html b/templates/webpages/ir/_payments.html
index 179e65d5e..6726c8b1d 100644
--- a/templates/webpages/ir/_payments.html
+++ b/templates/webpages/ir/_payments.html
@@ -1,22 +1,19 @@
 [%- USE T8 %]
 [%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
   <tr>
    <td>
     <table width="100%">
      <tr class="listheading">
-[% IF is_type_credit_note %]
       <th colspan="6" class="listheading">[% 'Payments' | $T8 %]</th>
-[% ELSE %]
-      <th colspan="6" class="listheading">[% 'Incoming Payments' | $T8 %]</th>
-[%- END %]
      </tr>
-
-
      <tr>
       <th>[% 'Date' | $T8 %]</th>
       <th>[% 'Source' | $T8 %]</th>
       <th>[% 'Memo' | $T8 %]</th>
       <th>[% 'Amount' | $T8 %]</th>
+      <th></th>
 [% IF show_exchangerate %]
       <th>[% 'Exch' | $T8 %]</th>
 [% END %]
@@ -25,42 +22,88 @@
 
 
 [% FOREACH i = paid_indices %]
+  [% SET changeable    = 'changeable_'    _ i %]
+  [% SET acc_trans_id  = 'acc_trans_id_'  _ i %]
+  [% SET p_gldate      = 'gldate_'        _ i %]
   [% SET datepaid      = 'datepaid_'      _ i %]
   [% SET source        = 'source_'        _ i %]
   [% SET memo          = 'memo_'          _ i %]
   [% SET paid          = 'paid_'          _ i %]
+  [% SET AP_paid       = 'AP_paid_'       _ i %]
   [% SET selectAP_paid_ref = 'selectAP_paid_' _ i %]
 
+     <input type=hidden name="acc_trans_id_[% i %]" value=[% $acc_trans_id %]>
+     <input type=hidden name="gldate_[% i %]" value=[% $p_gldate %]>
+
      <tr>
 
     <td align="center">
-      <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 $changeable %]
+      [% 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 %]
+     </td>
+     <td align=center>
+    [% IF $changeable %]
+       <input name="source_[% i %]" size="11" value="[% $source %]">
+    [% ELSE %]
+       <input type="hidden" name="source_[% i %]" value="[% $source %]">[% $source %]
+    [% END %]
+     </td>
+     <td align="center">
+    [% IF $changeable %]
+       <input name="memo_[% i %]" size="11" value="[% $memo %]">
+    [% ELSE %]
+       <input type="hidden" name="memo_[% i %]" value="[% $memo %]">[% $memo %]
+    [% END %]
+     </td>
+     <td align="center">
+    [% IF $changeable %]
+       <input name="paid_[% i %]" size="11" 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>
-     <td align=center><input name="source_[% i %]" size="11" value="[% $source %]"></td>
-     <td align="center"><input name="memo_[% i %]" size="11" value="[% $memo %]"></td>
-     <td align="center"><input name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]"></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(exchangerate, 2) %]
+  [% IF $forex %]
+        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
+        [% LxERP.format_amount($forex, 5) %]
   [% ELSE %]
-        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
+     [% IF $changeable %]
+        <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, 5, 1) %]">
+        [% LxERP.format_amount($exchangerate, 5, 1) %]
+     [% END %]
   [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
+        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">
      </td>
 [% END %]
-     <td align="center"><select name="AP_paid_[% i %]">[% $selectAP_paid_ref %]</select></td>
+
+     <td align="center">
+     [% IF $changeable %]
+       <select name="AP_paid_[% i %]">[% $selectAP_paid_ref %]</select>
+     [% ELSE %]
+       <input type="hidden" name="AP_paid_[% i %]" value="[% $AP_paid %]">[% $AP_paid %]
+     [% END %]
+     </td>
 
     </tr>
-    <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>
 
 [% END # foreach %]
 
@@ -68,7 +111,7 @@
       <td></td>
       <td></td>
       <td align="center">[% 'Total' | $T8 %]</td>
-      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
+      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
     </tr>
     <tr>
       <td></td>
@@ -86,3 +129,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>