X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Frp%2Freport.html;h=f28684c5bef4d4b0c8632aa762d0e8fc8f25f05c;hb=4d20057d671c35239bf95af4221b2987e3fdc064;hp=1eb5e48d15c2dfc04e417408366f855d68acbb0d;hpb=e3f8237101c331c52098cf6f7db86e1db2a2b36a;p=kivitendo-erp.git

diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index 1eb5e48d1..f28684c5b 100644
--- a/templates/webpages/rp/report.html
+++ b/templates/webpages/rp/report.html
@@ -1,6 +1,7 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+[%- USE P %]
 [%- USE T8 %]
 
 [%- BLOCK customized_report %]
@@ -20,12 +21,12 @@
   </tr>
   <tr>
     <td align=right>&nbsp;
-      <input name=duetyp class=radio type=radio value="13" onchange='set_from_to(this.value, year.value)'>
+      <input name=duetyp class=radio type=radio value="13" checked onchange='set_from_to(this.value, year.value)'>
     </td>
     <td><input name=duetyp class=radio type=radio value="A" onchange='set_from_to(this.value, year.value)'>
       &nbsp;1. [% 'Quarter' | $T8 %]
     </td>
-    <td><input name=duetyp class=radio type=radio value="1" checked onchange='set_from_to(this.value, year.value)'>
+    <td><input name=duetyp class=radio type=radio value="1" onchange='set_from_to(this.value, year.value)'>
       &nbsp;[% 'January' | $T8 %]
     </td>
     <td><input name=duetyp class=radio type=radio value="5" onchange='set_from_to(this.value, year.value)'>
@@ -106,19 +107,19 @@
 [%- BLOCK customer %]
   <tr>
     <th align=right nowrap>[% 'Customer' | $T8 %]</th>
-    <td colspan=3>[% L.customer_vendor_picker('customer_id', '', type='customer') %]</td>
+    <td colspan=3>[% P.customer_vendor.picker('customer_id', '', type='customer') %]</td>
   </tr>
 [%- END %]
 [%- BLOCK projectnumber %]
   <tr>
     <th align=right nowrap>[% 'Project' | $T8 %]</th>
-    <td colspan=3>[% L.select_tag('project_id', ALL_PROJECTS, title_key = 'projectnumber', with_empty = 1) %]</td>
+    <td colspan=3>[% P.project.picker('project_id', '') %]</td>
   </tr>
 [%- END %]
 
 <h1>[% title %]</h1>
 
-<form method=post action='[% script %]'>
+<form method='post' action='[% script %]' id='form'>
 
 <input type=hidden name=title value="[% title %]">
 
@@ -264,7 +265,7 @@
     </td>
   </tr>
   <input type=hidden name=type value=statement>
-  <input type=hidden name=format value=html>
+  [% L.hidden_tag("format", format) %]
   <input type=hidden name=media value=screen>
 
   <input type=hidden name=nextsub value='[% nextsub %]'>
@@ -363,98 +364,33 @@
   </tr>
 [%- END %]
 </table>
-
-<hr size=3 noshade>
-<br>
-<input type=submit class=submit name=action value="[% 'Continue' | $T8 %]">
-
 </form>
 
 <script type="text/javascript">
-function format_date(yy, mm, dd) {
-  var format = "[% dateformat %]";
-  format = format.replace("yyyy", "yy");
-  format = format.replace("yy", yy);
-  format = format.replace("mm", mm);
-  format = format.replace("dd", dd);
-  return format;
-}
 function set_from_to(duetyp, year) {
-  switch(duetyp) {
-    case '1':
-      document.getElementById('fromdate').value=format_date(year, '01', '01');
-      document.getElementById('todate').value=format_date(year, '01', '31');
-    break;
-    case '2':
-      document.getElementById('fromdate').value=format_date(year, '02', '01');
-      if(year % 4) document.getElementById('todate').value=format_date(year, '02', '28');
-      else document.getElementById('todate').value=format_date(year, '2', '29');
-    break;
-    case '3':
-      document.getElementById('fromdate').value=format_date(year, '03', '01');
-      document.getElementById('todate').value=format_date(year, '03', '31');
-    break;
-    case '4':
-      document.getElementById('fromdate').value=format_date(year, '04', '01');
-      document.getElementById('todate').value=format_date(year, '04', '30');
-    break;
-    case '5':
-      document.getElementById('fromdate').value=format_date(year, '05', '01');
-      document.getElementById('todate').value=format_date(year, '05', '31');
-    break;
-    case '6':
-      document.getElementById('fromdate').value=format_date(year, '06', '01');
-      document.getElementById('todate').value=format_date(year, '06', '30');
-    break;
-    case '7':
-      document.getElementById('fromdate').value=format_date(year, '07', '01');
-      document.getElementById('todate').value=format_date(year, '07', '31');
-    break;
-    case '8':
-      document.getElementById('fromdate').value=format_date(year, '08', '01');
-      document.getElementById('todate').value=format_date(year, '08', '31');
-    break;
-    case '9':
-      document.getElementById('fromdate').value=format_date(year, '09', '01');
-      document.getElementById('todate').value=format_date(year, '09', '30');
-    break;
-    case '10':
-      document.getElementById('fromdate').value=format_date(year, '10', '01');
-      document.getElementById('todate').value=format_date(year, '10', '31');
-    break;
-    case '11':
-      document.getElementById('fromdate').value=format_date(year, '11', '01');
-      document.getElementById('todate').value=format_date(year, '11', '30');
-    break;
-    case '12':
-      document.getElementById('fromdate').value=format_date(year, '12', '01');
-      document.getElementById('todate').value=format_date(year, '12', '31');
-    break;
-    case '13':
-      document.getElementById('fromdate').value=format_date(year, '01', '01');
-      document.getElementById('todate').value=format_date(year, '12', '31');
-    break;
-    case 'A':
-      document.getElementById('fromdate').value=format_date(year, '01', '01');
-      document.getElementById('todate').value=format_date(year, '03', '31');
-    break;
-    case 'B':
-      document.getElementById('fromdate').value=format_date(year, '04', '01');
-      document.getElementById('todate').value=format_date(year, '06', '30');
-    break;
-    case 'C':
-      document.getElementById('fromdate').value=format_date(year, '07', '01');
-      document.getElementById('todate').value=format_date(year, '09', '31');
-    break;
-    case 'D':
-      document.getElementById('fromdate').value=format_date(year, '10', '01');
-      document.getElementById('todate').value=format_date(year, '12', '31');
-    break;
-    default:
-      document.getElementById('fromdate').value=format_date(year, '01', '01');
-      document.getElementById('todate').value=format_date(year, '12', '31');
-  }
+  var date = {
+    1:  [ 1,  1, 1,  31 ],
+    2:  [ 2,  1, 2,  new Date(year, 1, 29).getMonth() == 1 ? 29 : 28 ],
+    3:  [ 3,  1, 3,  31 ],
+    4:  [ 4,  1, 4,  30 ],
+    5:  [ 5,  1, 5,  31 ],
+    6:  [ 6,  1, 6,  30 ],
+    7:  [ 7,  1, 7,  31 ],
+    8:  [ 8,  1, 8,  31 ],
+    9:  [ 9,  1, 9,  30 ],
+    10: [ 10, 1, 10, 31 ],
+    11: [ 11, 1, 11, 30 ],
+    12: [ 12, 1, 12, 31 ],
+    13: [  1, 1, 12, 31 ],
+    'A': [ 1,  1, 3,  31 ],
+    'B': [ 4,  1, 6,  30 ],
+    'C': [ 7,  1, 9,  30 ],
+    'D': [ 10, 1, 12, 31 ]
+  }[duetyp];
+
+  $('#fromdate').val(kivi.format_date(new Date(year, date[0]-1, date[1])));
+  $('#todate').val(kivi.format_date(new Date(year, date[2]-1, date[3])));
+
   return true;
 }
 </script>
-