X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Frp%2Freport.html;h=39931075a702973bd2448300b586e9a5e00a2969;hb=fa7fc7eeb3ca718914affee06c0629a08d571288;hp=934bf8912b0b233ae95f4a6007e798c6f45e9e03;hpb=b0f652b639cd4d363235e8f9b53e14efc5085e1a;p=kivitendo-erp.git diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html index 934bf8912..39931075a 100644 --- a/templates/webpages/rp/report.html +++ b/templates/webpages/rp/report.html @@ -9,7 +9,7 @@ [% 'Year' | $T8 %] - + [% 'Yearly' | $T8 %] @@ -60,21 +60,26 @@ [%- END %] [%- BLOCK cash_or_accrual %] - [% 'Method' | $T8 %] + [% '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('EUR')) %] + [% L.radio_button_tag('method', value='cash', checked=cash, label=LxERP.t8('cash')) %] [%- END %] +[%- BLOCK customer %] + + [% 'Customer' | $T8 %] + [% L.customer_picker('customer_id') %] + +[%- END %] [%- BLOCK projectnumber %] [% 'Project' | $T8 %] - [% L.select_tag('project_id', L.options_for_select(ALL_PROJECTS, title='projectnumber', with_empty=1)) %] + [% L.select_tag('project_id', ALL_PROJECTS, title_key = 'projectnumber', with_empty = 1) %] [%- END %] -

[% title %]

@@ -84,20 +89,17 @@ [%- IF selectdepartment %] - + [%- END %] [%- IF is_projects %] - - - + [% INCLUDE projectnumber %] - + @@ -117,6 +119,10 @@
[% 'Department' | $T8 %][% 'Department' | $T8 %]
[% 'Project' | $T8 %] -
[% 'as at' | $T8 %] [% L.date_tag('fromdate', fromdate) %] [% L.date_tag('fromdate', fromdate, class='initial_focus') %] [% 'Compare to' | $T8 %] [% L.date_tag('todate') %]
[%- PROCESS customized_report %] [%- PROCESS cash_or_accrual %] + + + + [%- END %] [%- IF is_bwa %] @@ -136,9 +142,15 @@ - + + + + + + + @@ -156,6 +168,7 @@ [%- END %] [%- IF is_trial_balance %] +[%- PROCESS customer %] [%- PROCESS projectnumber %]
[% 'Include in Report' | $T8 %] [% 'CB Transactions' | $T8 %]
[% '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 %]
@@ -174,23 +187,32 @@ [%- IF is_aging %] - [% label %] + [% label %] [% vc %] + + + + + - - + - + + + + @@ -213,7 +235,7 @@ - + @@ -294,52 +316,6 @@ [%- END %] - -[%- IF 0 # is_nontaxable %] - - - - - - - - - - - - -[%- PROCESS cash_or_accrual %] - - - - -[%- END %]
[% 'Review of Aging list' | $T8 %][% 'Reference day' | $T8 %] ([% 'Due Date' | $T8 %][% ', if set' | $T8 %])  [% 'Review of Aging list' | $T8 %] + [% 'for date' | $T8 %] [% L.date_tag('fordate', today) %]
+
[% 'Free report period' | $T8 %] ([% 'Invoice Date' | $T8 %])  [% 'From' | $T8 %] [% L.date_tag('fromdate', fromdate) %] [% 'Bis' | $T8 %] [% L.date_tag('todate') %]
[% 'Reference' | $T8 %]
[% 'Source' | $T8 %]
[% 'From' | $T8 %][% L.date_tag('fromdate', fromdate) %][% 'Bis' | $T8 %][% L.date_tag('todate', todate) %]
[% 'Include in Report' | $T8 %] - - - - - - - - - - - - - - - - - - - - - -
[% 'ID' | $T8 %][% 'Invoice' | $T8 %][% 'Date' | $T8 %]
- [% LxERP.t8('Customer') IF db == 'ar' %] - [% LxERP.t8('Vendor') IF db == 'ap' %] - [% 'Amount' | $T8 %][% 'Total' | $T8 %]
[% 'Subtotal' | $T8 %]
-
@@ -347,6 +323,3 @@
- - -