X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Frp%2Freport.html;h=f28684c5bef4d4b0c8632aa762d0e8fc8f25f05c;hb=d210aa27e9d5a711417b2bef939e15bd42957743;hp=39931075a702973bd2448300b586e9a5e00a2969;hpb=5e2cb6ed074776434a00757503b29224e489804b;p=kivitendo-erp.git
diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index 39931075a..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 %]
@@ -9,7 +10,9 @@
[% 'Year' | $T8 %]
-
+
+
+
[% 'Yearly' | $T8 %]
@@ -17,32 +20,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 +88,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,27 +99,27 @@
[% '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_picker('customer_id') %]
+ [% P.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) %]
+ [% P.project.picker('project_id', '') %]
[%- END %]
[% title %]
-
-
-
-
+