X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/dc7791df0d3e919e691fb3fd3d7ee20e3c5e7ca1..335fc788611b85c4879e701fba2892ec1ed2c8dd:/templates/webpages/rp/report.html diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html index d99d45897..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('EUR')) %] + [% 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 %] @@ -74,7 +80,6 @@ [%- END %] -

[% title %]

@@ -84,21 +89,18 @@ [%- IF selectdepartment %] - + [%- END %] [%- IF is_projects %] - - - + [% INCLUDE projectnumber %] - - - + + +
[% 'Department' | $T8 %][% 'Department' | $T8 %]
[% 'Project' | $T8 %] -
[% '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') %]
@@ -140,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 %] @@ -157,14 +165,10 @@  [% 'Subtotal' | $T8 %]  [% 'Account Number' | $T8 %] - - -  [% 'CB Transactions' | $T8 %] -  [% 'only OB Transactions' | $T8 %] - [%- END %] [%- IF is_trial_balance %] +[%- PROCESS customer %] [%- PROCESS projectnumber %] @@ -183,23 +187,32 @@ [%- IF is_aging %] - [% label %] + [% label %] [% vc %] + + - - + + + + - + + + + @@ -222,7 +235,7 @@ - + @@ -303,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 %]
-
@@ -356,6 +323,3 @@
- - -