From 1de53cbf8a926ae3ae89bc5466ab660df82484b2 Mon Sep 17 00:00:00 2001 From: Sven Donath Date: Mon, 23 Aug 2010 15:29:46 +0200 Subject: [PATCH] =?utf8?q?Bugfix=20for=20Bug=201468:=20JavaScript-Title=5F?= =?utf8?q?Hack=20lieferte=20falsche=20oder=20sinnlose=20Titel=20und=20viel?= =?utf8?q?e=20weitere.=20Wenn=20der=20Title-String=20leer=20ist,=20wird=20?= =?utf8?q?mein=20Title-Hack-JavaScritpt=20hicht=20ausgegeben.=20Dadurch=20?= =?utf8?q?wird=20der=20Titel=20des=20Frameset=20angezeicgt.=20Massenhaft?= =?utf8?q?=20Strings=20angepasst.=20Teilweise=20der=20Logik=20wegen,=20oft?= =?utf8?q?=20wegen=20"german=20Umlauts"-Problemen.=20Teilweise=20wegen=20T?= =?utf8?q?ipp-=20und=20copy&past-Fehlern.=20Dateien=20repariert,=20die=20d?= =?utf8?q?en=20Titel=20nicht=20gesetzt=20haben.=20Bundesl=C3=A4nder=20mit?= =?utf8?q?=20Bindestrichen=20versehen.=20Finanzamt=20-=20Daten=20f=C3=BCr?= =?utf8?q?=20Bundesl=C3=A4nder=20mit=20f=C3=BChrender=20Null=20in=20der=20?= =?utf8?q?PLZ=20repariert.=20Das=20Feld=20PLZ=20ist=20Typ=20Text,=20aber?= =?utf8?q?=20jemand=20muss=20es=20beim=20Exportieren/Importieren=20als=20Z?= =?utf8?q?ahl=20gehandhabt=20haben.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Form.pm | 23 +++-- SL/USTVA.pm | 12 +-- bin/mozilla/ic.pl | 6 +- bin/mozilla/licenses.pl | 4 + bin/mozilla/login.pl | 2 +- bin/mozilla/ustva.pl | 2 + bin/mozilla/wh.pl | 6 +- locale/de/all | 13 +-- locale/en/all | 16 +-- locale/en/charset | 1 + locale/en/lost | 16 +-- scripts/locales.pl | 2 +- sql/Pg-upgrade/Pg-upgrade-2.1.0-2.1.1.sql | 60 +++++------ sql/finanzamt.sql | 48 ++++----- sql/lx-office.sql | 116 +++++++++++----------- templates/webpages/wh/journal_filter.html | 2 +- templates/webpages/wh/report_filter.html | 2 +- 17 files changed, 174 insertions(+), 157 deletions(-) create mode 100644 locale/en/charset diff --git a/SL/Form.pm b/SL/Form.pm index 55b6f695d..fbd1d8554 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -672,15 +672,20 @@ sub header { | if $self->{"fokus"}; - my $title_hack = qq| - - |; - + # if there is a title, we put some JavaScript in to the page, wich writes a + # meaningful title-tag for our frameset. + my $title_hack; + if ($self->{"title"}){ + $title_hack = qq| + + |; + } + #Set Calendar my $jsscript = ""; if ($self->{jsscript} == 1) { diff --git a/SL/USTVA.pm b/SL/USTVA.pm index 84a8a96e0..483d12aa1 100644 --- a/SL/USTVA.pm +++ b/SL/USTVA.pm @@ -32,21 +32,21 @@ use SL::DBUtils; use strict; my @tax_office_information = ( - { 'id' => 8, 'name' => 'Baden Württemberg', 'taxbird_nr' => '0', 'elster_format' => 'FF/BBB/UUUUP', }, + { 'id' => 8, 'name' => 'Baden-Württemberg', 'taxbird_nr' => '0', 'elster_format' => 'FF/BBB/UUUUP', }, { 'id' => 9, 'name' => 'Bayern', 'taxbird_nr' => '1', 'elster_format' => 'FFF/BBB/UUUUP', }, { 'id' => 11, 'name' => 'Berlin', 'taxbird_nr' => '2', 'elster_format' => 'FF/BBB/UUUUP', }, { 'id' => 12, 'name' => 'Brandenburg', 'taxbird_nr' => '3', 'elster_format' => 'FFF/BBB/UUUUP', }, { 'id' => 4, 'name' => 'Bremen', 'taxbird_nr' => '4', 'elster_format' => 'FF BBB UUUUP', }, { 'id' => 2, 'name' => 'Hamburg', 'taxbird_nr' => '5', 'elster_format' => 'FF/BBB/UUUUP', }, { 'id' => 6, 'name' => 'Hessen', 'taxbird_nr' => '6', 'elster_format' => '0FF BBB UUUUP', }, - { 'id' => 13, 'name' => 'Mecklenburg Vorpommern', 'taxbird_nr' => '7', 'elster_format' => 'FFF/BBB/UUUUP', }, + { 'id' => 13, 'name' => 'Mecklenburg-Vorpommern', 'taxbird_nr' => '7', 'elster_format' => 'FFF/BBB/UUUUP', }, { 'id' => 3, 'name' => 'Niedersachsen', 'taxbird_nr' => '8', 'elster_format' => 'FF/BBB/UUUUP', }, - { 'id' => 5, 'name' => 'Nordrhein Westfalen', 'taxbird_nr' => '9', 'elster_format' => 'FFF/BBBB/UUUP', }, - { 'id' => 7, 'name' => 'Rheinland Pfalz', 'taxbird_nr' => '10', 'elster_format' => 'FF/BBB/UUUU/P', }, + { 'id' => 5, 'name' => 'Nordrhein-Westfalen', 'taxbird_nr' => '9', 'elster_format' => 'FFF/BBBB/UUUP', }, + { 'id' => 7, 'name' => 'Rheinland-Pfalz', 'taxbird_nr' => '10', 'elster_format' => 'FF/BBB/UUUU/P', }, { 'id' => 10, 'name' => 'Saarland', 'taxbird_nr' => '11', 'elster_format' => 'FFF/BBB/UUUUP', }, { 'id' => 14, 'name' => 'Sachsen', 'taxbird_nr' => '12', 'elster_format' => 'FFF/BBB/UUUUP', }, - { 'id' => 15, 'name' => 'Sachsen Anhalt', 'taxbird_nr' => '13', 'elster_format' => 'FFF/BBB/UUUUP', }, - { 'id' => 1, 'name' => 'Schleswig Holstein', 'taxbird_nr' => '14', 'elster_format' => 'FF BBB UUUUP', }, + { 'id' => 15, 'name' => 'Sachsen-Anhalt', 'taxbird_nr' => '13', 'elster_format' => 'FFF/BBB/UUUUP', }, + { 'id' => 1, 'name' => 'Schleswig-Holstein', 'taxbird_nr' => '14', 'elster_format' => 'FF BBB UUUUP', }, { 'id' => 16, 'name' => 'Thüringen', 'taxbird_nr' => '15', 'elster_format' => 'FFF/BBB/UUUUP', }, ); diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 5c9b5508a..c5fddcce1 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -78,7 +78,7 @@ sub add { $auth->assert('part_service_assembly_edit'); - $form->{title} = $locale->text('Add ' . ucfirst $form->{item}); + $form->{title} = $locale->text('Add' . ucfirst $form->{item}); $form->{callback} = "$form->{script}?action=add&item=$form->{item}" unless $form->{callback}; $form->{unit_changeable} = 1; @@ -127,6 +127,8 @@ sub search_update_prices { my $pricegroups = IC->get_pricegroups(\%myconfig, \%$form); + $form->{title} = $locale->text('Update Prices'); + $form->header; print $form->parse_html_template('ic/search_update_prices', { PRICE_ROWS => $pricegroups }); @@ -1417,7 +1419,7 @@ sub edit { $form->{"original_partnumber"} = $form->{"partnumber"}; - $form->{title} = $locale->text('Edit ' . ucfirst $form->{item}); + $form->{title} = $locale->text('Edit' . ucfirst $form->{item}); &link_part; &display_form; diff --git a/bin/mozilla/licenses.pl b/bin/mozilla/licenses.pl index 49022059f..95f520ff9 100644 --- a/bin/mozilla/licenses.pl +++ b/bin/mozilla/licenses.pl @@ -323,6 +323,8 @@ sub add { my $form = $main::form; my $locale = $main::locale; + $form->{title} = $locale->text('Add License'); + if (!$main::lizenzen) { $form->error( $locale->text( @@ -514,6 +516,8 @@ sub search { my $form = $main::form; my $locale = $main::locale; + $form->{title} = $locale->text('Licenses'); + if (!$main::lizenzen) { $form->error( $locale->text( diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl index 072432aff..5ecc695d5 100644 --- a/bin/mozilla/login.pl +++ b/bin/mozilla/login.pl @@ -162,7 +162,7 @@ sub company_logo { $form->{todo_list} = create_todo_list('login_screen' => 1) if (!$form->{no_todo_list}); $form->{stylesheet} = $myconfig{stylesheet}; - $form->{title} = $::locale->text('About'); + $form->{title} = $::locale->text('Lx-Office'); # create the logo screen $form->header() unless $form->{noheader}; diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index 945de31a1..e255717a0 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -1066,6 +1066,8 @@ sub config_step1 { $auth->assert('advance_turnover_tax_return'); +$form->{title} = $locale->text('Tax Office Preferences'); + # edit all taxauthority prefs $form->header; diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl index 26f22cef6..3857672e3 100644 --- a/bin/mozilla/wh.pl +++ b/bin/mozilla/wh.pl @@ -635,7 +635,9 @@ sub journal { my $form = $main::form; my %myconfig = %main::myconfig; + my $locale = $main::locale; + $form->{title} = $locale->text('Report about warehouse transactions'); $form->get_lists('warehouses' => { 'key' => 'WAREHOUSES', 'bins' => 'BINS', }); @@ -790,7 +792,7 @@ sub report { # $form->{fokus} = "partnumber"; # $form->{onload} .= "focus();"; - $form->{title} = $locale->text("Report about wareouse contents"); + $form->{title} = $locale->text("Report about warehouse contents"); $form->header(); print $form->parse_html_template("wh/report_filter", @@ -810,7 +812,7 @@ sub generate_report { my %myconfig = %main::myconfig; my $locale = $main::locale; - $form->{title} = $locale->text("Report about wareouse contents"); + $form->{title} = $locale->text("Report about warehouse contents"); $form->{sort} ||= 'partnumber'; my $sort_col = $form->{sort}; diff --git a/locale/de/all b/locale/de/all index 7f2041bc6..ebb1f81eb 100644 --- a/locale/de/all +++ b/locale/de/all @@ -59,7 +59,6 @@ $self->{texts} = { 'AR Transaction (abbreviation)' => 'D', 'AR Transactions' => 'Debitorenbuchungen', 'ASSETS' => 'AKTIVA', - 'About' => 'über', 'Abrechnungsnummer' => 'Abrechnungsnummer', 'Abteilung' => 'Abteilung', 'Account' => 'Konto', @@ -105,7 +104,6 @@ $self->{texts} = { 'Active' => 'Aktiv', 'Active?' => 'Aktiviert?', 'Add' => 'Erfassen', - 'Add ' => 'Hinzufügen', 'Add AP Transaction' => 'Kreditorenbuchung', 'Add AR Transaction' => 'Debitorenbuchung', 'Add Account' => 'Konto erfassen', @@ -606,9 +604,8 @@ $self->{texts} = { 'EUR' => 'E/Ü-Rechnung', 'Earlier versions of Lx-Office contained bugs which might have led to wrong entries in the general ledger.' => 'Frühere Versionen von Lx-Office enthielten Bugs, die zu falschen Einträgen im Hauptbuch geführt haben können.', 'Edit' => 'Bearbeiten', - 'Edit ' => 'Bearbeiten', 'Edit Access Rights' => 'Zugriffsrechte bearbeiten', - 'Edit Access Rights for Follow-Ups' => 'Zugriffsrechte für Wiedervorlagen bearbeiten', + 'Edit Access Rights for Follow-Ups' => 'Zugriff auf meine Wiedervorlagen regeln', 'Edit Account' => 'Kontodaten bearbeiten', 'Edit Accounting Group' => 'Buchungsgruppe bearbeiten', 'Edit Accounts Payables Transaction' => 'Kreditorenbuchung bearbeiten', @@ -630,7 +627,7 @@ $self->{texts} = { 'Edit Lead' => 'Kundenquelle bearbeiten', 'Edit Part' => 'Ware bearbeiten', 'Edit Payment Terms' => 'Zahlungskonditionen bearbeiten', - 'Edit Preferences for #1' => 'Einstellungen für #1 bearbeiten', + 'Edit Preferences for #1' => 'Einstellungen von #1 bearbeiten', 'Edit Price Factor' => 'Preisfaktor bearbeiten', 'Edit Pricegroup' => 'Preisgruppe bearbeiten', 'Edit Printer' => 'Drucker bearbeiten', @@ -1330,8 +1327,8 @@ $self->{texts} = { 'Removing marked entries from queue ...' => 'Markierte Einträge werden von der Warteschlange entfernt ...', 'Rename the group' => 'Gruppe umbenennen', 'Report Positions' => 'Berichte', - 'Report about wareouse contents' => 'Bericht über eingelagerte Waren', - 'Report about wareouse transactions' => 'Bericht über Lagerbewegungen', + 'Report about warehouse contents' => 'Lagerbestand anzeigen', + 'Report about warehouse transactions' => 'Lagerbewegungen anzeigen', 'Report and misc. Preferences' => 'Sonstige Einstellungen', 'Report for' => 'Bericht für', 'Reports' => 'Berichte', @@ -1739,7 +1736,7 @@ $self->{texts} = { 'Transfer out' => 'Auslagern', 'Transfer qty' => 'Umlagermenge', 'Translation (%s)' => 'Übersetzung (%s)', - 'Trial Balance' => 'Summen- u. Saldenliste', + 'Trial Balance' => 'Summen- und Saldenliste', 'Trial balance between %s and %s' => 'Summen- und Saldenlisten vom %s bis zum %s', 'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.', 'Type' => 'Typ', diff --git a/locale/en/all b/locale/en/all index c2f763fff..87a3b8ef0 100644 --- a/locale/en/all +++ b/locale/en/all @@ -1,4 +1,6 @@ #!/usr/bin/perl +# -*- coding: ISO-8859-15; -*- +# vim: fenc=ISO-8859-15 # These are all the texts to build the translations files. # The file has the form of 'english text' => 'foreign text', @@ -57,7 +59,6 @@ $self->{texts} = { 'AR Transaction (abbreviation)' => '', 'AR Transactions' => 'Sales Transactions', 'ASSETS' => '', - 'About' => '', 'Abrechnungsnummer' => '', 'Abteilung' => '', 'Account' => '', @@ -99,12 +100,10 @@ $self->{texts} = { 'Account saved!' => '', 'Accounting Group deleted!' => '', 'Accounting Group saved!' => '', - 'Accounting Menu' => '', 'Accrual' => '', 'Active' => '', 'Active?' => '', 'Add' => '', - 'Add ' => '', 'Add AP Transaction' => '', 'Add AR Transaction' => '', 'Add Account' => '', @@ -343,6 +342,7 @@ $self->{texts} = { 'Cash' => '', 'Cc' => '', 'Change Lx-Office installation settings (all menu entries beneath \'System\')' => '', + 'Change representative to' => '', 'Charge Number' => '', 'Charge number' => '', 'Chart' => '', @@ -603,7 +603,6 @@ $self->{texts} = { 'EUR' => '', 'Earlier versions of Lx-Office contained bugs which might have led to wrong entries in the general ledger.' => '', 'Edit' => '', - 'Edit ' => '', 'Edit Access Rights' => '', 'Edit Access Rights for Follow-Ups' => '', 'Edit Account' => '', @@ -959,8 +958,10 @@ $self->{texts} = { 'Login Name' => '', 'Login name missing!' => '', 'Logout' => '', + 'Logout now' => '', 'Long Dates' => '', 'Long Description' => '', + 'Lx-Office' => '', 'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' => '', 'Lx-Office can fix these problems automatically.' => '', 'Lx-Office has been switched to group-based access restrictions.' => '', @@ -990,6 +991,7 @@ $self->{texts} = { 'May set the BCC field when sending emails' => '', 'Medium Number' => '', 'Memo' => '', + 'Menu' => '', 'Message' => '', 'Method' => '', 'Microfiche' => '', @@ -1324,8 +1326,8 @@ $self->{texts} = { 'Removing marked entries from queue ...' => '', 'Rename the group' => '', 'Report Positions' => '', - 'Report about wareouse contents' => '', - 'Report about wareouse transactions' => '', + 'Report about warehouse contents' => '', + 'Report about warehouse transactions' => '', 'Report and misc. Preferences' => '', 'Report for' => '', 'Reports' => '', @@ -1484,6 +1486,7 @@ $self->{texts} = { 'Sum per' => '', 'Summen- und Saldenliste' => '', 'Superuser name' => '', + 'Switch Menu on / off' => '', 'System' => '', 'TODO list' => '', 'TODO list options' => '', @@ -1924,7 +1927,6 @@ $self->{texts} = { 'cp_greeting to cp_gender migration' => '', 'customer' => '', 'customer_list' => '', - 'customernumber not unique!' => '', 'debug' => '', 'delete' => '', 'deliverydate' => '', diff --git a/locale/en/charset b/locale/en/charset new file mode 100644 index 000000000..208bac853 --- /dev/null +++ b/locale/en/charset @@ -0,0 +1 @@ +ISO-8859-15 diff --git a/locale/en/lost b/locale/en/lost index 4178095ed..747f02a58 100644 --- a/locale/en/lost +++ b/locale/en/lost @@ -1,14 +1,11 @@ #!/usr/bin/perl +# -*- coding: ISO-8859-15; -*- +# vim: fenc=ISO-8859-15 -# The last 50 texts that have been removed. -# This file will be auto-generated by locales.pl. Do not edit it. +# The last 50 text strings, that have been removed. +# This file has been auto-generated by locales.pl. Please don't edit! @lost = ( - { 'text' => 'GIFI deleted!', 'translation' => '' }, - { 'text' => 'Assemblies restocked!', 'translation' => '' }, - { 'text' => 'Amount does not equal applied!', 'translation' => '' }, - { 'text' => 'Post as new', 'translation' => '' }, - { 'text' => 'Amount missing!', 'translation' => '' }, { 'text' => 'Edit Template', 'translation' => '' }, { 'text' => 'Applied', 'translation' => '' }, { 'text' => 'Paid in full', 'translation' => '' }, @@ -54,6 +51,11 @@ { 'text' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.', 'translation' => '' }, { 'text' => 'Warehouse MIgration', 'translation' => '' }, { 'text' => 'WEBDAV access', 'translation' => '' }, + { 'text' => 'customernumber not unique!', 'translation' => '' }, + { 'text' => 'Accounting Menu', 'translation' => '' }, + { 'text' => 'Edit ', 'translation' => '' }, + { 'text' => 'About', 'translation' => '' }, + { 'text' => 'Add ', 'translation' => '' }, ); 1; diff --git a/scripts/locales.pl b/scripts/locales.pl index 21f424555..24b06877f 100755 --- a/scripts/locales.pl +++ b/scripts/locales.pl @@ -161,7 +161,7 @@ EOL EOL $LOST_HEADER = < -
[% 'Report about wareouse transactions' | $T8 %]
+
[% 'Report about warehouse transactions' | $T8 %]
diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html index e0ef8872a..affe4c265 100644 --- a/templates/webpages/wh/report_filter.html +++ b/templates/webpages/wh/report_filter.html @@ -63,7 +63,7 @@ --> -
[% 'Report about wareouse contents' | $T8 %]
+
[% 'Report about warehouse contents' | $T8 %]
-- 2.20.1