]> wagnertech.de Git - kivitendo-erp.git/commitdiff
projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7130d91)
is form_footer: Fixes, Hooks und hiddens.
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 27 Oct 2009 12:22:13 +0000 (13:22 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 29 Oct 2009 14:06:33 +0000 (15:06 +0100)
bin/mozilla/is.pl patch | blob | history
templates/webpages/is/_payments_de.html patch | blob | history
templates/webpages/is/_payments_master.html patch | blob | history

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 5dc3b1a1f8e4b74e9e85cc9d7ea87eb75a936e5d..5708ac40772ec868c941e57a557ca15f422ebf50 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -437,14 +437,8 @@ sub form_footer {
 
     # format amounts
     $totalpaid += $form->{"paid_$i"};
 
     # format amounts
     $totalpaid += $form->{"paid_$i"};
-    if ($form->{"paid_$i"}) {
-      $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
-    }
-    $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
-    $form->{"exchangerate_$i"} ||= "";
   }
 
   }
 
-
   $form->{print_options} = print_options(inline => 1);
 
   print $form->parse_html_template('is/form_footer');
   $form->{print_options} = print_options(inline => 1);
 
   print $form->parse_html_template('is/form_footer');
diff --git a/templates/webpages/is/_payments_de.html b/templates/webpages/is/_payments_de.html
index 048569fd828277ea57ca192dd3ac9238000e5641..0c5b764dd1b32d5e524990f944f0f41b0a04f59f 100644 (file)
--- a/templates/webpages/is/_payments_de.html
+++ b/templates/webpages/is/_payments_de.html
@@ -23,41 +23,44 @@
      </tr>
 
 
      </tr>
 
 
-[% paidaccounts %]
-
 [% FOREACH i = paid_indices %]
 [% FOREACH i = paid_indices %]
-[% SET row = {} %]
-  [% SET row.datepaid    = 'datepaid_'    _ i %]
-  [% SET row.source      = 'source_'      _ i %]
-  [% SET row.memo        = 'memo_'        _ i %]
-  [% SET row.paid        = 'paid_'        _ i %]
+  [% SET datepaid      = 'datepaid_'      _ i %]
+  [% SET source        = 'source_'        _ i %]
+  [% SET memo          = 'memo_'          _ i %]
+  [% SET paid          = 'paid_'          _ i %]
+  [% SET selectAR_paid_ref = 'selectAR_paid_' _ i %]
 
      <tr>
 
     <td align="center">
 
      <tr>
 
     <td align="center">
-      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="$myconfig{dateformat}" value="[% row.datepaid %]" onBlur=\"check_right_date_format(this)\">
+      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
       <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
      </td>
       <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
      </td>
-     <td align=center><input name="source_[% i %]" size="11" value="[% row.source %]"></td>|;
-     <td align="center"><input name="memo_[% i %]" size="11" value="[% row.memo %]"></td>|;
-     <td align="center"><input name="paid_[% i %]" size="11" value="[% row.paid %]" onBlur=\"check_right_number_format(this)\"></td>|;
-     <td align="center">
+     <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 %]
 [% IF show_exchangerate %]
+     <td align="center">
   [% SET row.forex        = 'forex_'        _ i %]
   [% SET row.exchangerate = 'exchangerate_' _ i %]
   [% IF row.forex %]
   [% SET row.forex        = 'forex_'        _ i %]
   [% SET row.exchangerate = 'exchangerate_' _ i %]
   [% IF row.forex %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% row.exchangerate %]">
-        [% row.exchangerate | html %]
+        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
+        [% LxERP.format_amount(row.exchangerate, 2) %]
   [% ELSE %]
   [% ELSE %]
-        <input name="exchangerate_[% i %]" size="10" value="[% row.exchangerate %]">
+        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
   [% END %]
   [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% row.forex %]">;
-[% END %]
+        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
      </td>
      </td>
-     <td align="center"><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
+[% END %]
+     <td align="center"><select name="AR_paid_$i">[% $selectAR_paid_ref %]</select></td>
 
     </tr>
 [%#     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); %]
 
     </tr>
 [%#     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); %]
+    <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 %]
 
 
 [% END # foreach %]
 
@@ -74,11 +77,11 @@
       <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
     </tr>
 
       <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
     </tr>
 
-  <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
-  <input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
-  <input type="hidden" name="oldinvtotal" value="[% rowcount %]">
+     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
+     <input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
+     <input type="hidden" name="oldinvtotal" value="[% rowcount %]">
 
 
-  <input type="hidden" name="oldtotalpaid" value="$totalpaid">
+     <input type="hidden" name="oldtotalpaid" value="$totalpaid">
     </table>
 
     </td>
     </table>
 
     </td>
diff --git a/templates/webpages/is/_payments_master.html b/templates/webpages/is/_payments_master.html
index 0549e28059530941f865b37f901428c0d688961e..ff60265ccecf65d5079a49ce9c9d8da246d093f4 100644 (file)
--- a/templates/webpages/is/_payments_master.html
+++ b/templates/webpages/is/_payments_master.html
@@ -23,41 +23,44 @@
      </tr>
 
 
      </tr>
 
 
-[% paidaccounts %]
-
 [% FOREACH i = paid_indices %]
 [% FOREACH i = paid_indices %]
-[% SET row = {} %]
-  [% SET row.datepaid    = 'datepaid_'    _ i %]
-  [% SET row.source      = 'source_'      _ i %]
-  [% SET row.memo        = 'memo_'        _ i %]
-  [% SET row.paid        = 'paid_'        _ i %]
+  [% SET datepaid      = 'datepaid_'      _ i %]
+  [% SET source        = 'source_'        _ i %]
+  [% SET memo          = 'memo_'          _ i %]
+  [% SET paid          = 'paid_'          _ i %]
+  [% SET selectAR_paid_ref = 'selectAR_paid_' _ i %]
 
      <tr>
 
     <td align="center">
 
      <tr>
 
     <td align="center">
-      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="$myconfig{dateformat}" value="[% row.datepaid %]" onBlur=\"check_right_date_format(this)\">
+      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
       <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
      </td>
       <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
      </td>
-     <td align=center><input name="source_[% i %]" size="11" value="[% row.source %]"></td>|;
-     <td align="center"><input name="memo_[% i %]" size="11" value="[% row.memo %]"></td>|;
-     <td align="center"><input name="paid_[% i %]" size="11" value="[% row.paid %]" onBlur=\"check_right_number_format(this)\"></td>|;
-     <td align="center">
+     <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 %]
 [% IF show_exchangerate %]
+     <td align="center">
   [% SET row.forex        = 'forex_'        _ i %]
   [% SET row.exchangerate = 'exchangerate_' _ i %]
   [% IF row.forex %]
   [% SET row.forex        = 'forex_'        _ i %]
   [% SET row.exchangerate = 'exchangerate_' _ i %]
   [% IF row.forex %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% row.exchangerate %]">
-        [% row.exchangerate | html %]
+        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
+        [% LxERP.format_amount(row.exchangerate, 2) %]
   [% ELSE %]
   [% ELSE %]
-        <input name="exchangerate_[% i %]" size="10" value="[% row.exchangerate %]">
+        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
   [% END %]
   [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% row.forex %]">;
-[% END %]
+        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
      </td>
      </td>
-     <td align="center"><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
+[% END %]
+     <td align="center"><select name="AR_paid_$i">[% $selectAR_paid_ref %]</select></td>
 
     </tr>
 [%#     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); %]
 
     </tr>
 [%#     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); %]
+    <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 %]
 
 
 [% END # foreach %]
 
@@ -74,11 +77,11 @@
       <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
     </tr>
 
       <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
     </tr>
 
-  <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
-  <input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
-  <input type="hidden" name="oldinvtotal" value="[% rowcount %]">
+     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
+     <input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
+     <input type="hidden" name="oldinvtotal" value="[% rowcount %]">
 
 
-  <input type="hidden" name="oldtotalpaid" value="$totalpaid">
+     <input type="hidden" name="oldtotalpaid" value="$totalpaid">
     </table>
 
     </td>
     </table>
 
     </td>
Unnamed repository; edit this file 'description' to name the repository.