X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Frp%2Freport.html;h=2e9775a969a37139cd4a07eeaba09f8c96cae473;hb=5fbbcc264d55bb7b7f9f66a431d87d95d5857093;hp=158c0cceb8dbe3ebcf87ccd30a64dac1632a2bfe;hpb=61771309437ef49d25e592ea84fc750ec6c2e790;p=kivitendo-erp.git
diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index 158c0cceb..2e9775a96 100644
--- a/templates/webpages/rp/report.html
+++ b/templates/webpages/rp/report.html
@@ -9,7 +9,7 @@
[% 'Year' | $T8 %] |
- |
+ |
[% 'Yearly' | $T8 %] |
@@ -62,11 +62,17 @@
[% '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 %] |
@@ -83,21 +89,18 @@
@@ -139,9 +142,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,14 +165,10 @@
[% 'Subtotal' | $T8 %]
[% 'Account Number' | $T8 %]
-
- |
- [% 'CB Transactions' | $T8 %]
- [% 'only OB Transactions' | $T8 %] |
-
[%- END %]
[%- IF is_trial_balance %]
+[%- PROCESS customer %]
[%- PROCESS projectnumber %]
@@ -182,23 +187,32 @@
[%- IF is_aging %]
- [% label %] |
+ [% label %] |
[% vc %] |
+
+
@@ -355,4 +323,3 @@
-