From 008c2e1529744e195616ac2cbf7736f06a90816e Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 27 Nov 2012 10:54:02 +0100 Subject: [PATCH] =?utf8?q?Lx-Office=20hei=C3=9Ft=20nun=20kivitendo?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Auth.pm | 4 ++-- SL/Controller/Base.pm | 2 +- SL/DATEV.pm | 4 ++-- SL/DB/Helper/ALL.pm | 2 +- SL/DB/Helper/ALLAuth.pm | 2 +- SL/DBUtils.pm | 4 ++-- SL/FCGIFixes.pm | 2 +- SL/Form.pm | 4 ++-- SL/Helper/DateTime.pm | 4 ++-- SL/InstanceConfiguration.pm | 2 +- SL/LXDebug.pm | 6 +++--- SL/Locale.pm | 2 +- SL/MoreCommon.pm | 2 +- SL/RecordLinks.pm | 2 +- SL/ReportGenerator.pm | 4 ++-- SL/Request.pm | 2 +- SL/SessionFile.pm | 2 +- SL/Template/Plugin/HTMLFixes.pm | 2 +- SL/USTVA.pm | 2 +- bin/mozilla/admin.pl | 2 +- bin/mozilla/datev.pl | 2 +- bin/mozilla/do.pl | 2 +- bin/mozilla/gl.pl | 3 ++- bin/mozilla/installationcheck.pl | 4 ++-- bin/mozilla/oe.pl | 2 +- bin/mozilla/ustva.pl | 3 +-- css/Mobile/main.css | 3 +-- css/lx-office-erp/main.css | 2 +- doc/online/de/add_project.pod | 2 +- locale/de/all | 22 ++++++++++---------- olcom/erpexport.php | 2 +- olcom/olcomexport.php | 2 +- olcom/shopimport_db.php | 2 +- olcom/trans.php | 2 +- oscom/erpexport.php | 2 +- oscom/oscomexport.php | 2 +- oscom/shopimport_db.php | 2 +- oscom/trans.php | 2 +- pepper/erpexport.php | 2 +- pepper/export_to_erp/export_to_erp.php | 2 +- pepper/export_to_erp/initialize_module.php | 2 +- pepper/pepperexport.php | 2 +- pepper/shopimport_db.php | 2 +- pepper/trans.php | 2 +- scripts/console | 6 +++--- scripts/dbupgrade2_tool.pl | 2 +- scripts/find-use.pl | 4 +--- scripts/installation_check.pl | 12 +++++------ scripts/locales.pl | 2 +- scripts/rose_auto_create_model.pl | 2 +- sql/Pg-upgrade2/USTVA_abstraction.pl | 2 +- sql/Pg-upgrade2/defaults_posting_config.pl | 2 +- sql/Pg-upgrade2/defaults_show_bestbefore.pl | 2 +- sql/Pg-upgrade2/umstellung_eur.pl | 2 +- templates/print/French/winston.xml | 2 +- templates/print/RB/winston.xml | 2 +- templates/print/Service/winston.xml | 2 +- templates/print/Standard/winston.xml | 2 +- templates/print/f-tex/winston.xml | 2 +- templates/webpages/admin/create_dataset.html | 2 +- templates/webpages/admin/user_migration.html | 2 +- xtcom/erpexport.php | 2 +- xtcom/shopimport_db.php | 4 ++-- xtcom/trans.php | 2 +- xtcom/xtcomexport.php | 2 +- 65 files changed, 93 insertions(+), 96 deletions(-) diff --git a/SL/Auth.pm b/SL/Auth.pm index e4d487b78..d0e8c9ab3 100644 --- a/SL/Auth.pm +++ b/SL/Auth.pm @@ -330,7 +330,7 @@ sub create_database { my ($cluster_encoding) = $dbh->selectrow_array($query); if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i) && ($encoding !~ m/^(?:UTF-?8|UNICODE)$/i)) { - $error = $main::locale->text('Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.'); + $error = $main::locale->text('Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure kivitendo to use UTF-8 as well.'); } $dbh->disconnect(); @@ -1047,7 +1047,7 @@ sub all_rights_full { ["batch_printing", $locale->text("Batch Printing")], ["--others", $locale->text("Others")], ["email_bcc", $locale->text("May set the BCC field when sending emails")], - ["config", $locale->text("Change Lx-Office installation settings (all menu entries beneath 'System')")], + ["config", $locale->text("Change kivitendo installation settings (all menu entries beneath 'System')")], ["admin", $locale->text("Administration (Used to access instance administration from user logins)")], ); diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm index 1ba935895..64ac328bd 100644 --- a/SL/Controller/Base.pm +++ b/SL/Controller/Base.pm @@ -229,7 +229,7 @@ sub _dispatch { $self->$sub(@_); $self->_run_hooks('after', $action); } else { - $::form->error($::locale->text('Oops. No valid action found to dispatch. Please report this case to the Lx-Office team.')); + $::form->error($::locale->text('Oops. No valid action found to dispatch. Please report this case to the kivitendo team.')); } } diff --git a/SL/DATEV.pm b/SL/DATEV.pm index 50fb1c7a6..875588859 100644 --- a/SL/DATEV.pm +++ b/SL/DATEV.pm @@ -1,5 +1,5 @@ #===================================================================== -# Lx-Office ERP +# kivitendo ERP # Copyright (c) 2004 # # Author: Philip Reetz @@ -1037,7 +1037,7 @@ __END__ =head1 NAME -SL::DATEV - Lx-Office DATEV Export module +SL::DATEV - kivitendo DATEV Export module =head1 SYNOPSIS diff --git a/SL/DB/Helper/ALL.pm b/SL/DB/Helper/ALL.pm index ba615b9aa..928b6654c 100644 --- a/SL/DB/Helper/ALL.pm +++ b/SL/DB/Helper/ALL.pm @@ -108,7 +108,7 @@ SL::DB::Helper::ALL: Dependency-only package for all SL::DB::* modules This module depends on all modules in SL/DB/*.pm for the convenience of being able to write a simple \C and having everything loaded. This is supposed to be used only in the -Lx-Office console. Normal modules should C only the modules they +kivitendo console. Normal modules should C only the modules they actually need. =head1 AUTHOR diff --git a/SL/DB/Helper/ALLAuth.pm b/SL/DB/Helper/ALLAuth.pm index 495720560..730c54c94 100644 --- a/SL/DB/Helper/ALLAuth.pm +++ b/SL/DB/Helper/ALLAuth.pm @@ -26,7 +26,7 @@ SL::DB::Helper::ALLAuth: Dependency-only package for all SL::DB::Auth* modules This module depends on all modules in SL/DB/Auth*.pm for the convenience of being able to write a simple \C and having everything loaded. This is -supposed to be used only in the Lx-Office console. Normal modules +supposed to be used only in the kivitendo console. Normal modules should C only the modules they actually need. =head1 AUTHOR diff --git a/SL/DBUtils.pm b/SL/DBUtils.pm index 1f243bcfd..2d9c472af 100644 --- a/SL/DBUtils.pm +++ b/SL/DBUtils.pm @@ -396,7 +396,7 @@ SL::DBUTils.pm: All about Databaseconections in Lx =head1 DESCRIPTION -DBUtils is the attempt to reduce the amount of overhead it takes to retrieve information from the database in Lx-Office. Previously it would take about 15 lines of code just to get one single integer out of the database, including failure procedures and importing the necessary packages. Debugging would take even more. +DBUtils is the attempt to reduce the amount of overhead it takes to retrieve information from the database in kivitendo. Previously it would take about 15 lines of code just to get one single integer out of the database, including failure procedures and importing the necessary packages. Debugging would take even more. Using DBUtils most database procedures can be reduced to defining the query, executing it, and retrieving the result. Let DBUtils handle the rest. Whenever there is a database operation not covered in DBUtils, add it here, rather than working around it in the backend code. @@ -591,7 +591,7 @@ Sven Schoeling Es.schoeling@linet-services.deE =head1 COPYRIGHT AND LICENSE -Copyright 2007 by Lx-Office Community +Copyright 2007 by kivitendo Community This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/SL/FCGIFixes.pm b/SL/FCGIFixes.pm index 6327ffcf1..ea31ccf56 100644 --- a/SL/FCGIFixes.pm +++ b/SL/FCGIFixes.pm @@ -10,7 +10,7 @@ use version; # setting STDOUT to ":utf8" with "binmode". Also FCGI starting with # 0.69 implements proper handling for UTF-8 flagged strings -- namely # by downgrading them into bytes. The combination of the two causes -# Lx-Office's way of handling strings to go belly up (storing +# kivitendo's way of handling strings to go belly up (storing # everything in Perl's internal encoding and using Perl's I/O layer # for automatic conversion on output). # diff --git a/SL/Form.pm b/SL/Form.pm index 45f37599c..19f2b5cf5 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -3609,7 +3609,7 @@ SL::Form.pm - main data object. =head1 SYNOPSIS -This is the main data object of Lx-Office. +This is the main data object of kivitendo. Unfortunately it also acts as a god object for certain data retrieval procedures used in the entry points. Points of interest for a beginner are: @@ -3634,7 +3634,7 @@ will in this case not increase the value, and return undef. Generates a HTTP redirection header for the new C<$url>. Constructs an absolute URL including scheme, host name and port. If C<$url> is a -relative URL then it is considered relative to Lx-Office base URL. +relative URL then it is considered relative to kivitendo base URL. This function Cs if headers have already been created with C<$::form-Eheader>. diff --git a/SL/Helper/DateTime.pm b/SL/Helper/DateTime.pm index 59a100c2a..749bd0764 100644 --- a/SL/Helper/DateTime.pm +++ b/SL/Helper/DateTime.pm @@ -44,12 +44,12 @@ Returns the current date with the time zone set to the local time zone. =item C -Formats the date and time according to the current Lx-Office user's +Formats the date and time according to the current kivitendo user's date format with L. =item C -Parses a date string formatted in the current Lx-Office user's date +Parses a date string formatted in the current kivitendo user's date format and returns an instance of L. Note that only dates can be parsed at the moment, not the time diff --git a/SL/InstanceConfiguration.pm b/SL/InstanceConfiguration.pm index ac14b0ae0..1e9c6a10f 100644 --- a/SL/InstanceConfiguration.pm +++ b/SL/InstanceConfiguration.pm @@ -158,7 +158,7 @@ SL::InstanceConfiguration - Provide instance-specific configuration data =head1 SYNOPSIS -Lx-Office has two configuration levels: installation specific +kivitendo has two configuration levels: installation specific (provided by the global variable C<%::lx_office_conf>) and instance specific. The latter is provided by a global instance of this class, C<$::instance_conf>. diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm index 62aacd93b..a5f22df4e 100644 --- a/SL/LXDebug.pm +++ b/SL/LXDebug.pm @@ -340,11 +340,11 @@ __END__ =head1 NAME -LXDebug - Lx-Office debugging facilities +LXDebug - kivitendo debugging facilities =head1 SYNOPSIS -This module provides functions for debugging Lx-Office. An instance is +This module provides functions for debugging kivitendo. An instance is always created as the global variable C<$::lxdebug> at the earliest possible moment. @@ -475,7 +475,7 @@ enabling and disabling certain debug levels. =back -Note that these are only useful if Lx-Office is running as a FastCGI +Note that these are only useful if kivitendo is running as a FastCGI application because otherwise the changes would be lost when the process exits in a normal CGI environment. diff --git a/SL/Locale.pm b/SL/Locale.pm index 8fa37805d..ccf494343 100644 --- a/SL/Locale.pm +++ b/SL/Locale.pm @@ -328,7 +328,7 @@ sub date { } elsif ($myconfig->{dateformat} eq "yyyy-mm-dd") { # Use German syntax with the ISO date style "yyyy-mm-dd" because - # Lx-Office is mainly used in Germany or German speaking countries. + # kivitendo is mainly used in Germany or German speaking countries. if (defined $longformat && $longformat == 0) { $mm++; $dd = "0$dd" if ($dd < 10); diff --git a/SL/MoreCommon.pm b/SL/MoreCommon.pm index dad975037..13d421bda 100644 --- a/SL/MoreCommon.pm +++ b/SL/MoreCommon.pm @@ -192,7 +192,7 @@ SL::MoreCommon.pm - helper functions =head1 DESCRIPTION -this is a collection of helper functions used in Lx-Office. +this is a collection of helper functions used in kivitendo. Most of them are either obvious or too obscure to care about unless you really have to. The exceptions are documented here. diff --git a/SL/RecordLinks.pm b/SL/RecordLinks.pm index da63872d4..77086ba70 100644 --- a/SL/RecordLinks.pm +++ b/SL/RecordLinks.pm @@ -209,7 +209,7 @@ __END__ =head1 NAME -SL::RecordLinks - Verlinkung von Lx-Office Objekten. +SL::RecordLinks - Verlinkung von kivitendo Objekten. =head1 SYNOPSIS diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm index deb4e19fe..40beabb92 100644 --- a/SL/ReportGenerator.pm +++ b/SL/ReportGenerator.pm @@ -791,7 +791,7 @@ __END__ =head1 NAME -SL::ReportGenerator.pm: the Lx-Office way of getting data in shape +SL::ReportGenerator.pm: the kivitendo way of getting data in shape =head1 SYNOPSIS @@ -815,7 +815,7 @@ Then there are some options made by the user, such as hidden columns. You add mo Then it lacks usability. You want it to be able to sort the data. You add code for that. Then there are too many results, you need pagination, you want to print or export that data..... and so on. -The ReportGenerator class was designed because this exact scenario happened about half a dozen times in Lx-Office. +The ReportGenerator class was designed because this exact scenario happened about half a dozen times in kivitendo. It's purpose is to manage all those formating, culling, sorting, and templating. Which makes it almost as complicated to use as doing the work for yourself. diff --git a/SL/Request.pm b/SL/Request.pm index a8ae4c137..6dfff719d 100644 --- a/SL/Request.pm +++ b/SL/Request.pm @@ -342,7 +342,7 @@ anything in here directly. =head1 DESCRIPTION This module handles flattening and unflattening of data for request -roundtrip purposes. Lx-Office uses the format as described below: +roundtrip purposes. kivitendo uses the format as described below: =over 4 diff --git a/SL/SessionFile.pm b/SL/SessionFile.pm index 6f04041e1..f4c509c33 100644 --- a/SL/SessionFile.pm +++ b/SL/SessionFile.pm @@ -171,7 +171,7 @@ C<22.01.2011 14:12:22>. =item C Returns the name of the session-specific directory used for file -storage relative to the Lx-Office installation folder. +storage relative to the kivitendo installation folder. =item C diff --git a/SL/Template/Plugin/HTMLFixes.pm b/SL/Template/Plugin/HTMLFixes.pm index 32d3c5683..5c6207829 100644 --- a/SL/Template/Plugin/HTMLFixes.pm +++ b/SL/Template/Plugin/HTMLFixes.pm @@ -12,7 +12,7 @@ use Encode; # Replacement for Template::Plugin::HTML::url. -# Strings in Lx-Office are stored in Perl's internal encoding but have +# Strings in kivitendo are stored in Perl's internal encoding but have # to be output as UTF-8. A normal regex replace doesn't do that # creating invalid UTF-8 characters upon URL-unescaping. diff --git a/SL/USTVA.pm b/SL/USTVA.pm index abbf4a32c..a5db373ad 100644 --- a/SL/USTVA.pm +++ b/SL/USTVA.pm @@ -1,5 +1,5 @@ #===================================================================== -# Lx-Office ERP +# kivitendo ERP # Copyright (c) 2004 by Udo Spallek, Aachen # # Author: Udo Spallek diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 7e12b0e05..3d32a3978 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -759,7 +759,7 @@ sub create_dataset { if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i)) { if ($::lx_office_conf{system}->{dbcharset} !~ m/^UTF-?8$/i) { $form->show_generic_error($locale->text('The selected PostgreSQL installation uses UTF-8 as its encoding. ' . - 'Therefore you have to configure Lx-Office to use UTF-8 as well.'), + 'Therefore you have to configure kivitendo to use UTF-8 as well.'), 'back_button' => 1); } diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl index 097b5d7d3..9572e74bd 100644 --- a/bin/mozilla/datev.pl +++ b/bin/mozilla/datev.pl @@ -1,5 +1,5 @@ #===================================================================== -# Lx-Office ERP +# kivitendo ERP # Copyright (c) 2004 # # Author: Philip Reetz diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index c3cb45b96..576564fe7 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -976,7 +976,7 @@ sub save_as_new { map { delete $form->{$_} } qw(printed emailed queued); delete @{ $form }{ grep { m/^stock_(?:in|out)_\d+/ } keys %{ $form } }; - # Let Lx-Office assign a new order number if the user hasn't changed the + # Let kivitendo assign a new order number if the user hasn't changed the # previous one. If it has been changed manually then use it as-is. $form->{donumber} =~ s/^\s*//g; $form->{donumber} =~ s/\s*$//g; diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index bc5d7a56c..a0a1a73f3 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -1078,7 +1078,8 @@ sub post_transaction { } if ($split_safety{-1} > 1 && $split_safety{1} > 1) { - $::form->error($::locale->text("Split entry detected. The values you have entered will result in an entry with more than one position on both debit and credit. Due to known problems involving accounting software Lx-Office does not allow these.")); + $::form->error($::locale->text("Split entry detected. The values you have entered will result in an entry with more than one position on both debit and credit. " . + "Due to known problems involving accounting software kivitendo does not allow these.")); } for my $i (1 .. $count) { diff --git a/bin/mozilla/installationcheck.pl b/bin/mozilla/installationcheck.pl index 4741443df..869177b0c 100644 --- a/bin/mozilla/installationcheck.pl +++ b/bin/mozilla/installationcheck.pl @@ -24,14 +24,14 @@ sub verify_installation { + title="kivitendo stylesheet"> | . $locale->text("One or more Perl modules missing") . qq|

| . $locale->text("One or more Perl modules missing") . qq|

-

| . $locale->text("At least one Perl module that Lx-Office ERP " . +

| . $locale->text("At least one Perl module that kivitendo ERP " . "requires for running is not installed on your " . "system.") . " " . diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index a6050945c..fb614564f 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -1614,7 +1614,7 @@ sub save_as_new { $form->{saveasnew} = 1; map { delete $form->{$_} } qw(printed emailed queued delivered closed); - # Let Lx-Office assign a new order number if the user hasn't changed the + # Let kivitendo assign a new order number if the user hasn't changed the # previous one. If it has been changed manually then use it as-is. my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber"; $form->{$idx} =~ s/^\s*//g; diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index d5c42a039..8d77a314e 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -1,5 +1,5 @@ #===================================================================== -# Lx-Office ERP +# kivitendo ERP # Copyright (c) 2004 by Udo Spallek, Aachen # # Author: Udo Spallek @@ -1426,4 +1426,3 @@ sub back { call_sub($::form->{"lastsub"}); $::lxdebug->leave_sub(); } - diff --git a/css/Mobile/main.css b/css/Mobile/main.css index 1ffaef555..b078eef4e 100644 --- a/css/Mobile/main.css +++ b/css/Mobile/main.css @@ -1,4 +1,4 @@ -/* Stylesheet for Lx-Office +/* Stylesheet for kivitendo * Name: Mobile.css*/ /* The look of links */ @@ -185,4 +185,3 @@ h2.error { display: none; } } - diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css index 3788c8857..328eac77f 100644 --- a/css/lx-office-erp/main.css +++ b/css/lx-office-erp/main.css @@ -1,4 +1,4 @@ -/* Stylesheet for Lx-Office +/* Stylesheet for kivitendo * Name: lx-office-erp.css*/ /* The look of links */ diff --git a/doc/online/de/add_project.pod b/doc/online/de/add_project.pod index 01468c26c..9a5169760 100644 --- a/doc/online/de/add_project.pod +++ b/doc/online/de/add_project.pod @@ -1,6 +1,6 @@ =head1 Projekte erfassen -Projekte sind in Lx-Office nur organisatorische Einheiten. Wenn Sie Projekte +Projekte sind in kivitendo nur organisatorische Einheiten. Wenn Sie Projekte erfassen, können Sie C Projekte zuweisen, und Auswertungen hinterher nach den Projekten filtern. Projekte haben ansonsten keine weitere Funktion. diff --git a/locale/de/all b/locale/de/all index 44a5bf3b3..ce6525e4b 100644 --- a/locale/de/all +++ b/locale/de/all @@ -222,7 +222,7 @@ $self->{texts} = { 'Assistant for general ledger corrections' => 'Assistent für die Korrektur von Hauptbucheinträgen', 'Assume Tax Consultant Data in Tax Computation?' => 'Beraterdaten in UStVA übernehmen?', 'At least' => 'Mindestens', - 'At least one Perl module that Lx-Office ERP requires for running is not installed on your system.' => 'Mindestes ein Perl-Modul, das Lx-Office ERP zur Ausführung benötigt, ist auf Ihrem System nicht installiert.', + 'At least one Perl module that kivitendo ERP requires for running is not installed on your system.' => 'Mindestes ein Perl-Modul, das kivitendo ERP zur Ausführung benötigt, ist auf Ihrem System nicht installiert.', 'At least one of the columns #1, customer, customernumber, vendor, vendornumber (depending on the target table) is required for matching the entry to an existing customer or vendor.' => 'Mindestens eine der Spalten #1, customer, customernumber, vendor, vendornumber (von Zieltabelle abhängig) wird benötigt, um einen Eintrag einem bestehenden Kunden bzw. Lieferanten zuzuordnen.', 'At most' => 'Höchstens', 'At the moment the transaction looks like this:' => 'Aktuell sieht die Buchung wie folgt aus:', @@ -382,7 +382,7 @@ $self->{texts} = { 'Carry over shipping address' => 'Lieferadresse übernehmen', 'Cash' => 'Zahlungsverkehr', 'Cc' => 'Cc', - 'Change Lx-Office installation settings (all menu entries beneath \'System\')' => 'Verändern der Lx-Office-Installationseinstellungen (Menüpunkte unterhalb von \'System\')', + 'Change kivitendo installation settings (all menu entries beneath \'System\')' => 'Verändern der kivitendo-Installationseinstellungen (Menüpunkte unterhalb von \'System\')', 'Change representative to' => 'Vertreter ändern in', 'Changes in this block are only sensible if the account is NOT a summary account AND there exists one valid taxkey. To select both Receivables and Payables only make sense for Payment / Receipt (i.e. account cash).' => 'Es ist nur sinnvoll Änderungen vorzunehmen, wenn das Konto KEIN Sammelkonto ist und wenn ein gültiger Steuerschlüssel für das Konto existiert. Gleichzeitig Haken bei Forderungen und Verbindlichkeiten zu setzen, macht auch NUR für den Zahlungsein- und Ausgang (bspw. Bank oder Kasse) Sinn.', 'Changes to Receivables and Payables are only possible if no transactions to this account are posted yet.' => 'Änderungen bei Forderungen oder Verbindlichkeiten sind nur möglich, wenn dieses Konto noch nicht bebucht wurde.', @@ -966,7 +966,7 @@ $self->{texts} = { 'If the article type is set to \'mixed\' then a column called \'type\' must be present.' => 'Falls der Artikeltyp auf \'gemischt\' gestellt wird, muss eine Spalte namens \'type\' vorhanden sein.', 'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' => 'Wenn das automatische Erstellen einer Rechnung über Mahngebühren und Zinsen für ein Mahnlevel aktiviert ist, so werden die folgenden Konten für die Rechnung benutzt.', 'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' => 'Falls der oben genannte Datenbankbenutzer nicht die Berechtigung zum Anlegen neuer Datenbanken hat, so können Sie hier den Namen und das Passwort des Datenbankadministratoraccounts angeben:', - 'If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory "#1".' => 'Falls Sie sich entscheiden, Lx-Office die Migration durchführen zu lassen, so wird Lx-Office ein Backup der alten Dateien im Verzeichnis "#1" erstellen und die Dateien anschließend löschen.', + 'If you chose to let kivitendo do the migration then kivitendo will also remove the old member file after creating a backup copy of it in the directory "#1".' => 'Falls Sie sich entscheiden, kivitendo die Migration durchführen zu lassen, so wird kivitendo ein Backup der alten Dateien im Verzeichnis "#1" erstellen und die Dateien anschließend löschen.', 'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' => 'Wenn Sie für die Artikelnummer und / oder die Beschreibung etwas eingeben, so werden nur die Lagerplätze angezeigt, in denen Waren eingelagert sind, die Ihre Suchbegriffe enthalten.', 'If you see this message, you most likely just setup your LX-Office and haven\'t added any entry types. If this is the case, the option is accessible for administrators in the System menu.' => 'Wenn Sie diese Meldung sehen haben Sie wahrscheinlich ein frisches LX-Office Setup und noch keine Buchungsgruppen eingerichtet. Ein Administrator kann dies im Systemmenü erledigen.', 'If you select a base unit then you also have to enter a factor.' => 'Wenn Sie eine Basiseinheit auswählen, dann müssen Sie auch einen Faktor eingeben.', @@ -982,7 +982,7 @@ $self->{texts} = { 'Import result' => 'Import-Ergebnis', 'Import summary' => 'Import-Zusammenfassung', 'In order to do that hit the button "Delete transaction".' => 'Drücken Sie dafür auf den Button "Buchung löschen".', - 'In the latter case the tables needed by Lx-Office will be created in that database.' => 'In letzterem Fall werden die von Lx-Office benötigten Tabellen in dieser existierenden Datenbank angelegt.', + 'In the latter case the tables needed by kivitendo will be created in that database.' => 'In letzterem Fall werden die von kivitendo benötigten Tabellen in dieser existierenden Datenbank angelegt.', 'In version 2.4.0 the administrator has to enter a list of units in the administrative section.' => 'Vor Version 2.4.0 musste der Benutzer die Konten bei jeder Ware und jeder Dienstleistung einzeln auswählen.', 'In-line' => 'im Text', 'Inactive' => 'Inaktiv', @@ -1131,7 +1131,7 @@ $self->{texts} = { 'Login name missing!' => 'Benutzer - Feld darf nicht leer sein!', 'Login of User' => 'Login', 'Logout' => 'Abmelden', - 'Logout now' => 'Lx-Office jetzt verlassen', + 'Logout now' => 'kivitendo jetzt verlassen', 'Long Dates' => 'Lange Monatsnamen', 'Long Description' => 'Langtext', 'MAILED' => 'Gesendet', @@ -1304,7 +1304,7 @@ $self->{texts} = { 'Only Warnings and Errors' => 'Nur Warnungen und Fehler', 'Only due follow-ups' => 'Nur fällige Wiedervorlagen', 'Only shown in item mode' => 'werden nur im Artikelmodus angezeigt', - 'Oops. No valid action found to dispatch. Please report this case to the Lx-Office team.' => 'Ups. Es wurde keine gültige Funktion zum Aufrufen gefunden. Bitte berichten Sie diesen Fall den Lx-Office-Entwicklern.', + 'Oops. No valid action found to dispatch. Please report this case to the kivitendo team.' => 'Ups. Es wurde keine gültige Funktion zum Aufrufen gefunden. Bitte berichten Sie diesen Fall den kivitendo-Entwicklern.', 'Open' => 'Offen', 'Open Amount' => 'Offener Betrag', 'Open a further kivitendo window or tab' => 'Weiteres kivitendo-Fenster/-Tab öffnen', @@ -1758,7 +1758,7 @@ $self->{texts} = { 'Source bank account' => 'Quellkonto', 'Source bin' => 'Quelllagerplatz', 'Space' => 'Leerzeichen', - 'Split entry detected. The values you have entered will result in an entry with more than one position on both debit and credit. Due to known problems involving accounting software Lx-Office does not allow these.' => 'Splitbuchung! Die eingebenen Werte würden eine Buchung auslösen, die jeweils mehr als eine Position auf Soll und Haben hätte. Um Kompatibilität mit DATEV zu gewährleisten erlaubt Lx-Office keine Splitbuchungen.', + 'Split entry detected. The values you have entered will result in an entry with more than one position on both debit and credit. Due to known problems involving accounting software kivitendo does not allow these.' => 'Splitbuchung! Die eingebenen Werte würden eine Buchung auslösen, die jeweils mehr als eine Position auf Soll und Haben hätte. Um Kompatibilität mit DATEV zu gewährleisten erlaubt kivitendo keine Splitbuchungen.', 'Spoolfile' => 'Druckdatei', 'Start Dunning Process' => 'Mahnprozess starten', 'Start analysis' => 'Analyse beginnen', @@ -1805,7 +1805,7 @@ $self->{texts} = { 'Supplies' => 'Lieferungen', 'Switch Menu on / off' => 'Menü ein- / ausklappen', 'System' => 'System', - 'System currently down for maintenance!' => 'Lx-Office ist momentan zwecks Wartungsarbeiten nicht zugänglich.', + 'System currently down for maintenance!' => 'kivitendo ist momentan zwecks Wartungsarbeiten nicht zugänglich.', 'TODO list' => 'Aufgabenliste', 'TODO list options' => 'Aufgabenlistenoptionen', 'TOP100' => 'Top 100', @@ -1990,14 +1990,14 @@ $self->{texts} = { 'The restoration process is complete. Please review "pg_restore"\'s output to find out if the restoration was successful.' => 'Die Wiederherstellung ist abgeschlossen. Bitte sehen Sie sich die Ausgabe von "pg_restore" an, um festzustellen, ob die Wiederherstellung erfolgreich war.', 'The second reason is that kivitendo allowed the user to enter the tax amount manually regardless of the taxkey used.' => 'Der zweite Grund war, dass kivitendo zuließ, dass die Benutzer beliebige, von den tatsächlichen Steuerschlüsseln unabhängige Steuerbeträge eintrugen.', 'The second way is to use Perl\'s CPAN module and let it download and install the module for you.' => 'Die zweite Variante besteht darin, Perls CPAN-Modul zu benutzen und es das Modul für Sie installieren zu lassen.', - 'The selected PostgreSQL installation uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Die ausgewählte PostgreSQL-Installation benutzt UTF-8 als Zeichensatz. Deshalb müssen Sie Lx-Office so konfigurieren, dass es ebenfalls UTF-8 als Zeichensatz benutzt.', + 'The selected PostgreSQL installation uses UTF-8 as its encoding. Therefore you have to configure kivitendo to use UTF-8 as well.' => 'Die ausgewählte PostgreSQL-Installation benutzt UTF-8 als Zeichensatz. Deshalb müssen Sie kivitendo so konfigurieren, dass es ebenfalls UTF-8 als Zeichensatz benutzt.', 'The selected bank account does not exist anymore.' => 'Das ausgewählte Bankkonto existiert nicht mehr.', 'The selected bin does not exist.' => 'Der ausgewählte Lagerplatz existiert nicht.', 'The selected currency' => 'Die ausgewählte Währung', 'The selected exports have been closed.' => 'Die ausgewählten Exporte wurden abgeschlossen.', 'The selected warehouse does not exist.' => 'Das ausgewählte Lager existiert nicht.', 'The selected warehouse is empty, or no stocked items where found that match the filter settings.' => 'Das ausgewählte Lager ist leer, oder in ihm wurden keine zu den Sucheinstellungen passenden eingelagerten Artikel gefunden.', - 'The session is invalid or has expired.' => 'Sie sind von Lx-Office abgemeldet.', + 'The session is invalid or has expired.' => 'Sie sind von kivitendo abgemeldet.', 'The settings were saved, but the password was not changed.' => 'Die Einstellungen wurden gespeichert, aber das Passwort wurde nicht geändert.', 'The source warehouse does not contain any bins.' => 'Das Quelllager enthält keine Lagerplätze.', 'The start date is missing.' => 'Das Startdatum fehlt.', @@ -2275,7 +2275,7 @@ $self->{texts} = { 'You will now be forwarded to the administration panel.' => 'Sie werden nun zum Administrationsbereich weitergeleitet.', 'You\'re not editing a file.' => 'Sie bearbeiten momentan keine Datei.', 'You\'ve already chosen the following limitations:' => 'Sie haben bereits die folgenden Einschränkungen vorgenommen:', - 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Ihre PostgreSQL-Installation benutzt UTF-8 als Zeichensatz. Sie müssen deshalb Lx-Office so konfigurieren, dass es ebenfalls UTF-8 als Zeichensatz benutzt.', + 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure kivitendo to use UTF-8 as well.' => 'Ihre PostgreSQL-Installation benutzt UTF-8 als Zeichensatz. Sie müssen deshalb kivitendo so konfigurieren, dass es ebenfalls UTF-8 als Zeichensatz benutzt.', 'Your TODO list' => 'Ihre Aufgabenliste', 'Your account number' => 'Ihre Kontonummer', 'Your bank' => 'Der Name Ihrer Bank', diff --git a/olcom/erpexport.php b/olcom/erpexport.php index 90428f57f..5e19c87d5 100644 --- a/olcom/erpexport.php +++ b/olcom/erpexport.php @@ -6,7 +6,7 @@ *License: non free *eMail: info@lx-system.de *Version: 1.0.0 -*ERP: Lx-Office ERP +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ ?> diff --git a/olcom/olcomexport.php b/olcom/olcomexport.php index f5d548188..e9a434b51 100644 --- a/olcom/olcomexport.php +++ b/olcom/olcomexport.php @@ -6,7 +6,7 @@ *eMail: info@lx-system.de *Version: 1.6 *Shop: xt::Commerce -*ERP: Lx-Office ERP 2.4.x +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ /* * Noch einzubauen: diff --git a/olcom/shopimport_db.php b/olcom/shopimport_db.php index acbbeb8fd..917d3b1fc 100644 --- a/olcom/shopimport_db.php +++ b/olcom/shopimport_db.php @@ -7,7 +7,7 @@ *eMail: info@lx-system.de *Version: 2.0 *Shop: xt:Commerce 3.04 -*ERP: Lx-Office ERP 2.4.0 +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ require_once "shoplib.php"; diff --git a/olcom/trans.php b/olcom/trans.php index 6a56e12c4..4015a4888 100644 --- a/olcom/trans.php +++ b/olcom/trans.php @@ -7,7 +7,7 @@ *eMail: info@lx-system.de *Version: 1.0.0 *Shop: xt:Commerce 2.2 -*ERP: Lx-Office ERP +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ require_once "DB.php"; require_once "conf.php"; diff --git a/oscom/erpexport.php b/oscom/erpexport.php index f928776d9..04fa6c921 100644 --- a/oscom/erpexport.php +++ b/oscom/erpexport.php @@ -6,7 +6,7 @@ *License: non free *eMail: info@lx-system.de *Version: 1.0.1 -*ERP: Lx-Office ERP +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ ?> diff --git a/oscom/oscomexport.php b/oscom/oscomexport.php index b985fc3cc..ef15758d4 100644 --- a/oscom/oscomexport.php +++ b/oscom/oscomexport.php @@ -6,7 +6,7 @@ *eMail: info@lx-system.de *Version: 1.6 *Shop: osCommerce 2.2 ms2 -*ERP: Lx-Office ERP 2.4.x +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ /* * Noch einzubauen: diff --git a/oscom/shopimport_db.php b/oscom/shopimport_db.php index 9c4bed603..3ca4ddb2c 100644 --- a/oscom/shopimport_db.php +++ b/oscom/shopimport_db.php @@ -6,7 +6,7 @@ *eMail: info@lx-system.de *Version: 1.6.0 *Shop: osCommerce 2.2 -*ERP: Lx-Office ERP 2.4.x +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ require_once "shoplib.php"; $LAND=array("Germany"=>"D"); diff --git a/oscom/trans.php b/oscom/trans.php index 1cceca28e..1efd47746 100644 --- a/oscom/trans.php +++ b/oscom/trans.php @@ -7,7 +7,7 @@ *eMail: info@lx-system.de *Version: 1.0.0 *Shop: osCommerce 2.2 -*ERP: Lx-Office ERP +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ require_once "DB.php"; require_once "conf.php"; diff --git a/pepper/erpexport.php b/pepper/erpexport.php index 8a40c674b..8cbd711c5 100644 --- a/pepper/erpexport.php +++ b/pepper/erpexport.php @@ -6,7 +6,7 @@ *License: non free *eMail: info@lx-system.de *Version: 1.0.1 -*ERP: Lx-Office ERP +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ ?> diff --git a/pepper/export_to_erp/export_to_erp.php b/pepper/export_to_erp/export_to_erp.php index 72d1e9cbf..b5d832320 100644 --- a/pepper/export_to_erp/export_to_erp.php +++ b/pepper/export_to_erp/export_to_erp.php @@ -6,7 +6,7 @@ *eMail: info@lx-system.de *Version: 1.0.1 *Shop: PHPeppershop 1.5 -*ERP: Lx-Office ERP +*ERP: kivitendo ERP ***************************************************************/ // ----------------------------------------------------------------------- // Damit jedes andere Modul ueberpruefen kann ob dieses hier schon "included" ist diff --git a/pepper/export_to_erp/initialize_module.php b/pepper/export_to_erp/initialize_module.php index 34c120bd7..5cb9ddb7e 100644 --- a/pepper/export_to_erp/initialize_module.php +++ b/pepper/export_to_erp/initialize_module.php @@ -86,7 +86,7 @@ $moduldef['versionschecknummern'] = '1.4.008;1.5'; // 4.) Kurzbeschreibung // ! Formatierungen sollen via HTML-Tags eingegeben werden. -$moduldef['kurzbeschreibung'] = 'Eportiert Kundendaten und Bestellungen für Lx-Office ERP. +$moduldef['kurzbeschreibung'] = 'Eportiert Kundendaten und Bestellungen für kivitendo ERP. Neukunden werden in der ERP angelegt und die ERP-KdNr in Kundendaten eingepflegt, bei Bestandskunden werden die Kundendaten abgeglichen. Das Feld "Bestellung_bezahlt" ist der Merker für neue Bestellungen. diff --git a/pepper/pepperexport.php b/pepper/pepperexport.php index 6e00b5138..b6173c7e1 100644 --- a/pepper/pepperexport.php +++ b/pepper/pepperexport.php @@ -7,7 +7,7 @@ *eMail: info@lx-system.de *Version: 1.4.0 *Shop: PHPeppershop 2.0 -*ERP: Lx-Office ERP >= 2.4.0 +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ ?> diff --git a/pepper/shopimport_db.php b/pepper/shopimport_db.php index 87db00ad5..af1254ab0 100644 --- a/pepper/shopimport_db.php +++ b/pepper/shopimport_db.php @@ -7,7 +7,7 @@ *eMail: info@lx-system.de *Version: 1.0.0 *Shop: PHPeppershop 2.0 -*ERP: Lx-Office ERP +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ $login=($_GET["login"])?$_GET["login"]:$_POST["login"]; if (file_exists ("conf$login.php")) { diff --git a/pepper/trans.php b/pepper/trans.php index 48f354a91..099bee21e 100644 --- a/pepper/trans.php +++ b/pepper/trans.php @@ -7,7 +7,7 @@ *eMail: info@lx-system.de *Version: 1.0.1 *Shop: PHPepper 1.5 -*ERP: Lx-Office ERP +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ require_once "DB.php"; require_once "conf.php"; diff --git a/scripts/console b/scripts/console index e183ac83a..239ed5431 100755 --- a/scripts/console +++ b/scripts/console @@ -106,14 +106,14 @@ sub quit { sub help { print <s.schoeling@linet-services.deE Distributed under the terms of the GNU General Public License v2. =cut - - diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl index 2bec003cd..9637f558f 100755 --- a/scripts/installation_check.pl +++ b/scripts/installation_check.pl @@ -167,9 +167,9 @@ sub check_module { return if $res; my $needed_text = - $role{optional} ? 'It is OPTIONAL for Lx-Office but RECOMMENDED for improved functionality.' - : $role{required} ? 'It is NEEDED by Lx-Office and must be installed.' - : $role{devel} ? 'It is OPTIONAL for Lx-Office and only useful for developers.' + $role{optional} ? 'It is OPTIONAL for kivitendo but RECOMMENDED for improved functionality.' + : $role{required} ? 'It is NEEDED by kivitendo and must be installed.' + : $role{devel} ? 'It is OPTIONAL for kivitendo and only useful for developers.' : 'It is not listed as a dependancy yet. Please tell this the developers.'; my @source_texts = module_source_texts($module); @@ -241,7 +241,7 @@ __END__ =head1 NAME -scripts/installation_check.pl - check Lx-Office dependancies +scripts/installation_check.pl - check kivitendo dependancies =head1 SYNOPSIS @@ -249,9 +249,9 @@ scripts/installation_check.pl - check Lx-Office dependancies =head1 DESCRIPTION -Check dependencys. List all perl modules needed by Lx-Office, probes for them, +Check dependencys. List all perl modules needed by kivitendo, probes for them, and warns if one is not available. List all LaTeX document classes and -packages needed by Lx-Office master templates, probes for them, and warns if +packages needed by kivitendo master templates, probes for them, and warns if one is not available. diff --git a/scripts/locales.pl b/scripts/locales.pl index 28b56323c..0c96006f4 100755 --- a/scripts/locales.pl +++ b/scripts/locales.pl @@ -645,7 +645,7 @@ __END__ =head1 NAME -locales.pl - Collect strings for translation in Lx-Office +locales.pl - Collect strings for translation in kivitendo =head1 SYNOPSIS diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl index b23a75d29..f7cc62d8a 100755 --- a/scripts/rose_auto_create_model.pl +++ b/scripts/rose_auto_create_model.pl @@ -246,7 +246,7 @@ __END__ =head1 NAME -rose_auto_create_model - mana Rose::DB::Object classes for Lx-Office +rose_auto_create_model - mana Rose::DB::Object classes for kivitendo =head1 SYNOPSIS diff --git a/sql/Pg-upgrade2/USTVA_abstraction.pl b/sql/Pg-upgrade2/USTVA_abstraction.pl index 96c6b73b4..24dbd42ed 100644 --- a/sql/Pg-upgrade2/USTVA_abstraction.pl +++ b/sql/Pg-upgrade2/USTVA_abstraction.pl @@ -1,5 +1,5 @@ # @tag: USTVA_abstraction -# @description: Abstraktion der USTVA Report Daten. Dies vereinfacht die Integration von Steuerberichten anderer Nationen in Lx-Office. +# @description: Abstraktion der USTVA Report Daten. Dies vereinfacht die Integration von Steuerberichten anderer Nationen in kivitendo. # @depends: release_2_4_2 # Abstraktionlayer between general Taxreports and USTVA diff --git a/sql/Pg-upgrade2/defaults_posting_config.pl b/sql/Pg-upgrade2/defaults_posting_config.pl index dd033d43c..042976efe 100644 --- a/sql/Pg-upgrade2/defaults_posting_config.pl +++ b/sql/Pg-upgrade2/defaults_posting_config.pl @@ -30,7 +30,7 @@ sub do_update { do_query(qq|ALTER TABLE defaults ADD COLUMN payments_changeable integer NOT NULL DEFAULT 0|, 1); # check current configuration and set default variables accordingly, so that - # Lx-Office behaviour isn't changed by this update + # kivitendo behaviour isn't changed by this update # if payments_changeable is not set in config set it to 0 my $payments_changeable = 0; if ($::lx_office_conf{features}->{payments_changeable} == 1 ) { diff --git a/sql/Pg-upgrade2/defaults_show_bestbefore.pl b/sql/Pg-upgrade2/defaults_show_bestbefore.pl index 36b1882bc..cb1966154 100644 --- a/sql/Pg-upgrade2/defaults_show_bestbefore.pl +++ b/sql/Pg-upgrade2/defaults_show_bestbefore.pl @@ -30,7 +30,7 @@ sub do_update { do_query(qq|ALTER TABLE defaults ADD COLUMN show_bestbefore boolean DEFAULT false|, 1); # check current configuration and set default variables accordingly, so that - # Lx-Office behaviour isn't changed by this update + # kivitendo behaviour isn't changed by this update # if show_best_before is not set in config set it to 0 my $show_bestbefore = 0; if ($::lx_office_conf{features}->{show_best_before}) { diff --git a/sql/Pg-upgrade2/umstellung_eur.pl b/sql/Pg-upgrade2/umstellung_eur.pl index ce461f81f..438d2ee7f 100644 --- a/sql/Pg-upgrade2/umstellung_eur.pl +++ b/sql/Pg-upgrade2/umstellung_eur.pl @@ -43,7 +43,7 @@ sub do_update { my $profit_determination; # check current configuration and set default variables accordingly, so that - # Lx-Office behaviour isn't changed by this update + # kivitendo behaviour isn't changed by this update if ($::lx_office_conf{system}->{eur} == 0 ) { $accounting_method = 'accrual'; diff --git a/templates/print/French/winston.xml b/templates/print/French/winston.xml index 2bb63da22..ad3effa2a 100644 --- a/templates/print/French/winston.xml +++ b/templates/print/French/winston.xml @@ -1,5 +1,5 @@ - + <%elsterFFFF%><%elstersteuernummer%> diff --git a/templates/print/RB/winston.xml b/templates/print/RB/winston.xml index 2bb63da22..ad3effa2a 100644 --- a/templates/print/RB/winston.xml +++ b/templates/print/RB/winston.xml @@ -1,5 +1,5 @@ - + <%elsterFFFF%><%elstersteuernummer%> diff --git a/templates/print/Service/winston.xml b/templates/print/Service/winston.xml index 2bb63da22..ad3effa2a 100644 --- a/templates/print/Service/winston.xml +++ b/templates/print/Service/winston.xml @@ -1,5 +1,5 @@ - + <%elsterFFFF%><%elstersteuernummer%> diff --git a/templates/print/Standard/winston.xml b/templates/print/Standard/winston.xml index 2bb63da22..ad3effa2a 100644 --- a/templates/print/Standard/winston.xml +++ b/templates/print/Standard/winston.xml @@ -1,5 +1,5 @@ - + <%elsterFFFF%><%elstersteuernummer%> diff --git a/templates/print/f-tex/winston.xml b/templates/print/f-tex/winston.xml index 2bb63da22..ad3effa2a 100644 --- a/templates/print/f-tex/winston.xml +++ b/templates/print/f-tex/winston.xml @@ -1,5 +1,5 @@ - + <%elsterFFFF%><%elstersteuernummer%> diff --git a/templates/webpages/admin/create_dataset.html b/templates/webpages/admin/create_dataset.html index 36b337ac1..3e4c6e707 100644 --- a/templates/webpages/admin/create_dataset.html +++ b/templates/webpages/admin/create_dataset.html @@ -6,7 +6,7 @@

[% 'Back' | $T8 %]

[% 'You can either create a new database or chose an existing database.' | $T8 %] - [% 'In the latter case the tables needed by Lx-Office will be created in that database.' | $T8 %] + [% 'In the latter case the tables needed by kivitendo will be created in that database.' | $T8 %]

diff --git a/templates/webpages/admin/user_migration.html b/templates/webpages/admin/user_migration.html index 93c4860df..fe3e3f211 100644 --- a/templates/webpages/admin/user_migration.html +++ b/templates/webpages/admin/user_migration.html @@ -11,7 +11,7 @@

- [% LxERP.t8('If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory "#1".', backupdir) | html %] + [% LxERP.t8('If you chose to let kivitendo do the migration then kivitendo will also remove the old member file after creating a backup copy of it in the directory "#1".', backupdir) | html %]

diff --git a/xtcom/erpexport.php b/xtcom/erpexport.php index 47b49cf5d..4e34ae4e8 100644 --- a/xtcom/erpexport.php +++ b/xtcom/erpexport.php @@ -6,7 +6,7 @@ *License: non free *eMail: info@lx-system.de *Version: 1.0.0 -*ERP: Lx-Office ERP +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ ?> diff --git a/xtcom/shopimport_db.php b/xtcom/shopimport_db.php index dbac84a77..474a00edf 100644 --- a/xtcom/shopimport_db.php +++ b/xtcom/shopimport_db.php @@ -6,7 +6,7 @@ *eMail: info@lx-system.de *Version: 2.1 *Shop: xt:Commerce 3.04 -*ERP: Lx-Office ERP 2.4.0 +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ define("ExportMode","1"); require_once "shoplib.php"; @@ -465,7 +465,7 @@ if ($artikel) { //Mit jedem Artikel in der Defaultsprache: if ($debug) { $log=fopen("tmp/shop.log","a"); fputs($log,$nun.": Fehler\n"); - } + } } require ("diff.php"); diff --git a/xtcom/trans.php b/xtcom/trans.php index f7406e3d5..6cfe8b634 100644 --- a/xtcom/trans.php +++ b/xtcom/trans.php @@ -7,7 +7,7 @@ *eMail: info@lx-system.de *Version: 1.0.0 *Shop: xt:Commerce 2.2 -*ERP: Lx-Office ERP +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ $login=($_GET["login"])?$_GET["login"]:$_POST["login"]; require_once "DB.php"; diff --git a/xtcom/xtcomexport.php b/xtcom/xtcomexport.php index f9908563e..948977b8a 100644 --- a/xtcom/xtcomexport.php +++ b/xtcom/xtcomexport.php @@ -6,7 +6,7 @@ *eMail: info@lx-system.de *Version: 1.6 *Shop: xt::Commerce -*ERP: Lx-Office ERP 2.4.x +*ERP: kivitendo ERP 3.0.0 ***************************************************************/ /* * Noch einzubauen: -- 2.20.1