X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Frp%2Freport.html;h=daeaf46c9cf9c0bd58e36d687fd445babf148494;hb=6c9c012e74984b7992fc4bad93c58960744f16d2;hp=c4e8692c3d67a45e6dae4724dccb89c14890a0c0;hpb=781c16772f3c80cc827f11815bfb07b8318621f0;p=kivitendo-erp.git

diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index c4e8692c3..daeaf46c9 100644
--- a/templates/webpages/rp/report.html
+++ b/templates/webpages/rp/report.html
@@ -89,10 +89,7 @@
 [%- END %]
 
 [%- IF is_projects %]
-  <tr>
-    <th align=right nowrap>[% 'Project' | $T8 %]</th>
-    <td colspan=5><input name=projectnumber size=25</td>
-  </tr>
+  [% INCLUDE projectnumber %]
   <input type=hidden name=nextsub value=generate_projects>
   <tr>
     <th align=right>[% 'as at' | $T8 %]</th>
@@ -140,8 +137,14 @@
   <tr>
     <th align=right>[% 'as at' | $T8 %]</th>
     <td> [% L.date_tag('asofdate', asofdate) %]</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>
@@ -156,11 +159,6 @@
     <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 %]
@@ -191,7 +189,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>
@@ -206,7 +204,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') %]
@@ -311,52 +309,6 @@
     </td>
   </tr>
 [%- END %]
-
-[%- IF 0 # is_nontaxable %]
-  <input type=hidden name=nextsub value=generate_tax_report>
-
-  <input type=hidden name=db value=[% db %]>
-  <input type=hidden name=sort value=transdate>
-  <input type=hidden name=report value='[% report %]'>
-
-  <tr>
-    <th align=right>[% 'From' | $T8 %]</th>
-    <td>[% L.date_tag('fromdate', fromdate) %]</td>
-    <th align=right>[% 'Bis' | $T8 %]</th>
-    <td>[% L.date_tag('todate', todate) %]</td>
-  </tr>
-[%- PROCESS cash_or_accrual %]
-  <tr>
-    <th align=right>[% 'Include in Report' | $T8 %]</th>
-    <td colspan=3>
-      <table>
-        <tr>
-          <td><input name="l_id" class=checkbox type=checkbox value=Y></td>
-          <td>[% 'ID' | $T8 %]</td>
-          <td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-          <td>[% 'Invoice' | $T8 %]</td>
-          <td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-          <td>[% 'Date' | $T8 %]</td>
-        </tr>
-        <tr>
-          <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-          <td>
-            [% LxERP.t8('Customer') IF db == 'ar' %]
-            [% LxERP.t8('Vendor')   IF db == 'ap' %]
-       </td>
-          <td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></td>
-          <td>[% 'Amount' | $T8 %]</td>
-          <td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
-          <td>[% 'Total' | $T8 %]</td>
-        </tr>
-        <tr>
-          <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-          <td>[% 'Subtotal' | $T8 %]</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-[%- END %]
 </table>
 
 <hr size=3 noshade>
@@ -364,4 +316,3 @@
 <input type=submit class=submit name=action value="[% 'Continue' | $T8 %]">
 
 </form>
-