From a1486b4ea62f731a7ce86b2b3f51983703dff2ad Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 31 Oct 2007 15:28:16 +0000 Subject: [PATCH] Umstellung der Vorlagen aus templates/webpages/dbupgrade von HTML::Template auf Template. --- SL/User.pm | 18 ++-- locale/de/all | 12 +-- .../Pg-upgrade-2.2.0.25-2.2.0.26.pl | 34 ++++---- .../Pg-upgrade-2.2.0.27-2.2.0.28.pl | 8 +- .../Pg-upgrade-2.2.0.28-2.2.0.29.pl | 8 +- .../Pg-upgrade-2.2.0.31-2.2.0.32.pl | 10 +-- .../Pg-upgrade-2.2.0.33-2.2.0.34.pl | 26 +++--- .../Pg-upgrade-2.2.0.37-2.2.0.38.pl | 4 +- .../buchungsgruppen_assemblies_de.html | 86 +++++++++---------- .../buchungsgruppen_assemblies_master.html | 86 +++++++++---------- .../dbupgrade/buchungsgruppen_parts_de.html | 86 +++++++++---------- .../buchungsgruppen_parts_master.html | 86 +++++++++---------- .../buchungsgruppen_services_de.html | 86 +++++++++---------- .../buchungsgruppen_services_master.html | 86 +++++++++---------- .../webpages/dbupgrade/coa_guess_de.html | 14 +-- .../webpages/dbupgrade/coa_guess_master.html | 14 +-- templates/webpages/dbupgrade/error_de.html | 4 +- .../webpages/dbupgrade/error_master.html | 4 +- templates/webpages/dbupgrade/footer_de.html | 8 +- .../webpages/dbupgrade/footer_master.html | 8 +- templates/webpages/dbupgrade/header_de.html | 4 +- .../webpages/dbupgrade/header_master.html | 4 +- .../std_buchungsgruppen_unknown_coa_de.html | 17 ++-- ...td_buchungsgruppen_unknown_coa_master.html | 14 +-- .../webpages/dbupgrade/units_error_de.html | 2 +- .../dbupgrade/units_error_master.html | 2 +- .../webpages/dbupgrade/units_parts_de.html | 32 +++---- .../dbupgrade/units_parts_master.html | 32 +++---- .../webpages/dbupgrade/units_services_de.html | 32 +++---- .../dbupgrade/units_services_master.html | 32 +++---- .../dbupgrade/units_set_default_de.html | 10 +-- .../dbupgrade/units_set_default_master.html | 10 +-- .../update_templates_warnings_de.html | 8 +- .../update_templates_warnings_master.html | 8 +- .../dbupgrade/upgrade_message2_de.html | 4 +- .../dbupgrade/upgrade_message2_master.html | 4 +- .../ustva_setup_2007_error_master.html | 2 +- templates/webpages/dbupgrade/warning_de.html | 8 +- .../webpages/dbupgrade/warning_master.html | 8 +- 39 files changed, 459 insertions(+), 462 deletions(-) diff --git a/SL/User.pm b/SL/User.pm index 8e60b8d0b..99c531938 100644 --- a/SL/User.pm +++ b/SL/User.pm @@ -193,13 +193,13 @@ sub login { $form->{"stylesheet"} = "lx-office-erp.css"; $form->{"title"} = $main::locale->text("Dataset upgrade"); $form->header(); - print($form->parse_html_template("dbupgrade/header")); + print($form->parse_html_template2("dbupgrade/header")); $form->{dbupdate} = "db$myconfig{dbname}"; $form->{ $form->{dbupdate} } = 1; if ($form->{"show_dbupdate_warning"}) { - print($form->parse_html_template("dbupgrade/warning")); + print($form->parse_html_template2("dbupgrade/warning")); exit(0); } @@ -226,8 +226,8 @@ sub login { $self->{"menustyle"} eq "neu" ? "menunew.pl" : "menu.pl"; - print($form->parse_html_template("dbupgrade/footer", - { "menufile" => $menufile })); + print($form->parse_html_template2("dbupgrade/footer", + { "menufile" => $menufile })); $rc = -2; @@ -492,9 +492,9 @@ sub process_perl_script { } if (!defined($result)) { - print($form->parse_html_template("dbupgrade/error", - { "file" => $filename, - "error" => $@ })); + print($form->parse_html_template2("dbupgrade/error", + { "file" => $filename, + "error" => $@ })); exit(0); } elsif (1 != $result) { unlink("users/nologin") if (2 == $result); @@ -927,8 +927,8 @@ sub dbupdate2 { # apply upgrade $main::lxdebug->message(DEBUG2, "Applying Update $control->{file}"); - print($form->parse_html_template("dbupgrade/upgrade_message2", - $control)); + print($form->parse_html_template2("dbupgrade/upgrade_message2", + $control)); if ($file_type eq "sql") { $self->process_query($form, $dbh, "sql/" . $form->{"dbdriver"} . diff --git a/locale/de/all b/locale/de/all index 89c61e21d..fc19fe533 100644 --- a/locale/de/all +++ b/locale/de/all @@ -142,7 +142,7 @@ $self->{texts} = { 'Ansprechpartner' => 'Ansprechpartner', 'Application Error. No Format given' => 'Fehler in der Anwendung. Das Ausgabeformat fehlt.', 'Application Error. Wrong Format' => 'Fehler in der Anwendung. Falsches Format: ', - 'Applying :' => 'Führe aus:', + 'Applying [% HTML.escape(file) %]:' => 'Führe [% HTML.escape(file) %] aus:', 'Apr' => 'Apr', 'April' => 'April', 'Are you sure you want to delete Invoice Number' => 'Soll die Rechnung mit folgender Nummer wirklich gelöscht werden:', @@ -593,7 +593,6 @@ aktualisieren wollen?', 'Inventory Account' => 'Warenbestand', 'Inventory quantity must be zero before you can set this assembly obsolete!' => 'Bevor dieses Erzeugnis als ungültig markiert werden kann, muß das Inventar auf Null sein!', 'Inventory quantity must be zero before you can set this part obsolete!' => 'Bevor diese Ware als ungültig markiert werden kann, muß das Inventar Null sein!', - 'Invetory' => 'Inventar', 'Invno.' => 'Rg. Nr.', 'Invnumber' => 'Rechnungsnummer', 'Invoice' => 'Rechnung', @@ -687,7 +686,7 @@ aktualisieren wollen?', 'Long Dates' => 'Lange Monatsnamen', 'Long Description' => 'Langtext', 'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' => 'Lx-Office 2.4.0 führt zwei neue Konzepte ein: Steuerzonen und Buchungsgruppen.', - 'Lx-Office is about to update the database . You should create a backup of the database before proceeding because the backup might not be reversible.' => 'Lx-Office wird gleich die Datenbank aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umständen nicht umkehrbar ist.', + 'Lx-Office is about to update the database [% HTML.escape(dbname) %]. You should create a backup of the database before proceeding because the backup might not be reversible.' => 'Lx-Office wird gleich die Datenbank [% HTML.escape(dbname) %] aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umständen nicht umkehrbar ist.', 'Lx-Office website' => 'Lx-Office-Webseite', 'MAILED' => 'Gesendet', 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' => 'Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte wählen Sie ein anderes Menü in der Benutzerkonfiguration im Administrationsmenü aus.', @@ -734,7 +733,7 @@ aktualisieren wollen?', 'National Expenses' => 'Aufwand Inland', 'National Revenues' => 'Erlöse Inland', 'Netto Terms' => 'Zahlungsziel netto', - 'New Buchungsgruppe ' => 'Neue Buchungsgruppe ', + 'New Buchungsgruppe [% loop.count %]' => 'Neue Buchungsgruppe [% loop.count %]', 'New Templates' => 'neue Vorlagen', 'New assembly' => 'Neues Erzeugnis', 'New contact' => 'Neuer Ansprechpartner', @@ -772,6 +771,7 @@ aktualisieren wollen?', 'Not Discountable' => 'Nicht rabattierfähig', 'Not delivered' => 'Nicht geliefert', 'Not obsolete' => 'Gültig', + 'Note' => 'Hinweis', 'Notes' => 'Bemerkungen', 'Nothing selected!' => 'Es wurde nichts ausgewählt!', 'Nothing to delete!' => 'Es konnte nichts gelöscht werden!', @@ -1122,7 +1122,7 @@ aktualisieren wollen?', 'The base unit relations must not contain loops (e.g. by saying that unit A\'s base unit is B, B\'s base unit is C and C\'s base unit is A) in row %d.' => 'Die Beziehungen der Einheiten dürfen keine Schleifen beinhalten (z.B. wenn gesagt wird, dass Einheit As Basiseinheit B, Bs Basiseinheit C und Cs Basiseinheit A ist) in Zeile %d.', 'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' => 'Die Spalten "Zahlbar bis", "Kumulierte Gebühren" und "Zinsen" zeigen Daten der letzten für diese Rechnung erzeugten Mahnung.', 'The database [% HTML.escape(db) %] has been successfully deleted.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich gelöscht.', - 'The database update/creation did not succeed. The file contained the following error:' => 'Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei enthielt den folgenden Fehler:', + 'The database update/creation did not succeed. The file [% HTML.escape(file) %] contained the following error:' => 'Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei [% HTML.escape(file) %] enthielt den folgenden Fehler:', 'The database upgrade for the introduction of Buchungsgruppen is now complete.' => 'Das Datenbankupgrade für die Einführung von Buchungsgruppen ist jetzt beendet.', 'The database upgrade for the introduction of units is now complete.' => 'Das Datenbankupgrade zwecks Einführung von Einheiten ist nun beendet.', 'The dataset [% HTML.escape(db) %] has been successfully created.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich angelegt.', @@ -1169,6 +1169,7 @@ aktualisieren wollen?', 'Therefore there\'s no need to create the same article more than once if it is sold or bought in/from another tax zone.' => 'Deswegen muss man den gleichen Artikel nicht mehr mehrmals anlegen, wenn er in verschiedenen Steuerzonen gehandelt werden soll.', 'These units can be based on other units so that Lx-Office can convert prices when the user switches from one unit to another.' => 'Diese Einheiten können auf anderen Einheiten basieren, sodass Lx-Office Preise umrechnen kann, wenn der Benutzer von einer Einheit zu einer anderen Wechselt.', 'This customer number is already in use.' => 'Diese Kundennummer wird bereits verwendet.', + 'This installation uses an unknown chart of accounts ("[% HTML.escape(coa) %]"). This database upgrade cannot create standard buchungsgruppen automatically.' => 'Diese Installation benutzt einen unbekannten Kontenrahmen ("[% HTML.escape(coa) %]"). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen.', 'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => 'In diesem Schritt werden bestehende Datenbanken gesucht. Es werden noch keine Änderungen vorgenommen!', 'This upgrade script tries to map all existing parts in the database to the newly created Buchungsgruppen.' => 'Dieses Upgradescript versucht, bei allen bestehenden Artikeln neu erstellte Buchungsgruppen zuzuordnen.', 'This upgrade script tries to map all existing units in the database to the newly created units.' => 'Dieses Update-Script versucht, alle bestehenden Einheiten automatisch in die neuen Einheiten umzuwandeln.', @@ -1218,6 +1219,7 @@ aktualisieren wollen?', 'Units' => 'Einheiten', 'Unknown Category' => 'Unbekannte Kategorie', 'Unknown Link' => 'Unbekannte Verknüpfung', + 'Unknown chart of accounts' => 'Unbekannter Kontenrahmen', 'Unknown dependency \'%s\'.' => 'Unbekannte Abhängigkeit \'%s\'.', 'Unlock System' => 'System entsperren', 'Until' => 'Bis', diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl index e51b3a8a5..da3de05c3 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl @@ -13,8 +13,8 @@ sub mydberror { sub myshowerror { my ($msg) = @_; - print($main::form->parse_html_template("dbupgrade/units_error", - { "message" => $msg })); + print($main::form->parse_html_template2("dbupgrade/units_error", + { "message" => $msg })); return 2; } @@ -219,15 +219,15 @@ sub update_units_steps_1_2 { map({ push(@unknown_parts, { "name" => $_, "NEW_UNITS" => $ddbox }); } sort({ lc($a) cmp lc($b) } keys(%unknown_dimension_units))); - print($form->parse_html_template("dbupgrade/units_parts", - { "NEW_BASE_UNIT_DDBOX" => $ddbox, - "UNKNOWN_PART_UNITS" => \@unknown_parts, - })); + print($form->parse_html_template2("dbupgrade/units_parts", + { "NEW_BASE_UNIT_DDBOX" => $ddbox, + "UNKNOWN_PART_UNITS" => \@unknown_parts, + })); return 2; } else { - print($form->parse_html_template("dbupgrade/units_parts_done")); + print($form->parse_html_template2("dbupgrade/units_parts_done")); } if (scalar(keys(%unknown_service_units)) != 0) { @@ -238,15 +238,15 @@ sub update_units_steps_1_2 { map({ push(@unknown_services, { "name" => $_, "NEW_UNITS" => $ddbox }); } sort({ lc($a) cmp lc($b) } keys(%unknown_service_units))); - print($form->parse_html_template("dbupgrade/units_services", - { "NEW_BASE_UNIT_DDBOX" => $ddbox, - "UNKNOWN_PART_UNITS" => \@unknown_services, - })); + print($form->parse_html_template2("dbupgrade/units_services", + { "NEW_BASE_UNIT_DDBOX" => $ddbox, + "UNKNOWN_PART_UNITS" => \@unknown_services, + })); return 2; } else { - print($form->parse_html_template("dbupgrade/units_services_done")); + print($form->parse_html_template2("dbupgrade/units_services_done")); } return 0; @@ -271,13 +271,13 @@ sub update_units_step_3 { my $service_units = retrieve_units(\%dbup_myconfig, $form, "service"); my $service_ddbox = unit_select_data($service_units); - print($form->parse_html_template("dbupgrade/units_set_default", - { "DIMENSION_DDBOX" => $dimension_ddbox, - "SERVICE_DDBOX" => $service_ddbox })); + print($form->parse_html_template2("dbupgrade/units_set_default", + { "DIMENSION_DDBOX" => $dimension_ddbox, + "SERVICE_DDBOX" => $service_ddbox })); return 2; } else { - print($form->parse_html_template("dbupgrade/units_set_default_done")); + print($form->parse_html_template2("dbupgrade/units_set_default_done")); return 1; } } @@ -330,7 +330,7 @@ sub update_units { my $res; - print($form->parse_html_template("dbupgrade/units_header")); + print($form->parse_html_template2("dbupgrade/units_header")); if ($form->{"action2"} eq "add_unit") { $res = update_units_add_unit(); diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl index 91144c29b..9d0894779 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl @@ -11,8 +11,8 @@ sub mydberror { sub myshowerror { my ($msg) = @_; - print($main::form->parse_html_template("dbupgrade/units_error", - { "message" => $msg })); + print($main::form->parse_html_template2("dbupgrade/units_error", + { "message" => $msg })); return 2; } @@ -76,8 +76,8 @@ sub update_guess_chart_of_accounts { my @coas = map(+{ "name" => $_ }, @valid_coas); - print($form->parse_html_template("dbupgrade/coa_guess", - { "COAS" => \@coas })); + print($form->parse_html_template2("dbupgrade/coa_guess", + { "COAS" => \@coas })); return 2; } diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl index 0e044e203..203857f82 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl @@ -11,8 +11,8 @@ sub mydberror { sub myshowerror { my ($msg) = @_; - print($main::form->parse_html_template("dbupgrade/units_error", - { "message" => $msg })); + print($main::form->parse_html_template2("dbupgrade/units_error", + { "message" => $msg })); return 2; } @@ -209,9 +209,7 @@ sub create_standard_buchungsgruppen { return create_standard_buchungsgruppen_skr04(); } - print($form->parse_html_template("dbupgrade/" . - "std_buchungsgruppen_unknown_coa", - { "coa" => $coa })); + print($form->parse_html_template2("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa })); return 1; } diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl index 54f19eed1..9a8542a36 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl @@ -11,8 +11,8 @@ sub mydberror { sub myshowerror { my ($msg) = @_; - print($main::form->parse_html_template("dbupgrade/units_error", - { "message" => $msg })); + print($main::form->parse_html_template2("dbupgrade/units_error", + { "message" => $msg })); return 2; } @@ -117,13 +117,11 @@ sub update_steuersaetze { return update_steuersaetze_skr04(); } - print($form->parse_html_template("dbupgrade/" . - "std_buchungsgruppen_unknown_coa", - { "coa" => $coa })); + print($form->parse_html_template2("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa })); return 1; } -return update_steuersaetze(); \ No newline at end of file +return update_steuersaetze(); diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl index cc4780e1f..2a3dbe186 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl @@ -302,14 +302,14 @@ sub display_create_bgs_dialog { $entry->{"eur"} = $main::eur; } - # $form->parse_html_template("dbupgrade/buchungsgruppen_parts") - # $form->parse_html_template("dbupgrade/buchungsgruppen_services") - # $form->parse_html_template("dbupgrade/buchungsgruppen_assemblies") - - print($form->parse_html_template("dbupgrade/buchungsgruppen_${type}", - { "LIST" => $list, - "BUCHUNGSGRUPPEN" => $buchungsgruppen, - })); + # $form->parse_html_template2("dbupgrade/buchungsgruppen_parts") + # $form->parse_html_template2("dbupgrade/buchungsgruppen_services") + # $form->parse_html_template2("dbupgrade/buchungsgruppen_assemblies") + + print($form->parse_html_template2("dbupgrade/buchungsgruppen_${type}", + { "LIST" => $list, + "BUCHUNGSGRUPPEN" => $buchungsgruppen, + })); } sub create_buchungsgruppen { @@ -459,7 +459,7 @@ sub do_update { my ($acc_inventory, $acc_income, $acc_expense) = retrieve_accounts(); - print($form->parse_html_template("dbupgrade/buchungsgruppen_header")); + print($form->parse_html_template2("dbupgrade/buchungsgruppen_header")); if (scalar(@{$parts})) { display_create_bgs_dialog("parts", $parts, @@ -467,7 +467,7 @@ sub do_update { $buchungsgruppen); return 2; } else { - print($form->parse_html_template("dbupgrade/buchungsgruppen_parts_done")); + print($form->parse_html_template2("dbupgrade/buchungsgruppen_parts_done")); } if (scalar(@{$services})) { @@ -476,7 +476,7 @@ sub do_update { $buchungsgruppen); return 2; } else { - print($form->parse_html_template("dbupgrade/buchungsgruppen_services_done")); + print($form->parse_html_template2("dbupgrade/buchungsgruppen_services_done")); } if (scalar(@{$assemblies})) { @@ -485,10 +485,10 @@ sub do_update { $buchungsgruppen); return 2; } else { - print($form->parse_html_template("dbupgrade/buchungsgruppen_assemblies_done")); + print($form->parse_html_template2("dbupgrade/buchungsgruppen_assemblies_done")); } - print($form->parse_html_template("dbupgrade/buchungsgruppen_footer")); + print($form->parse_html_template2("dbupgrade/buchungsgruppen_footer")); return 1; } diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl index 09a0603f3..144875a9f 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl @@ -48,8 +48,8 @@ sub update_templates { if (@warnings) { @warnings = map(+{ "message" => $_ }, @warnings); - print($form->parse_html_template("dbupgrade/update_templates_warnings", - { "WARNINGS" => \@warnings })); + print($form->parse_html_template2("dbupgrade/update_templates_warnings", + { "WARNINGS" => \@warnings })); } return 1; diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html index da29ef7b5..331fedc86 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html @@ -1,16 +1,16 @@ -
Schritt 3 von 3: Erzeugnisse
+[% USE HTML %]
Schritt 3 von 3: Erzeugnisse
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]
Existierende Buchungsgruppen
@@ -18,62 +18,62 @@ Die folgenden Buchungsgruppen wurden bereits angelegt:
    - + [% FOREACH row = BUCHUNGSGRUPPEN %]
  • - : - Inventar: ; + [% HTML.escape(row.description) %]: + Inventar: [% row.inventory_accno %]; Erlöskonto/Aufwandskonto - Inand: /; + Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %]; Erlöskonto/Aufwandskonto - EU mit UstId-Nummer: /; + EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %]; Erlöskonto/Aufwandskonto - EU ohne UstId-Nummer: /; + EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %]; Erlöskonto/Aufwandskonto - Ausland: / + Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
    • -     + [% END %]

- -
Neue Buchungsgruppe
+ [% FOREACH row = LIST %] +
Neue Buchungsgruppe [% loop.count %]
- + - - - + [% IF row.eur %] + + [% ELSE %] - + [% END %] @@ -81,8 +81,8 @@ @@ -90,8 +90,8 @@ @@ -99,8 +99,8 @@ @@ -108,8 +108,8 @@ @@ -117,8 +117,8 @@ @@ -126,19 +126,19 @@
Beschreibung:
Inventar: - + [% FOREACH acc_row = ACC_INVENTORY %][% END %]
Erlöskonto Inand: - - -- + + [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
Aufwandskonto EU mit UstId-Nummer: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Erlöskonto EU mit UstId-Nummer: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Aufwandskonto EU mit UstId-Nummer: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Erlöskonto EU ohne UstId-Nummer: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Aufwandskonto EU ohne UstId-Nummer: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Erlöskonto Ausland: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Aufwandskonto Ausland: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
- - - + [% IF loop.last %] + + [% END %]
- + [% END %] diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html index 170c5a575..f3cc4d588 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html @@ -1,16 +1,16 @@ -
Step 3 of 3: Assemblies
+[% USE HTML %]
Step 3 of 3: Assemblies
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]
Existing Buchungsgruppen
@@ -18,62 +18,62 @@ The following Buchungsgruppen have already been created:
    - + [% FOREACH row = BUCHUNGSGRUPPEN %]
  • - : - Invetory: ; + [% HTML.escape(row.description) %]: + Inventory: [% row.inventory_accno %]; Income accno/Expense accno - National: /; + National: [% row.income_accno_0 %]/[% row.expense_accno_0 %]; Income accno/Expense accno - EU with VAT ID: /; + EU with VAT ID: [% row.income_accno_1 %]/[% row.expense_accno_1 %]; Income accno/Expense accno - EU without VAT ID: /; + EU without VAT ID: [% row.income_accno_2 %]/[% row.expense_accno_2 %]; Income accno/Expense accno - International: / + International: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
    • -     + [% END %]

- -
New Buchungsgruppe
+ [% FOREACH row = LIST %] +
New Buchungsgruppe [% loop.count %]
- + - - - + [% IF row.eur %] + + [% ELSE %] - + [% END %] @@ -81,8 +81,8 @@ @@ -90,8 +90,8 @@ @@ -99,8 +99,8 @@ @@ -108,8 +108,8 @@ @@ -117,8 +117,8 @@ @@ -126,19 +126,19 @@
Description:
Inventory: - + [% FOREACH acc_row = ACC_INVENTORY %][% END %]
Income accno National: - - -- + + [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
Expense accno EU with VAT ID: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Income accno EU with VAT ID: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Expense accno EU with VAT ID: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Income accno EU without VAT ID: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Expense accno EU without VAT ID: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Income accno International: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Expense accno International: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
- - - + [% IF loop.last %] + + [% END %]
- + [% END %] diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html index 593ffa627..225698e25 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html @@ -1,16 +1,16 @@ -
Schritt 1 von 3: Waren
+[% USE HTML %]
Schritt 1 von 3: Waren
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]
Existierende Buchungsgruppen
@@ -18,69 +18,69 @@ Die folgenden Buchungsgruppen wurden bereits angelegt:
    - + [% FOREACH row = BUCHUNGSGRUPPEN %]
  • - : - Inventar: ; + [% HTML.escape(row.description) %]: + Inventar: [% row.inventory_accno %]; Erlöskonto/Aufwandskonto - Inand: /; + Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %]; Erlöskonto/Aufwandskonto - EU mit UstId-Nummer: /; + EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %]; Erlöskonto/Aufwandskonto - EU ohne UstId-Nummer: /; + EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %]; Erlöskonto/Aufwandskonto - Ausland: / + Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
    • -     + [% END %]

- -
Neue Buchungsgruppe
+ [% FOREACH row = LIST %] +
Neue Buchungsgruppe [% loop.count %]
- + - - - + [% IF row.eur %] + + [% ELSE %] - + [% END %] @@ -88,8 +88,8 @@ @@ -97,8 +97,8 @@ @@ -106,8 +106,8 @@ @@ -115,8 +115,8 @@ @@ -124,19 +124,19 @@
Beschreibung:
Inventar: - - -- + + [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
Erlöskonto Inand: - - -- + + [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
Aufwandskonto Inand: - - -- + + [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
Erlöskonto EU mit UstId-Nummer: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Aufwandskonto EU mit UstId-Nummer: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Erlöskonto EU ohne UstId-Nummer: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Aufwandskonto EU ohne UstId-Nummer: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Erlöskonto Ausland: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Aufwandskonto Ausland: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
- - - + [% IF loop.last %] + + [% END %]
- + [% END %] diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html index 3ae56c94e..1d0f2d45f 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html @@ -1,16 +1,16 @@ -
Step 1 of 3: Parts
+[% USE HTML %]
Step 1 of 3: Parts
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]
Existing Buchungsgruppen
@@ -18,69 +18,69 @@ The following Buchungsgruppen have already been created:
    - + [% FOREACH row = BUCHUNGSGRUPPEN %]
  • - : - Invetory: ; + [% HTML.escape(row.description) %]: + Inventory: [% row.inventory_accno %]; Income accno/Expense accno - National: /; + National: [% row.income_accno_0 %]/[% row.expense_accno_0 %]; Income accno/Expense accno - EU with VAT ID: /; + EU with VAT ID: [% row.income_accno_1 %]/[% row.expense_accno_1 %]; Income accno/Expense accno - EU without VAT ID: /; + EU without VAT ID: [% row.income_accno_2 %]/[% row.expense_accno_2 %]; Income accno/Expense accno - International: / + International: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
    • -     + [% END %]

- -
New Buchungsgruppe
+ [% FOREACH row = LIST %] +
New Buchungsgruppe [% loop.count %]
- + - - - + [% IF row.eur %] + + [% ELSE %] - + [% END %] @@ -88,8 +88,8 @@ @@ -97,8 +97,8 @@ @@ -106,8 +106,8 @@ @@ -115,8 +115,8 @@ @@ -124,19 +124,19 @@
Description:
Inventory: - - -- + + [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
Income accno National: - - -- + + [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
Expense accno National: - - -- + + [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
Income accno EU with VAT ID: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Expense accno EU with VAT ID: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Income accno EU without VAT ID: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Expense accno EU without VAT ID: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Income accno International: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Expense accno International: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
- - - + [% IF loop.last %] + + [% END %]
- + [% END %] diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_de.html b/templates/webpages/dbupgrade/buchungsgruppen_services_de.html index 4489dbd66..b8353d5e9 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_services_de.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_services_de.html @@ -1,16 +1,16 @@ -
Schritt 2 von 3: Dienstleistungen
+[% USE HTML %]
Schritt 2 von 3: Dienstleistungen
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]
Existierende Buchungsgruppen
@@ -18,70 +18,70 @@ Die folgenden Buchungsgruppen wurden bereits angelegt:
    - + [% FOREACH row = BUCHUNGSGRUPPEN %]
  • - : - Inventar: ; + [% HTML.escape(row.description) %]: + Inventar: [% row.inventory_accno %]; Erlöskonto/Aufwandskonto - Inand: /; + Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %]; Erlöskonto/Aufwandskonto - EU mit UstId-Nummer: /; + EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %]; Erlöskonto/Aufwandskonto - EU ohne UstId-Nummer: /; + EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %]; Erlöskonto/Aufwandskonto - Ausland: / + Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
    • -     + [% END %]

- -
Neue Buchungsgruppe
+ [% FOREACH row = LIST %] +
Neue Buchungsgruppe [% loop.count %]
- + - - - + [% IF row.eur %] + + [% ELSE %] - + [% END %] @@ -89,8 +89,8 @@ @@ -98,8 +98,8 @@ @@ -107,8 +107,8 @@ @@ -116,8 +116,8 @@ @@ -125,19 +125,19 @@
Beschreibung:
Inventar: - + [% FOREACH acc_row = ACC_INVENTORY %][% END %]
Erlöskonto Inand: - - -- + + [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
Aufwandskonto Inand: - - -- + + [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
Erlöskonto EU mit UstId-Nummer: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Aufwandskonto EU mit UstId-Nummer: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Erlöskonto EU ohne UstId-Nummer: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Aufwandskonto EU ohne UstId-Nummer: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Erlöskonto Ausland: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Aufwandskonto Ausland: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
- - - + [% IF loop.last %] + + [% END %]
- + [% END %] diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html index 731fa8da7..235987845 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html @@ -1,16 +1,16 @@ -
Step 2 of 3: Services
+[% USE HTML %]
Step 2 of 3: Services
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]
Existing Buchungsgruppen
@@ -18,70 +18,70 @@ The following Buchungsgruppen have already been created:
    - + [% FOREACH row = BUCHUNGSGRUPPEN %]
  • - : - Invetory: ; + [% HTML.escape(row.description) %]: + Inventory: [% row.inventory_accno %]; Income accno/Expense accno - National: /; + National: [% row.income_accno_0 %]/[% row.expense_accno_0 %]; Income accno/Expense accno - EU with VAT ID: /; + EU with VAT ID: [% row.income_accno_1 %]/[% row.expense_accno_1 %]; Income accno/Expense accno - EU without VAT ID: /; + EU without VAT ID: [% row.income_accno_2 %]/[% row.expense_accno_2 %]; Income accno/Expense accno - International: / + International: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
    • -     + [% END %]

- -
New Buchungsgruppe
+ [% FOREACH row = LIST %] +
New Buchungsgruppe [% loop.count %]
- + - - - + [% IF row.eur %] + + [% ELSE %] - + [% END %] @@ -89,8 +89,8 @@ @@ -98,8 +98,8 @@ @@ -107,8 +107,8 @@ @@ -116,8 +116,8 @@ @@ -125,19 +125,19 @@
Description:
Inventory: - + [% FOREACH acc_row = ACC_INVENTORY %][% END %]
Income accno National: - - -- + + [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
Expense accno National: - - -- + + [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
Income accno EU with VAT ID: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Expense accno EU with VAT ID: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Income accno EU without VAT ID: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Expense accno EU without VAT ID: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
Income accno International: - + [% FOREACH acc_row = ACC_INCOME %][% END %]
Expense accno International: - + [% FOREACH acc_row = ACC_EXPENSE %][% END %]
- - - + [% IF loop.last %] + + [% END %]
- + [% END %] diff --git a/templates/webpages/dbupgrade/coa_guess_de.html b/templates/webpages/dbupgrade/coa_guess_de.html index 6379936b4..b93d1d721 100644 --- a/templates/webpages/dbupgrade/coa_guess_de.html +++ b/templates/webpages/dbupgrade/coa_guess_de.html @@ -1,15 +1,15 @@ -
Benutzten Kontenrahmen auswählen
+[% USE HTML %]
Benutzten Kontenrahmen auswählen
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]

Bitte wählen Sie den Kontenrahmen aus, der bei dieser Installation verwendet wird. @@ -17,7 +17,7 @@

Kontenrahmen: - +

diff --git a/templates/webpages/dbupgrade/coa_guess_master.html b/templates/webpages/dbupgrade/coa_guess_master.html index 2bc5acaec..656012bdd 100644 --- a/templates/webpages/dbupgrade/coa_guess_master.html +++ b/templates/webpages/dbupgrade/coa_guess_master.html @@ -1,15 +1,15 @@ -
Select the chart of accounts in use
+[% USE HTML %]
Select the chart of accounts in use
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]

Please select the chart of accounts this installation @@ -18,7 +18,7 @@

Chart of accounts: - +

diff --git a/templates/webpages/dbupgrade/error_de.html b/templates/webpages/dbupgrade/error_de.html index 77e8dcef0..ee37ea538 100644 --- a/templates/webpages/dbupgrade/error_de.html +++ b/templates/webpages/dbupgrade/error_de.html @@ -1,6 +1,6 @@ -

Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei enthielt den folgenden Fehler: +[% USE HTML %]

Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei [% HTML.escape(file) %] enthielt den folgenden Fehler:
- + [% error %]
Alle Änderungen in dieser Datei wurden rückgängig gemacht.

diff --git a/templates/webpages/dbupgrade/error_master.html b/templates/webpages/dbupgrade/error_master.html index f9a5e7696..ca99d400a 100644 --- a/templates/webpages/dbupgrade/error_master.html +++ b/templates/webpages/dbupgrade/error_master.html @@ -1,6 +1,6 @@ -

The database update/creation did not succeed. The file contained the following error: +[% USE HTML %]

The database update/creation did not succeed. The file [% HTML.escape(file) %] contained the following error:
- + [% error %]
All changes in that file have been reverted.

diff --git a/templates/webpages/dbupgrade/footer_de.html b/templates/webpages/dbupgrade/footer_de.html index 4230911a0..7db7cf981 100644 --- a/templates/webpages/dbupgrade/footer_de.html +++ b/templates/webpages/dbupgrade/footer_de.html @@ -1,9 +1,9 @@ -

...fertig

+[% USE HTML %]

...fertig

- + - - + +

diff --git a/templates/webpages/dbupgrade/footer_master.html b/templates/webpages/dbupgrade/footer_master.html index c26603f18..b89531f3e 100644 --- a/templates/webpages/dbupgrade/footer_master.html +++ b/templates/webpages/dbupgrade/footer_master.html @@ -1,9 +1,9 @@ -

...done

+[% USE HTML %]

...done

- + - - + +

diff --git a/templates/webpages/dbupgrade/header_de.html b/templates/webpages/dbupgrade/header_de.html index 90ca9360d..112eea4cd 100644 --- a/templates/webpages/dbupgrade/header_de.html +++ b/templates/webpages/dbupgrade/header_de.html @@ -1,7 +1,7 @@ - +[% USE HTML %] - +
Datenbankaktualisierung ()Datenbankaktualisierung ([% HTML.escape(dbname) %])
diff --git a/templates/webpages/dbupgrade/header_master.html b/templates/webpages/dbupgrade/header_master.html index ced681327..77dc972b9 100644 --- a/templates/webpages/dbupgrade/header_master.html +++ b/templates/webpages/dbupgrade/header_master.html @@ -1,7 +1,7 @@ - +[% USE HTML %] - +
Dataset upgrade ()Dataset upgrade ([% HTML.escape(dbname) %])
diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html index 9924d54d1..564d0d4d4 100644 --- a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html +++ b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html @@ -1,20 +1,19 @@ -
Unbekannter Kontenrahmen
+[% USE HTML %]
Unknown chart of accounts
- - - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]

- Hinweis: - Diese Installation benutzt einen unbekannten Kontenrahmen (""). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen. + Note: + This installation uses an unknown chart of accounts ("[% HTML.escape(coa) %]"). This database upgrade cannot create standard buchungsgruppen automatically.

diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html index b79945373..ea4424062 100644 --- a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html +++ b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html @@ -1,20 +1,20 @@ -
Unknown chart of accounts
+[% USE HTML %]
Unknown chart of accounts
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]

Note: This installation uses an unknown chart of accounts - (""). This database upgrade + ("[% HTML.escape(coa) %]"). This database upgrade cannot create standard buchungsgruppen automatically.

diff --git a/templates/webpages/dbupgrade/units_error_de.html b/templates/webpages/dbupgrade/units_error_de.html index 67a0932d3..aa3f94618 100644 --- a/templates/webpages/dbupgrade/units_error_de.html +++ b/templates/webpages/dbupgrade/units_error_de.html @@ -1,4 +1,4 @@ -

Fehler:

+[% USE HTML %]

Fehler: [% message %]

diff --git a/templates/webpages/dbupgrade/units_error_master.html b/templates/webpages/dbupgrade/units_error_master.html index d62657e88..53578e2f6 100644 --- a/templates/webpages/dbupgrade/units_error_master.html +++ b/templates/webpages/dbupgrade/units_error_master.html @@ -1,4 +1,4 @@ -

Error:

+[% USE HTML %]

Error: [% message %]

diff --git a/templates/webpages/dbupgrade/units_parts_de.html b/templates/webpages/dbupgrade/units_parts_de.html index 663088f11..f1af5f330 100644 --- a/templates/webpages/dbupgrade/units_parts_de.html +++ b/templates/webpages/dbupgrade/units_parts_de.html @@ -1,16 +1,16 @@ -
Schritt 1 von 3: Waren
+[% USE HTML %]
Schritt 1 von 3: Waren
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]
Einheit hinzufügen
@@ -20,7 +20,7 @@

Die folgenden Einheiten existieren bereits: - ; + [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]

@@ -34,7 +34,7 @@ Basiseinheit @@ -61,19 +61,19 @@ Neue Einheit - - + [% FOREACH row = UNKNOWN_PART_UNITS %] + - - + [% HTML.escape(row.name) %] + - + [% FOREACH row_new = row.NEW_UNITS %][% END %] - - + [% IF loop.last %][% END %] + [% END %] diff --git a/templates/webpages/dbupgrade/units_parts_master.html b/templates/webpages/dbupgrade/units_parts_master.html index 1d8f41269..a7737b962 100644 --- a/templates/webpages/dbupgrade/units_parts_master.html +++ b/templates/webpages/dbupgrade/units_parts_master.html @@ -1,16 +1,16 @@ -
Step 1 of 3: Parts
+[% USE HTML %]
Step 1 of 3: Parts
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]
Add unit
@@ -26,7 +26,7 @@

The following units exist already: - ; + [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]

@@ -40,7 +40,7 @@ Base unit @@ -67,19 +67,19 @@ New unit - - + [% FOREACH row = UNKNOWN_PART_UNITS %] + - - + [% HTML.escape(row.name) %] + - + [% FOREACH row_new = row.NEW_UNITS %][% END %] - - + [% IF loop.last %][% END %] + [% END %] diff --git a/templates/webpages/dbupgrade/units_services_de.html b/templates/webpages/dbupgrade/units_services_de.html index 99a0858aa..d11561760 100644 --- a/templates/webpages/dbupgrade/units_services_de.html +++ b/templates/webpages/dbupgrade/units_services_de.html @@ -1,16 +1,16 @@ -
Schritt 2 von 3: Dienstleistungen
+[% USE HTML %]
Schritt 2 von 3: Dienstleistungen
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]
Einheit hinzufügen
@@ -20,7 +20,7 @@

Die folgenden Einheiten existieren bereits: - ; + [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]

@@ -34,7 +34,7 @@ Basiseinheit @@ -61,19 +61,19 @@ Neue Einheit - - + [% FOREACH row = UNKNOWN_PART_UNITS %] + - - + [% HTML.escape(row.name) %] + - + [% FOREACH row_new = row.NEW_UNITS %][% END %] - - + [% IF loop.last %][% END %] + [% END %] diff --git a/templates/webpages/dbupgrade/units_services_master.html b/templates/webpages/dbupgrade/units_services_master.html index 9622469b1..623714673 100644 --- a/templates/webpages/dbupgrade/units_services_master.html +++ b/templates/webpages/dbupgrade/units_services_master.html @@ -1,16 +1,16 @@ -
Step 2 of 3: Services
+[% USE HTML %]
Step 2 of 3: Services
- - + + - -

- + [% IF saved_message %] +

[% saved_message %]

+ [% END %]
Add unit
@@ -26,7 +26,7 @@

The following units exist already: - ; + [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]

@@ -40,7 +40,7 @@ Base unit @@ -67,19 +67,19 @@ New unit - - + [% FOREACH row = UNKNOWN_PART_UNITS %] + - - + [% HTML.escape(row.name) %] + - + [% FOREACH row_new = row.NEW_UNITS %][% END %] - - + [% IF loop.last %][% END %] + [% END %] diff --git a/templates/webpages/dbupgrade/units_set_default_de.html b/templates/webpages/dbupgrade/units_set_default_de.html index 6b0b1e273..7b59444d5 100644 --- a/templates/webpages/dbupgrade/units_set_default_de.html +++ b/templates/webpages/dbupgrade/units_set_default_de.html @@ -1,9 +1,9 @@ -
Schritt 3 von 3: Standardeinheiten
+[% USE HTML %]
Schritt 3 von 3: Standardeinheiten
- - + + @@ -18,7 +18,7 @@ Maßeinheit: @@ -27,7 +27,7 @@ Dienstleistungseinheit: diff --git a/templates/webpages/dbupgrade/units_set_default_master.html b/templates/webpages/dbupgrade/units_set_default_master.html index bed20b824..655d45b53 100644 --- a/templates/webpages/dbupgrade/units_set_default_master.html +++ b/templates/webpages/dbupgrade/units_set_default_master.html @@ -1,9 +1,9 @@ -
Step 3 of 3: Default units
+[% USE HTML %]
Step 3 of 3: Default units
- - + + @@ -20,7 +20,7 @@ Dimension unit: @@ -29,7 +29,7 @@ Service unit: diff --git a/templates/webpages/dbupgrade/update_templates_warnings_de.html b/templates/webpages/dbupgrade/update_templates_warnings_de.html index 3580e61dd..4b8f00ba5 100644 --- a/templates/webpages/dbupgrade/update_templates_warnings_de.html +++ b/templates/webpages/dbupgrade/update_templates_warnings_de.html @@ -1,11 +1,11 @@ -
Warnungen bei Aktualisierung der Dokumentenvorlagen
+[% USE HTML %]
Warnungen bei Aktualisierung der Dokumentenvorlagen

Die folgenden Warnungen traten während einer Aktualisierung der Dokumentenvorlagen auf:

    - -
    • -     + [% FOREACH row = WARNINGS %] +
  • [% row.message %]
    • + [% END %]

diff --git a/templates/webpages/dbupgrade/update_templates_warnings_master.html b/templates/webpages/dbupgrade/update_templates_warnings_master.html index addda81a4..69e20ef60 100644 --- a/templates/webpages/dbupgrade/update_templates_warnings_master.html +++ b/templates/webpages/dbupgrade/update_templates_warnings_master.html @@ -1,12 +1,12 @@ -
Warnings during template upgrade
+[% USE HTML %]
Warnings during template upgrade

The following warnings occured during an upgrade to the document templates:

    - -
    • -     + [% FOREACH row = WARNINGS %] +
  • [% row.message %]
    • + [% END %]

diff --git a/templates/webpages/dbupgrade/upgrade_message2_de.html b/templates/webpages/dbupgrade/upgrade_message2_de.html index 3bf47b734..2c2f57f6c 100644 --- a/templates/webpages/dbupgrade/upgrade_message2_de.html +++ b/templates/webpages/dbupgrade/upgrade_message2_de.html @@ -1,4 +1,4 @@ -
    -
  • Führe aus:
    • +[% USE HTML %]
      +
    • Führe [% HTML.escape(file) %] aus: [% description %]
    diff --git a/templates/webpages/dbupgrade/upgrade_message2_master.html b/templates/webpages/dbupgrade/upgrade_message2_master.html index c5718e13f..f7aedd185 100644 --- a/templates/webpages/dbupgrade/upgrade_message2_master.html +++ b/templates/webpages/dbupgrade/upgrade_message2_master.html @@ -1,4 +1,4 @@ -
      -
    • Applying :
      • +[% USE HTML %]
        +
      • Applying [% HTML.escape(file) %]: [% description %]
      diff --git a/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html b/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html index d62657e88..53578e2f6 100644 --- a/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html +++ b/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html @@ -1,4 +1,4 @@ -

      Error:

      +[% USE HTML %]

      Error: [% message %]

      diff --git a/templates/webpages/dbupgrade/warning_de.html b/templates/webpages/dbupgrade/warning_de.html index b2600bc1a..7f926dbc9 100644 --- a/templates/webpages/dbupgrade/warning_de.html +++ b/templates/webpages/dbupgrade/warning_de.html @@ -1,11 +1,11 @@ - +[% USE HTML %] - - + +

      - Lx-Office wird gleich die Datenbank aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umständen nicht umkehrbar ist. + Lx-Office wird gleich die Datenbank [% HTML.escape(dbname) %] aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umständen nicht umkehrbar ist.

      diff --git a/templates/webpages/dbupgrade/warning_master.html b/templates/webpages/dbupgrade/warning_master.html index ac00dd4ad..160c236b5 100644 --- a/templates/webpages/dbupgrade/warning_master.html +++ b/templates/webpages/dbupgrade/warning_master.html @@ -1,12 +1,12 @@ - +[% USE HTML %] - - + +

      Lx-Office is about to update the - database . You should create a + database [% HTML.escape(dbname) %]. You should create a backup of the database before proceeding because the backup might not be reversible.

      -- 2.20.1