X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Frp%2Freport.html;h=b122652acc39d161c08fd60a5f7752d95f9b46c8;hb=11e509315cee0449974caa6d681fa26e730bbeca;hp=c4e8692c3d67a45e6dae4724dccb89c14890a0c0;hpb=781c16772f3c80cc827f11815bfb07b8318621f0;p=kivitendo-erp.git
diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index c4e8692c3..b122652ac 100644
--- a/templates/webpages/rp/report.html
+++ b/templates/webpages/rp/report.html
@@ -9,7 +9,9 @@
[% 'Year' | $T8 %] |
- |
+
+
+ |
[% 'Yearly' | $T8 %] |
@@ -17,32 +19,66 @@
[% 'Monthly' | $T8 %] |
- |
- 1. [% 'Quarter' | $T8 %] |
- [% 'January' | $T8 %] |
- [% 'May' | $T8 %] |
- [% 'September' | $T8 %] |
+
+
+ |
+
+ 1. [% 'Quarter' | $T8 %]
+ |
+
+ [% 'January' | $T8 %]
+ |
+
+ [% 'May' | $T8 %]
+ |
+
+ [% 'September' | $T8 %]
+ |
|
- 2. [% 'Quarter' | $T8 %] |
- [% 'February' | $T8 %] |
- [% 'June' | $T8 %] |
- [% 'October' | $T8 %] |
+
+ 2. [% 'Quarter' | $T8 %]
+ |
+
+ [% 'February' | $T8 %]
+ |
+
+ [% 'June' | $T8 %]
+ |
+
+ [% 'October' | $T8 %]
+ |
|
- 3. [% 'Quarter' | $T8 %] |
- [% 'March' | $T8 %] |
- [% 'July' | $T8 %] |
- [% 'November' | $T8 %] |
+
+ 3. [% 'Quarter' | $T8 %]
+ |
+
+ [% 'March' | $T8 %]
+ |
+
+ [% 'July' | $T8 %]
+ |
+
+ [% 'November' | $T8 %]
+ |
|
- 4. [% 'Quarter' | $T8 %] |
- [% 'April' | $T8 %] |
- [% 'August' | $T8 %] |
- [% 'December' | $T8 %] |
+
+ 4. [% 'Quarter' | $T8 %]
+ |
+
+ [% 'April' | $T8 %]
+ |
+
+ [% 'August' | $T8 %]
+ |
+
+ [% 'December' | $T8 %]
+ |
|
@@ -51,7 +87,7 @@
[% 'Free report period' | $T8 %] |
[% 'From' | $T8 %] [% L.date_tag('fromdate', fromdate) %]
- [% 'Bis' | $T8 %] [% L.date_tag('todate') %]
+ [% 'Bis' | $T8 %] [% L.date_tag('todate', todate) %]
|
@@ -62,15 +98,21 @@
[% 'Method' | $T8 %] |
- [% 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')) %]
|
[%- END %]
+[%- BLOCK customer %]
+
+ [% 'Customer' | $T8 %] |
+ [% L.customer_vendor_picker('customer_id', '', type='customer') %] |
+
+[%- END %]
[%- BLOCK projectnumber %]
[% 'Project' | $T8 %] |
- [% L.select_tag('project_id', ALL_PROJECTS, title_key = 'projectnumber', with_empty = 1) %] |
+ [% L.project_picker('project_id', '') %] |
[%- END %]
@@ -89,15 +131,12 @@
[%- END %]
[%- IF is_projects %]
-
- [% 'Project' | $T8 %] |
-
- |
+ [% INCLUDE projectnumber %]
- [% 'as at' | $T8 %] |
- [% L.date_tag('fromdate', fromdate) %] |
- [% 'Compare to' | $T8 %] |
+ [% 'From' | $T8 %] |
+ [% L.date_tag('fromdate', fromdate, class='initial_focus') %] |
+ [% 'Bis' | $T8 %] |
[% L.date_tag('todate') %] |
@@ -122,6 +161,7 @@
[%- END %]
+
[%- IF is_bwa %]
[%- PROCESS projectnumber %]
@@ -135,13 +175,28 @@
[%- END %]
+
+[%- IF is_erfolgsrechnung %]
+
+
+
@@ -191,7 +242,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 +281,7 @@
|
[% 'Reference' | $T8 %] |
- |
+ |
[% 'Source' | $T8 %] |
@@ -311,52 +362,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 %]
@@ -365,3 +370,32 @@
+
+