Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e73b534f

Von Cem Aydin vor fast 2 Jahren hinzugefügt

  • ID e73b534f2865313a603cd8b2f5ca393ea754ea8a
  • Vorgänger ab1a0839
  • Nachfolger 535ba9ba

design40: acctranscorrections Merge Fehler 655ef98e behoben

Unterschiede anzeigen:

templates/design40_webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html
1
[%- USE T8 %]
1
[% USE T8 %]
2 2
[% USE HTML %]
3 3

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

  
6
<p>
7
  [% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
8
  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
9
</p>
10

  
11
<p>
12
  <form action="acctranscorrections.pl" method="post">
13
    <input type="hidden" name="action" value="redirect">
14
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
15
    <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
16
  </form>
17
</p>
18
||||||| constructed merge base
19
=======
20
[%- USE T8 %]
21
[% USE HTML %]
22
<h1>[% title %]</h1>
23 6
<div class="wrapper">
24
  <p>
25
  [% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
26 7

  
27
  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
8
  <p>
9
    [% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
10
    [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
28 11
  </p>
29 12

  
30 13
  <p>
31
  <form action="acctranscorrections.pl" method="post">
32

  
33
    <input type="hidden" name="action" value="redirect">
34
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
35
    <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
36
  </form>
14
    <form action="acctranscorrections.pl" method="post">
15
      <input type="hidden" name="action" value="redirect">
16
      <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
17
      <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
18
    </form>
37 19
  </p>
38
</div>
39
>>>>>>> Design 4.0: Bücherkontrolle angepasst
20

  
21
</div>
templates/design40_webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html
1
[%- USE T8 %]
1
[% USE T8 %]
2 2
[% USE HTML %]
3 3

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

  
6
<p>
7
  [% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
8
  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
9
</p>
10

  
11
<p>
12
  <form action="acctranscorrections.pl" method="post">
13
    <input type="hidden" name="action" value="redirect">
14
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
15
    <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
16
  </form>
17
</p>
18
||||||| constructed merge base
19
=======
20
[%- USE T8 %]
21
[% USE HTML %]
22
<h1>[% title %]</h1>
23 6
<div class="wrapper">
24
  <p>
25
  [% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
26 7

  
27
  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
8
  <p>
9
    [% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
10
    [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
28 11
  </p>
29 12

  
30 13
  <p>
31
  <form action="acctranscorrections.pl" method="post">
32

  
33
    <input type="hidden" name="action" value="redirect">
34
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
35
    <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
36
  </form>
14
    <form action="acctranscorrections.pl" method="post">
15
      <input type="hidden" name="action" value="redirect">
16
      <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
17
      <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
18
    </form>
37 19
  </p>
20

  
38 21
</div>
39
>>>>>>> Design 4.0: Bücherkontrolle angepasst
templates/design40_webpages/acctranscorrections/fix_wrong_taxkeys.html
1
[%- USE T8 %]
1
[% USE T8 %]
2 2
[% USE HTML %]
3 3

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

  
6
<p>
7
  [% 'The wrong taxkeys have been fixed.' | $T8 %]
8
  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
9
</p>
10

  
11
<p>
12
  <form action="acctranscorrections.pl" method="post">
13
    <input type="hidden" name="action" value="redirect">
14
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
15
    <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
16
  </form>
17
</p>
18
||||||| constructed merge base
19
=======
20
[%- USE T8 %]
21
[% USE HTML %]
22
<h1>[% title %]</h1>
23 6
<div class="wrapper">
24
  <p>
25
  [% 'The wrong taxkeys have been fixed.' | $T8 %]
26 7

  
27
  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
8
  <p>
9
    [% 'The wrong taxkeys have been fixed.' | $T8 %]
10
    [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
28 11
  </p>
29 12

  
30 13
  <p>
31
  <form action="acctranscorrections.pl" method="post">
32

  
33
    <input type="hidden" name="action" value="redirect">
34
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
35
    <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
36
  </form>
14
    <form action="acctranscorrections.pl" method="post">
15
      <input type="hidden" name="action" value="redirect">
16
      <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
17
      <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
18
    </form>
37 19
  </p>
38
</div>
39
>>>>>>> Design 4.0: Bücherkontrolle angepasst
20

  
21
</div>

Auch abrufbar als: Unified diff