Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision c5ebebfb

Von Hans Peter Schlaepfer vor mehr als 5 Jahren hinzugefügt

  • ID c5ebebfb651bfb0ce43b2aaa2aab64223037b1a8
  • Vorgänger 73e09e8b
  • Nachfolger 1440377b

Neues kivitendo Design Aenderungen in templates/webpages/acc*

Dateien in acc_trans/* und acctranscorrections/*

Unterschiede anzeigen:

templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html
1
[%- USE T8 %]
2
[% USE HTML %][% USE LxERP %]
1
[% USE T8 %]
2
[% USE HTML %]
3
[% USE LxERP %]
4

  
3 5
<h1>[% title %]</h1>
4 6

  
5
 <p>
6
  [% 'The following transaction contains wrong taxkeys:' | $T8 %]
7
  <a href="[% problem.link %]">
8
   [%- IF problem.data.module == 'ar' %]
9
   [% 'AR Transaction' | $T8 %]
10
   [%- ELSIF problem.data.module == 'ap' %]
11
   [% 'AP Transaction' | $T8 %]
12
   [%- ELSE %]
13
   [% 'General Ledger Transaction' | $T8 %]
14
   [%- END %]
15
   [% HTML.escape(problem.data.reference) %]
16
  </a>
17
 </p>
7
<p>[% 'The following transaction contains wrong taxkeys:' | $T8 %]<a href="[% problem.link %]">
8
[% IF problem.data.module == 'ar'    %][% 'AR Transaction'             | $T8 %]
9
[% ELSIF problem.data.module == 'ap' %][% 'AP Transaction'             | $T8 %]
10
[% ELSE                              %][% 'General Ledger Transaction' | $T8 %][% END %]
11
[% HTML.escape(problem.data.reference) %]
12
</a></p>
18 13

  
19
 <p>
14
<p>
20 15
  [% 'This could have happened for two reasons:' | $T8 %]
21

  
22 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 %]
23

  
24 17
  [% 'The second reason is that kivitendo allowed the user to enter the tax amount manually regardless of the taxkey used.' | $T8 %]
25

  
26 18
  [% 'The third reason is that wrong (taxkey) settings for the credit / debit CSV-import were used.' | $T8 %]
27

  
28 19
  [% 'Such entries cannot be exported into the DATEV format and have to be fixed as well.' | $T8 %]
29
 </p>
30

  
31
 <p>
20
</p>
21
<p>
32 22
  [% 'The transaction is shown below in its current state.' | $T8 %]
33

  
34 23
  [% 'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' | $T8 %]
35

  
36
  [%- '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 %]
37
 </p>
38

  
39
 <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>
40 27
  [% 'You can also delete this transaction and re-enter it manually.' | $T8 %]
41

  
42 28
  [% 'In order to do that hit the button "Delete transaction".' | $T8 %]
43
 </p>
44

  
45
 <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>
46 31

  
47 32
 <form method="post" action="acctranscorrections.pl" name="Form">
48
  <p>
49 33
   <table>
50 34
    <tr>
51
     <th class="listheading">[% 'Account' | $T8 %]</th>
52
     <th class="listheading">[% 'Debit' | $T8 %]</th>
53
     <th class="listheading">[% 'Credit' | $T8 %]</th>
54
     <th class="listheading">[% 'Recorded Tax' | $T8 %]</th>
55
     <th class="listheading">[% 'Recorded taxkey' | $T8 %]</th>
56
     <th class="listheading">[% 'Expected Tax' | $T8 %]</th>
57
     <th class="listheading"></th>
58
     <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>
59 43
    </tr>
60 44

  
61
    [%- SET curr_row = 0 %]
62
    [%- 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)) %]
63
     [%- SET order = [ 'credit', 'debit' ] %]
64
     [%- SET other_side = 'debit' %]
65
    [%- ELSE %]
66
     [%- SET order = [ 'debit', 'credit' ] %]
67
     [%- SET other_side = 'credit' %]
68
    [%- 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 %]
69 53

  
70 54

  
71
    [%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %]
72
    [%- ELSE %]
73
    [%- END %]
55
    [% IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %]
56
    [% ELSE %]
57
    [% END %]
74 58

  
75 59

  
76
    [%- FOREACH idx = order %]
77
     [%- FOREACH row = problem.acc_trans.$idx.entries %]
78
      [%- 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 %]
79 63
      <tr class="listrow[% curr_row % 2 %]">
80 64
       <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
81
       <td align="right">
82
        [%- IF idx == 'debit' %]
65
       <td>
66
        [% IF idx == 'debit' %]
83 67
         [% LxERP.format_amount(row.display_amount, 2) %]
84
        [%- END %]
68
        [% END %]
85 69
       </td>
86
       <td align="right">
87
        [%- IF idx == 'credit' %]
70
       <td>
71
        [% IF idx == 'credit' %]
88 72
         [% LxERP.format_amount(row.display_amount, 2) %]
89
        [%- END %]
73
        [% END %]
90 74
       </td>
91
       <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>
92 76
       <td>[% IF (problem.data.module == 'gl') || (idx != other_side) %][% HTML.escape(row.taxdescription) %][% END %]</td>
93
       <td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.display_expected_tax, 2) %][% END %]</td>
94
       <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>
95 79

  
96 80
       <td>
97
        [%- IF row.taxkey_error %]
81
        [% IF row.taxkey_error %]
98 82
         <input type="hidden" name="fixes[+].acc_trans_id" value="[% HTML.escape(row.acc_trans_id) %]">
99 83
         <input type="hidden" name="fixes[].tax_entry_acc_trans_id" value="[% HTML.escape(row.tax_entry_acc_trans_id) %]">
100 84
         <select name="fixes[].taxkey" style="width: 250px" onchange="enable_fix_button_maybe()">
101 85
          <option value="">[% '---please select---' | $T8 %]</option>
102
          [%- FOREACH taxkey = row.correct_taxkeys %]
86
          [% FOREACH taxkey = row.correct_taxkeys %]
103 87
           <option value="[% HTML.escape(taxkey.taxkey) %]">[% HTML.escape(taxkey.description) %]</option>
104
          [%- END %]
105
        [%- ELSE %]
88
          [% END %]
89
        [% ELSE %]
106 90
        &nbsp;
107
        [%- END %]
91
        [% END %]
108 92
      </tr>
109
     [%- END %]
110
    [%- END %]
93
     [% END %]
94
    [% END %]
111 95

  
112 96
   </table>
113
  </p>
114 97
  <hr>
115 98

  
116 99
  <p>
117 100
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
118

  
119 101
   <input type="hidden" name="action" value="dispatcher">
120 102
   <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
121 103
   <input type="hidden" name="module" value="[% HTML.escape(problem.data.module) %]">
122 104
   <input type="hidden" name="reference" value="[% HTML.escape(problem.data.reference) %]">
123
   <input type="submit" class="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="[% 'Fix transaction' | $T8 %]" disabled>
124
   <input type="submit" class="submit" name="action_delete_transaction" value="[% 'Delete transaction' | $T8 %]">
125
   <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 %]">
126 108
  </p>
127 109
 </form>
128 110

  

Auch abrufbar als: Unified diff