X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/0c28bb82b805b07543debaf08061b58d0b437c07..a648b673fcb23982d6fecb0c0f97a40c0636a601:/templates/webpages/rp/report.html

diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index 649140a33..2e9775a96 100644
--- a/templates/webpages/rp/report.html
+++ b/templates/webpages/rp/report.html
@@ -9,7 +9,7 @@
   </tr>
   <tr>
     <th colspan=1>[% 'Year' | $T8 %]</th>
-    <td><input name=year size=11 title="[% 'YYYY' | $T8 %]" value="[% year %]"></td>
+    <td><input name=year size=11 title="[% 'YYYY' | $T8 %]" value="[% year %]" class="initial_focus"></td>
   </tr>
   <tr>
     <td align=right> <b>[% 'Yearly' | $T8 %]</b> </td>
@@ -62,11 +62,17 @@
   <tr>
     <th align=left>[% 'Method' | $T8 %]</th>
     <td colspan=3>
-      [% L.radio_button_tag('method', value='accrual', checked=accrual, label=LxERP.t8('Accrual')) %]
-      [% L.radio_button_tag('method', value='cash', checked=cash, label=LxERP.t8('cash')) %]
+      [% L.radio_button_tag('method', value='accrual', checked=(INSTANCE_CONF.get_accounting_method=='accrual'), label=LxERP.t8('Accrual')) %]
+      [% L.radio_button_tag('method', value='cash', checked=(INSTANCE_CONF.get_accounting_method=='cash'), label=LxERP.t8('cash')) %]
     </td>
   </tr>
 [%- END %]
+[%- BLOCK customer %]
+  <tr>
+    <th align=right nowrap>[% 'Customer' | $T8 %]</th>
+    <td colspan=3>[% L.customer_vendor_picker('customer_id', '', type='customer') %]</td>
+  </tr>
+[%- END %]
 [%- BLOCK projectnumber %]
   <tr>
     <th align=right nowrap>[% 'Project' | $T8 %]</th>
@@ -92,9 +98,9 @@
   [% INCLUDE projectnumber %]
   <input type=hidden name=nextsub value=generate_projects>
   <tr>
-    <th align=right>[% 'as at' | $T8 %]</th>
-    <td> [% L.date_tag('fromdate', fromdate) %]</td>
-    <th align=right nowrap>[% 'Compare to' | $T8 %]</th>
+    <th align=right>[% 'From' | $T8 %]</th>
+    <td> [% L.date_tag('fromdate', fromdate, class='initial_focus') %]</td>
+    <th align=right nowrap>[% 'Bis' | $T8 %]</th>
     <td>[% L.date_tag('todate') %]</td>
   </tr>
 </table>
@@ -136,9 +142,15 @@
   <input type=hidden name=nextsub value=generate_balance_sheet>
   <tr>
     <th align=right>[% 'as at' | $T8 %]</th>
-    <td> [% L.date_tag('asofdate', asofdate) %]</td>
+    <td> [% L.date_tag('asofdate', asofdate, class="initial_focus") %]</td>
+    <td><input name=l_cb class=checkbox type=checkbox value=Y>&nbsp;[% 'CB Transactions' | $T8 %]</td>
+    <td><input name=l_ob class=checkbox type=checkbox value=Y>&nbsp;[% 'only OB Transactions' | $T8 %]</td>
+  </tr>
+  </tr>
     <th align=right nowrap>[% 'Compare to' | $T8 %]</th>
     <td>[% L.date_tag('compareasofdate', compareasofdate) %]</td>
+    <td><input name=l_cb_compared class=checkbox type=checkbox value=Y>&nbsp;[% 'CB Transactions' | $T8 %]</td>
+    <td><input name=l_ob_compared class=checkbox type=checkbox value=Y>&nbsp;[% 'only OB Transactions' | $T8 %]</td>
   </tr>
   <tr>
     <th align=right>[% 'Decimalplaces' | $T8 %]</th>
@@ -153,14 +165,10 @@
     <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;[% 'Subtotal' | $T8 %]
     <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;[% 'Account Number' | $T8 %]</td>
   </tr>
-  <tr>
-    <th></th>
-    <td><input name=l_cb class=checkbox type=checkbox value=Y>&nbsp;[% 'CB Transactions' | $T8 %]
-    <input name=l_ob class=checkbox type=checkbox value=Y>&nbsp;[% 'only OB Transactions' | $T8 %]</td>
-  </tr>
 [%- END %]
 
 [%- IF is_trial_balance %]
+[%- PROCESS customer %]
 [%- PROCESS projectnumber %]
   <input type=hidden name=nextsub value=generate_trial_balance>
 </table>
@@ -188,7 +196,7 @@
     <td colspan=5><hr size=1 noshade></td>
   </tr>
   <tr>
-    <th align=left><input name=reporttype class=radio type=radio value="custom" checked><b>[% 'Reference day' | $T8 %]</b>&nbsp; </th>
+    <th align=left><input name=reporttype class=radio type=radio value="custom" checked><b>[% 'Reference day' | $T8 %]</b> ([% 'Due Date' | $T8 %][% ', if set' | $T8 %])</b>&nbsp; </th>
      <td align="right" colspan="4">[% 'Review of Aging list' | $T8 %] <select name="review_of_aging_list">
         <option></option>
         <option>0-30</option>
@@ -203,7 +211,7 @@
     <td colspan=5><hr size=3 noshade></td>
  </tr>
  <tr>
-    <th align=left><input name=reporttype class=radio type=radio value="free"><b>[% 'Free report period' | $T8 %]</b>&nbsp; </th>
+    <th align=left><input name=reporttype class=radio type=radio value="free"><b>[% 'Free report period' | $T8 %]</b> ([% 'Invoice Date' | $T8 %])&nbsp; </th>
     <td align="right" colspan=4>
       [% 'From' | $T8 %] [% L.date_tag('fromdate', fromdate) %]
       [% 'Bis' | $T8 %] [% L.date_tag('todate') %]
@@ -227,7 +235,7 @@
   </tr>
   <tr>
     <th align=right>[% 'Reference' | $T8 %]</th>
-    <td colspan=3><input name=reference></td>
+    <td colspan=3><input name=reference class="initial_focus"></td>
   </tr>
   <tr>
     <th align=right nowrap>[% 'Source' | $T8 %]</th>