X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Frp%2Freport.html;h=08eacfd748d119249e2e1f4a3dac534db392e850;hb=42ca4b6790baf76f507cc3675f4a171223cfde4c;hp=c4e8692c3d67a45e6dae4724dccb89c14890a0c0;hpb=781c16772f3c80cc827f11815bfb07b8318621f0;p=kivitendo-erp.git
diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index c4e8692c3..08eacfd74 100644
--- a/templates/webpages/rp/report.html
+++ b/templates/webpages/rp/report.html
@@ -9,7 +9,7 @@
[% 'Year' | $T8 %] |
- |
+ |
[% 'Yearly' | $T8 %] |
@@ -89,14 +89,11 @@
[%- END %]
[%- IF is_projects %]
-
- [% 'Project' | $T8 %] |
-
- |
+ [% INCLUDE projectnumber %]
[% 'as at' | $T8 %] |
- [% L.date_tag('fromdate', fromdate) %] |
+ [% L.date_tag('fromdate', fromdate, class='initial_focus') %] |
[% 'Compare to' | $T8 %] |
[% L.date_tag('todate') %] |
@@ -139,9 +136,15 @@
[% 'as at' | $T8 %] |
- [% L.date_tag('asofdate', asofdate) %] |
+ [% L.date_tag('asofdate', asofdate, class="initial_focus") %] |
+ [% 'CB Transactions' | $T8 %] |
+ [% 'only OB Transactions' | $T8 %] |
+
+
[% 'Compare to' | $T8 %] |
[% L.date_tag('compareasofdate', compareasofdate) %] |
+ [% 'CB Transactions' | $T8 %] |
+ [% 'only OB Transactions' | $T8 %] |
[% 'Decimalplaces' | $T8 %] |
@@ -156,11 +159,6 @@
[% 'Subtotal' | $T8 %]
[% 'Account Number' | $T8 %]
-
- |
- [% 'CB Transactions' | $T8 %]
- [% 'only OB Transactions' | $T8 %] |
-
[%- END %]
[%- IF is_trial_balance %]
@@ -191,7 +189,7 @@
|
- [% 'Reference day' | $T8 %] |
+ [% 'Reference day' | $T8 %] ([% 'Due Date' | $T8 %][% ', if set' | $T8 %]) |
[% 'Review of Aging list' | $T8 %] |
- [% 'Free report period' | $T8 %] |
+ [% 'Free report period' | $T8 %] ([% 'Invoice Date' | $T8 %]) |
[% 'From' | $T8 %] [% L.date_tag('fromdate', fromdate) %]
[% 'Bis' | $T8 %] [% L.date_tag('todate') %]
@@ -230,7 +228,7 @@
|
[% 'Reference' | $T8 %] |
- |
+ |
[% 'Source' | $T8 %] |
@@ -311,52 +309,6 @@
[%- END %]
-
-[%- IF 0 # is_nontaxable %]
-
-
-
-
-
-
-
- [% 'From' | $T8 %] |
- [% L.date_tag('fromdate', fromdate) %] |
- [% 'Bis' | $T8 %] |
- [% L.date_tag('todate', todate) %] |
-
-[%- PROCESS cash_or_accrual %]
-
- [% 'Include in Report' | $T8 %] |
-
-
- |
-
-[%- END %]
@@ -364,4 +316,3 @@
-