Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / templates / webpages / dbupgrade / steuerfilterung.html

diff --git a/templates/webpages/dbupgrade/steuerfilterung.html b/templates/webpages/dbupgrade/steuerfilterung.html
index da4ebf0..8c2a2ef 100644 (file)
--- a/templates/webpages/dbupgrade/steuerfilterung.html
+++ b/templates/webpages/dbupgrade/steuerfilterung.html
@@ -1,18 +1,17 @@
-
 [% USE T8 %]
 [% USE HTML %]
 [% USE L %]
-<div class="listtop">[% 'New filter for tax accounts' | $T8 %]</div>
+<h1>[% 'New filter for tax accounts' | $T8 %]</h1>
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
-<input type="hidden" name="continued" value="1">
+<input type="hidden" name="continued_tax" value="1">
 
 <p>[% 'From this version on a new feature is available.' | $T8 %]</p>
 <p>[% 'You can choose account categories for taxes. Depending on these categories taxes will be displayed for transfers in the general ledger or not.' | $T8 %]</p>
 <p>[% 'If you have not chosen for example the category revenue for a tax and you choose an revenue account to create a transfer in the general ledger, this tax will not be displayed in the tax dropdown.' | $T8 %]</p>
 <p>[% 'This feature especially prevents mistakes by mixing up prior tax and sales tax.' | $T8 %]</p>
-<p>[% 'Please choose for which categories the taxes should be displayed:' | $T8 %]</p>
+<p>[% 'Please choose for which categories the taxes should be displayed (otherwise remove the ticks):' | $T8 %]</p>
 <table>
   <tr>
     <th class="listheading">[% 'Taxkey' | $T8 %]</th>
@@ -31,41 +30,12 @@
     <td align="right">[% HTML.escape(row.taxkey) %]</td>
     <td align="left"> [% HTML.escape(row.taxdescription) %]</a></td>
     <td align="right">[% HTML.escape(row.rate) %] %</td>
-    <td align="center">[% IF row.taxkey == 0 or row.taxkey == 1 %]
-                     [% L.checkbox_tag('asset_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]
-                     [% ELSE %]
-                     [% L.checkbox_tag('asset_' _ loop.count, value => 1, checked => 0, class => 'checkbox') %]
-                     [% END %]</td>
-
-    <td align="center">[% IF row.taxkey == 0 or row.taxkey == 1 %]
-                     [% L.checkbox_tag('liability_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]
-                     [% ELSE %]
-                     [% L.checkbox_tag('liability_' _ loop.count, value => 1, checked => 0, class => 'checkbox') %]
-                     [% END %]</td>
-
-    <td align="center">[% IF row.taxkey == 0 or row.taxkey == 1 %]
-                     [% L.checkbox_tag('equity_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]
-                     [% ELSE %]
-                     [% L.checkbox_tag('equity_' _ loop.count, value => 1, checked => 0, class => 'checkbox') %]
-                     [% END %]</td>
-
-    <td align="center">[% IF row.taxkey == 0 or row.taxkey == 1 %]
-                     [% L.checkbox_tag('costs_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]
-                     [% ELSE %]
-                     [% L.checkbox_tag('costs_' _ loop.count, value => 1, checked => 0, class => 'checkbox') %]
-                     [% END %]</td>
-
-    <td align="center">[% IF row.taxkey == 8 or row.taxkey == 9 or row.taxkey == 18 or row.taxkey == 19%]
-                     [% L.checkbox_tag('revenue_' _ loop.count, value => 1, checked => 0, class => 'checkbox') %]
-                     [% ELSE %]
-                     [% L.checkbox_tag('revenue_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]
-                     [% END %]</td>
-
-    <td align="center">[% IF row.taxkey == 2 or row.taxkey == 3 or row.taxkey == 10 or row.taxkey == 11 or row.taxkey == 12 or row.taxkey == 13 %]
-                     [% L.checkbox_tag('expense_' _ loop.count, value => 1, checked => 0, class => 'checkbox') %]
-                     [% ELSE %]
-                     [% L.checkbox_tag('expense_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]
-                     [% END %]</td>
+    <td align="center">[% L.checkbox_tag('asset_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+    <td align="center">[% L.checkbox_tag('liability_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+    <td align="center">[% L.checkbox_tag('equity_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+    <td align="center">[% L.checkbox_tag('costs_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+    <td align="center">[% L.checkbox_tag('revenue_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+    <td align="center">[% L.checkbox_tag('expense_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
   </tr>
   <input type="hidden" name="tax_id_[% loop.count %]" value="[% row.tax_id %]">
   [% SET rowcount = loop.count %]