Revision cb2bd584
Von Hans P. Schlaepfer vor fast 4 Jahren hinzugefügt
| templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html | ||
|---|---|---|
| 4 | 4 |
|
| 5 | 5 |
<h1>[% title %]</h1> |
| 6 | 6 |
|
| 7 |
<p>[% 'At the moment the transaction looks like this:' | $T8 %]</p> |
|
| 8 | 7 |
<p>[% 'The following transaction contains wrong taxes:' | $T8 %] <a href="[% problem.link %]"> |
| 9 | 8 |
[% IF problem.data.module == 'ar' %][% 'AR Transaction' | $T8 %] |
| 10 | 9 |
[% ELSIF problem.data.module == 'ap' %][% 'AP Transaction' | $T8 %] |
| ... | ... | |
| 12 | 11 |
[% HTML.escape(problem.data.reference) %] |
| 13 | 12 |
</a></p> |
| 14 | 13 |
|
| 15 |
<p> |
|
| 16 |
<table> |
|
| 17 |
<tr> |
|
| 18 |
<th class="listheading">[% 'Account' | $T8 %]</th> |
|
| 19 |
<th class="listheading">[% 'Debit' | $T8 %]</th> |
|
| 20 |
<th class="listheading">[% 'Credit' | $T8 %]</th> |
|
| 21 |
<th class="listheading">[% 'Taxkey' | $T8 %]</th> |
|
| 22 |
<th class="listheading">[% 'Recorded Tax' | $T8 %]</th> |
|
| 23 |
<th class="listheading">[% 'Expected Tax' | $T8 %]</th> |
|
| 24 |
<th class="listheading"></th> |
|
| 25 |
</tr> |
|
| 14 |
<p>[% 'At the moment the transaction looks like this:' | $T8 %]</p> |
|
| 26 | 15 |
|
| 27 |
[%- SET curr_row = 0 %] |
|
| 28 |
[%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %] |
|
| 29 |
[%- SET order = [ 'credit', 'debit' ] %] |
|
| 30 |
[%- SET other_side = 'debit' %] |
|
| 31 |
[%- ELSE %] |
|
| 32 |
[%- SET order = [ 'debit', 'credit' ] %] |
|
| 33 |
[%- SET other_side = 'credit' %] |
|
| 34 |
[%- END %] |
|
| 16 |
<table class="tbl-List"> |
|
| 17 |
<thead> |
|
| 18 |
<tr> |
|
| 19 |
<th>[% 'Account' | $T8 %]</th> |
|
| 20 |
<th>[% 'Debit' | $T8 %]</th> |
|
| 21 |
<th>[% 'Credit' | $T8 %]</th> |
|
| 22 |
<th>[% 'Taxkey' | $T8 %]</th> |
|
| 23 |
<th>[% 'Recorded Tax' | $T8 %]</th> |
|
| 24 |
<th>[% 'Expected Tax' | $T8 %]</th> |
|
| 25 |
<th></th> |
|
| 26 |
</tr> |
|
| 27 |
</thead> |
|
| 35 | 28 |
|
| 36 |
[%- FOREACH idx = order %] |
|
| 37 |
[%- FOREACH row = problem.acc_trans.$idx.entries %] |
|
| 38 |
[%- SET curr_row = curr_row + 1 %] |
|
| 39 |
<tr class="listrow[% curr_row % 2 %]"> |
|
| 40 |
<td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td> |
|
| 41 |
<td align="right"> |
|
| 42 |
[%- IF idx == 'debit' %] |
|
| 43 |
[% LxERP.format_amount(row.display_amount, 2) %] |
|
| 44 |
[%- END %] |
|
| 45 |
</td> |
|
| 46 |
<td align="right"> |
|
| 47 |
[%- IF idx == 'credit' %] |
|
| 48 |
[% LxERP.format_amount(row.display_amount, 2) %] |
|
| 49 |
[%- END %] |
|
| 50 |
</td> |
|
| 51 |
<td>[% IF idx != other_side %][% HTML.escape(row.taxdescription) %][% END %]</td> |
|
| 52 |
<td align="right">[% IF row.actual_tax %][% LxERP.format_amount(row.actual_tax, 2) %][% END %]</td> |
|
| 53 |
<td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.expected_tax, 2) %][% END %]</td> |
|
| 54 |
<td align="center" valign="center"><img src="image/[% IF row.tax_error %]error[% ELSE %]ok[% END %].png"></td> |
|
| 55 |
</tr> |
|
| 56 |
[%- END %] |
|
| 57 |
[%- END %] |
|
| 29 |
[% SET curr_row = 0 %] |
|
| 30 |
[% IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %] |
|
| 31 |
[% SET order = [ 'credit', 'debit' ] %] |
|
| 32 |
[% SET other_side = 'debit' %] |
|
| 33 |
[% ELSE %] |
|
| 34 |
[% SET order = [ 'debit', 'credit' ] %] |
|
| 35 |
[% SET other_side = 'credit' %] |
|
| 36 |
[% END %] |
|
| 58 | 37 |
|
| 59 |
</table> |
|
| 60 |
</p> |
|
| 61 |
<hr> |
|
| 38 |
<tbody> |
|
| 39 |
[% FOREACH idx = order %] |
|
| 40 |
[% FOREACH row = problem.acc_trans.$idx.entries %] |
|
| 41 |
[% SET curr_row = curr_row + 1 %] |
|
| 42 |
<tr class="listrow[% curr_row % 2 %]"> |
|
| 43 |
<td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td> |
|
| 44 |
<td>[% IF idx == 'debit' %][% LxERP.format_amount(row.display_amount, 2) %][% END %]</td> |
|
| 45 |
<td>[% IF idx == 'credit' %][% LxERP.format_amount(row.display_amount, 2) %][% END %]</td> |
|
| 46 |
<td>[% IF idx != other_side %][% HTML.escape(row.taxdescription) %][% END %]</td> |
|
| 47 |
<td>[% IF row.actual_tax %][% LxERP.format_amount(row.actual_tax, 2) %][% END %]</td> |
|
| 48 |
<td>[% IF row.expected_tax %][% LxERP.format_amount(row.expected_tax, 2) %][% END %]</td> |
|
| 49 |
<td><img src="image/[% IF row.tax_error %]error[% ELSE %]ok[% END %].png"></td> |
|
| 50 |
</tr> |
|
| 51 |
[% END %] |
|
| 52 |
[% END %] |
|
| 53 |
</tbody> |
|
| 54 |
</table> |
|
| 62 | 55 |
|
| 63 |
<form method="post" action="acctranscorrections.pl">
|
|
| 64 |
<p>
|
|
| 65 |
<input type="hidden" name="action" value="delete_transaction"> |
|
| 66 |
<input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]"> |
|
| 67 |
<input type="submit" class="submit" value="[% 'Delete transaction' | $T8 %]">
|
|
| 68 |
<input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
|
|
| 69 |
</p>
|
|
| 70 |
</form>
|
|
| 56 |
<form method="post" action="acctranscorrections.pl"> |
|
| 57 |
<div class="buttons">
|
|
| 58 |
<input type="hidden" name="action" value="delete_transaction">
|
|
| 59 |
<input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
|
|
| 60 |
<input type="submit" value="[% 'Delete transaction' | $T8 %]">
|
|
| 61 |
<input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
|
|
| 62 |
</div>
|
|
| 63 |
</form> |
|
| 71 | 64 |
|
| templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html | ||
|---|---|---|
| 11 | 11 |
[% HTML.escape(problem.data.reference) %] |
| 12 | 12 |
</a></p> |
| 13 | 13 |
|
| 14 |
<p> |
|
| 14 | 15 |
[% 'This could have happened for two reasons:' | $T8 %] |
| 15 |
|
|
| 16 | 16 |
[% 'The first reason is that kivitendo contained a bug which resulted in the wrong taxkeys being recorded for transactions in which two entries are posted for the same chart with different taxkeys.' | $T8 %] |
| 17 |
|
|
| 18 | 17 |
[% 'The second reason is that kivitendo allowed the user to enter the tax amount manually regardless of the taxkey used.' | $T8 %] |
| 19 |
|
|
| 20 | 18 |
[% 'The third reason is that wrong (taxkey) settings for the credit / debit CSV-import were used.' | $T8 %] |
| 21 |
|
|
| 22 | 19 |
[% 'Such entries cannot be exported into the DATEV format and have to be fixed as well.' | $T8 %] |
| 23 |
</p> |
|
| 24 |
|
|
| 25 |
<p> |
|
| 20 |
</p> |
|
| 21 |
<p> |
|
| 26 | 22 |
[% 'The transaction is shown below in its current state.' | $T8 %] |
| 27 |
|
|
| 28 | 23 |
[% 'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' | $T8 %] |
| 29 |
|
|
| 30 |
[%- 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don\'t match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %] |
|
| 31 |
</p> |
|
| 32 |
|
|
| 33 |
<p> |
|
| 24 |
[% 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don\'t match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %] |
|
| 25 |
</p> |
|
| 26 |
<p> |
|
| 34 | 27 |
[% 'You can also delete this transaction and re-enter it manually.' | $T8 %] |
| 35 |
|
|
| 36 | 28 |
[% 'In order to do that hit the button "Delete transaction".' | $T8 %] |
| 37 |
</p> |
|
| 38 |
|
|
| 39 |
<p>[% 'At the moment the transaction looks like this:' | $T8 %]</p> |
|
| 29 |
</p> |
|
| 30 |
<p>[% 'At the moment the transaction looks like this:' | $T8 %]</p> |
|
| 40 | 31 |
|
| 41 | 32 |
<form method="post" action="acctranscorrections.pl" name="Form"> |
| 42 |
<p> |
|
| 43 | 33 |
<table> |
| 44 | 34 |
<tr> |
| 45 |
<th class="listheading">[% 'Account' | $T8 %]</th>
|
|
| 46 |
<th class="listheading">[% 'Debit' | $T8 %]</th>
|
|
| 47 |
<th class="listheading">[% 'Credit' | $T8 %]</th>
|
|
| 48 |
<th class="listheading">[% 'Recorded Tax' | $T8 %]</th>
|
|
| 49 |
<th class="listheading">[% 'Recorded taxkey' | $T8 %]</th>
|
|
| 50 |
<th class="listheading">[% 'Expected Tax' | $T8 %]</th>
|
|
| 51 |
<th class="listheading"></th>
|
|
| 52 |
<th class="listheading">[% 'Correct taxkey' | $T8 %]</th>
|
|
| 35 |
<th>[% 'Account' | $T8 %]</th> |
|
| 36 |
<th>[% 'Debit' | $T8 %]</th> |
|
| 37 |
<th>[% 'Credit' | $T8 %]</th> |
|
| 38 |
<th>[% 'Recorded Tax' | $T8 %]</th> |
|
| 39 |
<th>[% 'Recorded taxkey' | $T8 %]</th> |
|
| 40 |
<th>[% 'Expected Tax' | $T8 %]</th> |
|
| 41 |
<th></th> |
|
| 42 |
<th>[% 'Correct taxkey' | $T8 %]</th> |
|
| 53 | 43 |
</tr> |
| 54 | 44 |
|
| 55 |
[%- SET curr_row = 0 %]
|
|
| 56 |
[%- IF (problem.data.module == 'ar') || ((problem.data.module == 'gl') && (problem.acc_trans.credit.entries.first.acc_trans_id < problem.acc_trans.debit.entries.first.acc_trans_id)) %]
|
|
| 57 |
[%- SET order = [ 'credit', 'debit' ] %]
|
|
| 58 |
[%- SET other_side = 'debit' %]
|
|
| 59 |
[%- ELSE %]
|
|
| 60 |
[%- SET order = [ 'debit', 'credit' ] %]
|
|
| 61 |
[%- SET other_side = 'credit' %]
|
|
| 62 |
[%- END %]
|
|
| 45 |
[% SET curr_row = 0 %] |
|
| 46 |
[% IF (problem.data.module == 'ar') || ((problem.data.module == 'gl') && (problem.acc_trans.credit.entries.first.acc_trans_id < problem.acc_trans.debit.entries.first.acc_trans_id)) %] |
|
| 47 |
[% SET order = [ 'credit', 'debit' ] %] |
|
| 48 |
[% SET other_side = 'debit' %] |
|
| 49 |
[% ELSE %] |
|
| 50 |
[% SET order = [ 'debit', 'credit' ] %] |
|
| 51 |
[% SET other_side = 'credit' %] |
|
| 52 |
[% END %] |
|
| 63 | 53 |
|
| 64 | 54 |
|
| 65 |
[%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %]
|
|
| 66 |
[%- ELSE %]
|
|
| 67 |
[%- END %]
|
|
| 55 |
[% IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %] |
|
| 56 |
[% ELSE %] |
|
| 57 |
[% END %] |
|
| 68 | 58 |
|
| 69 | 59 |
|
| 70 |
[%- FOREACH idx = order %]
|
|
| 71 |
[%- FOREACH row = problem.acc_trans.$idx.entries %]
|
|
| 72 |
[%- SET curr_row = curr_row + 1 %]
|
|
| 60 |
[% FOREACH idx = order %] |
|
| 61 |
[% FOREACH row = problem.acc_trans.$idx.entries %] |
|
| 62 |
[% SET curr_row = curr_row + 1 %] |
|
| 73 | 63 |
<tr class="listrow[% curr_row % 2 %]"> |
| 74 | 64 |
<td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td> |
| 75 |
<td align="right">
|
|
| 76 |
[%- IF idx == 'debit' %]
|
|
| 65 |
<td> |
|
| 66 |
[% IF idx == 'debit' %] |
|
| 77 | 67 |
[% LxERP.format_amount(row.display_amount, 2) %] |
| 78 |
[%- END %]
|
|
| 68 |
[% END %] |
|
| 79 | 69 |
</td> |
| 80 |
<td align="right">
|
|
| 81 |
[%- IF idx == 'credit' %]
|
|
| 70 |
<td> |
|
| 71 |
[% IF idx == 'credit' %] |
|
| 82 | 72 |
[% LxERP.format_amount(row.display_amount, 2) %] |
| 83 |
[%- END %]
|
|
| 73 |
[% END %] |
|
| 84 | 74 |
</td> |
| 85 |
<td align="right">[% IF row.actual_tax %][% LxERP.format_amount(row.display_actual_tax, 2) %][% END %]</td>
|
|
| 75 |
<td>[% IF row.actual_tax %][% LxERP.format_amount(row.display_actual_tax, 2) %][% END %]</td> |
|
| 86 | 76 |
<td>[% IF (problem.data.module == 'gl') || (idx != other_side) %][% HTML.escape(row.taxdescription) %][% END %]</td> |
| 87 |
<td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.display_expected_tax, 2) %][% END %]</td>
|
|
| 88 |
<td align="center" valign="center"><img src="image/[% IF row.taxkey_error %]error[% ELSE %]ok[% END %].png"></td>
|
|
| 77 |
<td>[% IF row.expected_tax %][% LxERP.format_amount(row.display_expected_tax, 2) %][% END %]</td> |
|
| 78 |
<td><img src="image/[% IF row.taxkey_error %]error[% ELSE %]ok[% END %].png"></td> |
|
| 89 | 79 |
|
| 90 | 80 |
<td> |
| 91 |
[%- IF row.taxkey_error %]
|
|
| 81 |
[% IF row.taxkey_error %] |
|
| 92 | 82 |
<input type="hidden" name="fixes[+].acc_trans_id" value="[% HTML.escape(row.acc_trans_id) %]"> |
| 93 | 83 |
<input type="hidden" name="fixes[].tax_entry_acc_trans_id" value="[% HTML.escape(row.tax_entry_acc_trans_id) %]"> |
| 94 | 84 |
<select name="fixes[].taxkey" style="width: 250px" onchange="enable_fix_button_maybe()"> |
| 95 | 85 |
<option value="">[% '---please select---' | $T8 %]</option> |
| 96 |
[%- FOREACH taxkey = row.correct_taxkeys %]
|
|
| 86 |
[% FOREACH taxkey = row.correct_taxkeys %] |
|
| 97 | 87 |
<option value="[% HTML.escape(taxkey.taxkey) %]">[% HTML.escape(taxkey.description) %]</option> |
| 98 |
[%- END %]
|
|
| 99 |
[%- ELSE %]
|
|
| 88 |
[% END %] |
|
| 89 |
[% ELSE %] |
|
| 100 | 90 |
|
| 101 |
[%- END %]
|
|
| 91 |
[% END %] |
|
| 102 | 92 |
</tr> |
| 103 |
[%- END %]
|
|
| 104 |
[%- END %]
|
|
| 93 |
[% END %] |
|
| 94 |
[% END %] |
|
| 105 | 95 |
|
| 106 | 96 |
</table> |
| 107 |
</p> |
|
| 108 | 97 |
<hr> |
| 109 | 98 |
|
| 110 | 99 |
<p> |
| 111 | 100 |
<input type="hidden" name="callback" value="[% HTML.escape(callback) %]"> |
| 112 |
|
|
| 113 | 101 |
<input type="hidden" name="action" value="dispatcher"> |
| 114 | 102 |
<input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]"> |
| 115 | 103 |
<input type="hidden" name="module" value="[% HTML.escape(problem.data.module) %]"> |
| 116 | 104 |
<input type="hidden" name="reference" value="[% HTML.escape(problem.data.reference) %]"> |
| 117 |
<input type="submit" class="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="[% 'Fix transaction' | $T8 %]" disabled>
|
|
| 118 |
<input type="submit" class="submit" name="action_delete_transaction" value="[% 'Delete transaction' | $T8 %]">
|
|
| 119 |
<input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
|
|
| 105 |
<input type="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="[% 'Fix transaction' | $T8 %]" disabled> |
|
| 106 |
<input type="submit" name="action_delete_transaction" value="[% 'Delete transaction' | $T8 %]"> |
|
| 107 |
<input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]"> |
|
| 120 | 108 |
</p> |
| 121 | 109 |
</form> |
| 122 | 110 |
|
Auch abrufbar als: Unified diff
Neues Design 2019 Standard-Code