Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e73b534f

Von Cem Aydin vor mehr als 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
[%- USE T8 %]
[% USE T8 %]
[% USE HTML %]
<h1>[% title %]</h1>
<p>
[% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
[% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
</p>
<p>
<form action="acctranscorrections.pl" method="post">
<input type="hidden" name="action" value="redirect">
<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
<input type="submit" value="[% 'Re-run analysis' | $T8 %]">
</form>
</p>
||||||| constructed merge base
=======
[%- USE T8 %]
[% USE HTML %]
<h1>[% title %]</h1>
<div class="wrapper">
<p>
[% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
[% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
<p>
[% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
[% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
</p>
<p>
<form action="acctranscorrections.pl" method="post">
<input type="hidden" name="action" value="redirect">
<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
<input type="submit" value="[% 'Re-run analysis' | $T8 %]">
</form>
<form action="acctranscorrections.pl" method="post">
<input type="hidden" name="action" value="redirect">
<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
<input type="submit" value="[% 'Re-run analysis' | $T8 %]">
</form>
</p>
</div>
>>>>>>> Design 4.0: Bücherkontrolle angepasst
</div>
templates/design40_webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html
[%- USE T8 %]
[% USE T8 %]
[% USE HTML %]
<h1>[% title %]</h1>
<p>
[% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
[% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
</p>
<p>
<form action="acctranscorrections.pl" method="post">
<input type="hidden" name="action" value="redirect">
<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
<input type="submit" value="[% 'Re-run analysis' | $T8 %]">
</form>
</p>
||||||| constructed merge base
=======
[%- USE T8 %]
[% USE HTML %]
<h1>[% title %]</h1>
<div class="wrapper">
<p>
[% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
[% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
<p>
[% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
[% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
</p>
<p>
<form action="acctranscorrections.pl" method="post">
<input type="hidden" name="action" value="redirect">
<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
<input type="submit" value="[% 'Re-run analysis' | $T8 %]">
</form>
<form action="acctranscorrections.pl" method="post">
<input type="hidden" name="action" value="redirect">
<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
<input type="submit" value="[% 'Re-run analysis' | $T8 %]">
</form>
</p>
</div>
>>>>>>> Design 4.0: Bücherkontrolle angepasst
templates/design40_webpages/acctranscorrections/fix_wrong_taxkeys.html
[%- USE T8 %]
[% USE T8 %]
[% USE HTML %]
<h1>[% title %]</h1>
<p>
[% 'The wrong taxkeys have been fixed.' | $T8 %]
[% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
</p>
<p>
<form action="acctranscorrections.pl" method="post">
<input type="hidden" name="action" value="redirect">
<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
<input type="submit" value="[% 'Re-run analysis' | $T8 %]">
</form>
</p>
||||||| constructed merge base
=======
[%- USE T8 %]
[% USE HTML %]
<h1>[% title %]</h1>
<div class="wrapper">
<p>
[% 'The wrong taxkeys have been fixed.' | $T8 %]
[% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
<p>
[% 'The wrong taxkeys have been fixed.' | $T8 %]
[% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
</p>
<p>
<form action="acctranscorrections.pl" method="post">
<input type="hidden" name="action" value="redirect">
<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
<input type="submit" value="[% 'Re-run analysis' | $T8 %]">
</form>
<form action="acctranscorrections.pl" method="post">
<input type="hidden" name="action" value="redirect">
<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
<input type="submit" value="[% 'Re-run analysis' | $T8 %]">
</form>
</p>
</div>
>>>>>>> Design 4.0: Bücherkontrolle angepasst
</div>

Auch abrufbar als: Unified diff