From 4af0c21e792126af41ef97938a95671f648bde4a Mon Sep 17 00:00:00 2001 From: Bernd Blessmann Date: Mon, 24 Oct 2011 13:03:52 +0200 Subject: [PATCH] =?utf8?q?Vorlagens=C3=A4tze=20nach=20mastertemplates=20in?= =?utf8?q?=20eigene=20Verzeichnisse=20verschoben.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/mozilla/admin.pl | 35 ++++---- doc/INSTALL.html | 80 +++++++++--------- doc/INSTALL.texi | 2 +- doc/INSTALL.txt | 10 +-- doc/changelog | 3 + .../Default/balance_sheet.html} | 0 .../Default/bin_list.html} | 0 .../Default/bin_list.tex} | 0 .../Default/check.tex} | 0 .../Default/income_statement.html} | 0 .../Default/invoice.html} | 0 .../Default/invoice.tex} | 0 .../Default/pick_list.html} | 0 .../Default/pick_list.tex} | 0 .../Default/purchase_order.html} | 0 .../Default/purchase_order.tex} | 0 .../Default/receipt.tex} | 0 .../Default/request_quotation.html} | 0 .../Default/request_quotation.tex} | 0 .../Default/sales_order.html} | 0 .../Default/sales_order.tex} | 0 .../Default/sales_quotation.html} | 0 .../Default/sales_quotation.tex} | 0 .../Default/statement.html} | 0 .../Default/statement.tex} | 0 .../French/balance_sheet.html} | 0 .../French/check.tex} | 0 .../French/income_statement.html} | 0 .../French/invoice.html} | 0 .../French/invoice.tex} | 0 .../French/purchase_order.html} | 0 .../French/purchase_order.tex} | 0 .../French/receipt.tex} | 0 .../French/sales_order.html} | 0 .../French/sales_order.tex} | 0 .../French/statement.html} | 0 .../French/statement.tex} | 0 .../German/balance_sheet.html} | 0 .../German/bin_list.html} | 0 .../German/bin_list.tex} | 0 .../German/bwa.html} | 0 .../German/check.tex} | 0 .../German/credit_note.tex} | 0 .../German/income_statement.html} | 0 .../German/invoice.html} | 0 .../German/invoice.odt} | Bin .../German/invoice.tex} | 0 .../German/pick_list.html} | 0 .../German/pick_list.tex} | 0 .../German/purchase_order.html} | 0 .../German/purchase_order.tex} | 0 .../German/receipt.tex} | 0 .../German/request_quotation.html} | 0 .../German/request_quotation.tex} | 0 .../German/sales_delivery_order.tex} | 0 .../German/sales_order.html} | 0 .../German/sales_order.tex} | 0 .../German/sales_quotation.html} | 0 .../German/sales_quotation.odt} | Bin .../German/sales_quotation.tex} | 0 .../German/statement.html} | 0 .../German/statement.tex} | 0 .../German/taxbird.txb} | 0 .../German/ustva-2004.tex} | 0 .../German/ustva-2005.tex} | 0 .../German/ustva-2006.tex} | 0 .../German/ustva-2007.tex} | 0 .../German/ustva-2008.tex} | 0 .../German/ustva.html} | 0 .../German/ustva.tex} | 0 .../German/winston.xml} | 0 .../German/zahlungserinnerung.tex} | 0 .../German/zahlungserinnerung_invoice.tex} | 0 .../Service/balance_sheet.html} | 0 .../Service/check.tex} | 0 .../Service/income_statement.html} | 0 .../Service/invoice.html} | 0 .../Service/invoice.tex} | 0 .../Service/purchase_order.html} | 0 .../Service/purchase_order.tex} | 0 .../Service/receipt.tex} | 0 .../Service/sales_order.html} | 0 .../Service/sales_order.tex} | 0 .../Service/statement.html} | 0 .../Service/statement.tex} | 0 85 files changed, 66 insertions(+), 64 deletions(-) rename templates/{Default-balance_sheet.html => mastertemplates/Default/balance_sheet.html} (100%) rename templates/{Default-bin_list.html => mastertemplates/Default/bin_list.html} (100%) rename templates/{Default-bin_list.tex => mastertemplates/Default/bin_list.tex} (100%) rename templates/{Default-check.tex => mastertemplates/Default/check.tex} (100%) rename templates/{Default-income_statement.html => mastertemplates/Default/income_statement.html} (100%) rename templates/{Default-invoice.html => mastertemplates/Default/invoice.html} (100%) rename templates/{Default-invoice.tex => mastertemplates/Default/invoice.tex} (100%) rename templates/{Default-pick_list.html => mastertemplates/Default/pick_list.html} (100%) rename templates/{Default-pick_list.tex => mastertemplates/Default/pick_list.tex} (100%) rename templates/{Default-purchase_order.html => mastertemplates/Default/purchase_order.html} (100%) rename templates/{Default-purchase_order.tex => mastertemplates/Default/purchase_order.tex} (100%) rename templates/{Default-receipt.tex => mastertemplates/Default/receipt.tex} (100%) rename templates/{Default-request_quotation.html => mastertemplates/Default/request_quotation.html} (100%) rename templates/{Default-request_quotation.tex => mastertemplates/Default/request_quotation.tex} (100%) rename templates/{Default-sales_order.html => mastertemplates/Default/sales_order.html} (100%) rename templates/{Default-sales_order.tex => mastertemplates/Default/sales_order.tex} (100%) rename templates/{Default-sales_quotation.html => mastertemplates/Default/sales_quotation.html} (100%) rename templates/{Default-sales_quotation.tex => mastertemplates/Default/sales_quotation.tex} (100%) rename templates/{Default-statement.html => mastertemplates/Default/statement.html} (100%) rename templates/{Default-statement.tex => mastertemplates/Default/statement.tex} (100%) rename templates/{French-balance_sheet.html => mastertemplates/French/balance_sheet.html} (100%) rename templates/{French-check.tex => mastertemplates/French/check.tex} (100%) rename templates/{French-income_statement.html => mastertemplates/French/income_statement.html} (100%) rename templates/{French-invoice.html => mastertemplates/French/invoice.html} (100%) rename templates/{French-invoice.tex => mastertemplates/French/invoice.tex} (100%) rename templates/{French-purchase_order.html => mastertemplates/French/purchase_order.html} (100%) rename templates/{French-purchase_order.tex => mastertemplates/French/purchase_order.tex} (100%) rename templates/{French-receipt.tex => mastertemplates/French/receipt.tex} (100%) rename templates/{French-sales_order.html => mastertemplates/French/sales_order.html} (100%) rename templates/{French-sales_order.tex => mastertemplates/French/sales_order.tex} (100%) rename templates/{French-statement.html => mastertemplates/French/statement.html} (100%) rename templates/{French-statement.tex => mastertemplates/French/statement.tex} (100%) rename templates/{German-balance_sheet.html => mastertemplates/German/balance_sheet.html} (100%) rename templates/{German-bin_list.html => mastertemplates/German/bin_list.html} (100%) rename templates/{German-bin_list.tex => mastertemplates/German/bin_list.tex} (100%) rename templates/{German-bwa.html => mastertemplates/German/bwa.html} (100%) rename templates/{German-check.tex => mastertemplates/German/check.tex} (100%) rename templates/{German-credit_note.tex => mastertemplates/German/credit_note.tex} (100%) rename templates/{German-income_statement.html => mastertemplates/German/income_statement.html} (100%) rename templates/{German-invoice.html => mastertemplates/German/invoice.html} (100%) rename templates/{German-invoice.odt => mastertemplates/German/invoice.odt} (100%) rename templates/{German-invoice.tex => mastertemplates/German/invoice.tex} (100%) rename templates/{German-pick_list.html => mastertemplates/German/pick_list.html} (100%) rename templates/{German-pick_list.tex => mastertemplates/German/pick_list.tex} (100%) rename templates/{German-purchase_order.html => mastertemplates/German/purchase_order.html} (100%) rename templates/{German-purchase_order.tex => mastertemplates/German/purchase_order.tex} (100%) rename templates/{German-receipt.tex => mastertemplates/German/receipt.tex} (100%) rename templates/{German-request_quotation.html => mastertemplates/German/request_quotation.html} (100%) rename templates/{German-request_quotation.tex => mastertemplates/German/request_quotation.tex} (100%) rename templates/{German-sales_delivery_order.tex => mastertemplates/German/sales_delivery_order.tex} (100%) rename templates/{German-sales_order.html => mastertemplates/German/sales_order.html} (100%) rename templates/{German-sales_order.tex => mastertemplates/German/sales_order.tex} (100%) rename templates/{German-sales_quotation.html => mastertemplates/German/sales_quotation.html} (100%) rename templates/{German-sales_quotation.odt => mastertemplates/German/sales_quotation.odt} (100%) rename templates/{German-sales_quotation.tex => mastertemplates/German/sales_quotation.tex} (100%) rename templates/{German-statement.html => mastertemplates/German/statement.html} (100%) rename templates/{German-statement.tex => mastertemplates/German/statement.tex} (100%) rename templates/{German-taxbird.txb => mastertemplates/German/taxbird.txb} (100%) rename templates/{German-ustva-2004.tex => mastertemplates/German/ustva-2004.tex} (100%) rename templates/{German-ustva-2005.tex => mastertemplates/German/ustva-2005.tex} (100%) rename templates/{German-ustva-2006.tex => mastertemplates/German/ustva-2006.tex} (100%) rename templates/{German-ustva-2007.tex => mastertemplates/German/ustva-2007.tex} (100%) rename templates/{German-ustva-2008.tex => mastertemplates/German/ustva-2008.tex} (100%) rename templates/{German-ustva.html => mastertemplates/German/ustva.html} (100%) rename templates/{German-ustva.tex => mastertemplates/German/ustva.tex} (100%) rename templates/{German-winston.xml => mastertemplates/German/winston.xml} (100%) rename templates/{German-zahlungserinnerung.tex => mastertemplates/German/zahlungserinnerung.tex} (100%) rename templates/{German-zahlungserinnerung_invoice.tex => mastertemplates/German/zahlungserinnerung_invoice.tex} (100%) rename templates/{Service-balance_sheet.html => mastertemplates/Service/balance_sheet.html} (100%) rename templates/{Service-check.tex => mastertemplates/Service/check.tex} (100%) rename templates/{Service-income_statement.html => mastertemplates/Service/income_statement.html} (100%) rename templates/{Service-invoice.html => mastertemplates/Service/invoice.html} (100%) rename templates/{Service-invoice.tex => mastertemplates/Service/invoice.tex} (100%) rename templates/{Service-purchase_order.html => mastertemplates/Service/purchase_order.html} (100%) rename templates/{Service-purchase_order.tex => mastertemplates/Service/purchase_order.tex} (100%) rename templates/{Service-receipt.tex => mastertemplates/Service/receipt.tex} (100%) rename templates/{Service-sales_order.html => mastertemplates/Service/sales_order.html} (100%) rename templates/{Service-sales_order.tex => mastertemplates/Service/sales_order.tex} (100%) rename templates/{Service-statement.html => mastertemplates/Service/statement.html} (100%) rename templates/{Service-statement.tex => mastertemplates/Service/statement.tex} (100%) diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 2472f6c6c..276ae208b 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -425,27 +425,25 @@ sub edit_user_form { opendir TEMPLATEDIR, $::lx_office_conf{paths}->{templates} or $form->error($::lx_office_conf{paths}->{templates} . " : $ERRNO"); my @all = readdir(TEMPLATEDIR); my @alldir = sort grep { -d ($::lx_office_conf{paths}->{templates} . "/$_") && !/^\.\.?$/ } @all; - my @allhtml = sort grep { -f ($::lx_office_conf{paths}->{templates} . "/$_") && /\.html$/ } @all; closedir TEMPLATEDIR; @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir; - @alldir = grep !/^(webpages|\.svn)$/, @alldir; - - @allhtml = reverse grep !/Default/, @allhtml; - push @allhtml, 'Default'; - @allhtml = reverse @allhtml; + @alldir = grep !/^(webpages|mstertemplates|\.svn)$/, @alldir; $form->{ALL_TEMPLATES} = [ map { { "name", => $_, "selected" => $_ eq $myconfig->{templates} } } @alldir ]; - my $lastitem = $allhtml[0]; - $lastitem =~ s/-.*//g; - $form->{ALL_MASTER_TEMPLATES} = [ { "name" => $lastitem, "selected" => $lastitem eq "German" } ]; - foreach my $item (@allhtml) { - $item =~ s/-.*//g; - next if ($item eq $lastitem); + # mastertemplates + opendir TEMPLATEDIR, "$::lx_office_conf{paths}->{templates}/mastertemplates" or $form->error("$::lx_office_conf{paths}->{templates}/mastertemplates" . " : $ERRNO"); + my @allmaster = readdir(TEMPLATEDIR); + closedir TEMPLATEDIR; + + @allmaster = sort grep { -d ("$::lx_office_conf{paths}->{templates}/mastertemplates" . "/$_") && !/^\.\.?$/ } @allmaster; + @allmaster = reverse grep !/Default/, @allmaster; + push @allmaster, 'Default'; + @allmaster = reverse @allmaster; + foreach my $item (@allmaster) { push @{ $form->{ALL_MASTER_TEMPLATES} }, { "name" => $item, "selected" => $item eq "German" }; - $lastitem = $item; } # css dir has styles that are not intended as general layouts. @@ -541,16 +539,17 @@ sub save_user { umask(007); # copy templates to the directory - opendir TEMPLATEDIR, $::lx_office_conf{paths}->{templates} or $form->error($::lx_office_conf{paths}->{templates} . " : $ERRNO"); - my @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty|odt|xml|txb)$/, + my $templatedir = "$::lx_office_conf{paths}->{templates}/mastertemplates/$form->{mastertemplates}"; + + opendir TEMPLATEDIR, $templatedir or $form->error($templatedir . " : $ERRNO"); + my @templates = grep /.*?\.(html|tex|sty|odt|xml|txb)$/, readdir TEMPLATEDIR; closedir TEMPLATEDIR; foreach my $file (@templates) { - open(TEMP, "<", $::lx_office_conf{paths}->{templates} . "/$file") - or $form->error($::lx_office_conf{paths}->{templates} . "/$file : $ERRNO"); + open(TEMP, "<", $templatedir . "/$file") + or $form->error($templatedir . "/$file : $ERRNO"); - $file =~ s/\Q$form->{mastertemplates}\E-//; open(NEW, ">", "$form->{templates}/$file") or $form->error("$form->{templates}/$file : $ERRNO"); diff --git a/doc/INSTALL.html b/doc/INSTALL.html index 95cd087d1..31ccd435a 100644 --- a/doc/INSTALL.html +++ b/doc/INSTALL.html @@ -3,7 +3,7 @@ Lx-Office Installationsanleitung - + @@ -22,7 +22,7 @@

Lx-Office Installationsanleitung

-

Inhaltsverzeichnis

+

Table of Contents

-

+ nächstes: , aufwärts: Benötigte Software und Pakete @@ -181,7 +181,7 @@ installieren sind. Dafür sollte es kurz nach dem Release ein eigenes .deb geben.

Alternativ dazu kann die normale Installation durchgeführt werden -(see Manuelle Installation des Programmpaketes), wenn vorher ein +(siehe Manuelle Installation des Programmpaketes), wenn vorher ein Kompatibilitätspaket installiert wird, das die fehlenden Pakete bereitstellt. Das Paket ist auf Sourceforge unter dem Namen lx-erp-perl-libs-compat-v2.tar.gz hinterlegt. @@ -193,11 +193,11 @@ Das Paket ist auf Pakete) die enthaltenen Pakete erkennen. +

Danach sollte der Installationscheck (siehe Pakete) die enthaltenen Pakete erkennen.

-

+ voriges: Betriebssystem, aufwärts: Benötigte Software und Pakete @@ -272,8 +272,8 @@ benötigten Perl-Module installiert sind. Der Aufruf lautet wie folgt:
-

+ nächstes: , voriges: Benötigte Software und Pakete, aufwärts: Top @@ -317,9 +317,9 @@ jeden neuen Benutzer, der in lx-office angelegt wird, anlegen dürfen:
+

-

nächstes: , voriges: Manuelle Installation des Programmpaketes, aufwärts: Top @@ -338,9 +338,9 @@ aufwärts: Top
+

-

nächstes: , aufwärts: Anpassung der PostgreSQL-Konfiguration @@ -374,9 +374,9 @@ Lx-Office mit ISO-8859-15 als Encoding betrieben werden.

Das Encoding einer Datenbank kann in psql mit \l geprüft werden.

+

-

nächstes: , voriges: Zeichensätze/die Verwendung von UTF-8, aufwärts: Anpassung der PostgreSQL-Konfiguration @@ -414,9 +414,9 @@ host all lxoffice 127.0.0.1 255.255.255.255 password<
+

-

nächstes: , voriges: Ã„nderungen an Konfigurationsdateien, aufwärts: Anpassung der PostgreSQL-Konfiguration @@ -445,8 +445,8 @@ unter /usr/lib/postgresql/lib/plpgsql.so.
-

+ voriges: Erweiterung für servergespeicherte Prozeduren, aufwärts: Anpassung der PostgreSQL-Konfiguration @@ -468,9 +468,9 @@ bzw. den hier gewählten Benutzernamen.
+

-

nächstes: , voriges: Anpassung der PostgreSQL-Konfiguration, aufwärts: Top @@ -524,9 +524,9 @@ folgende Option in die Konfiguration aufzunehmen:
+

-

nächstes: , voriges: Apache-Konfiguration, aufwärts: Top @@ -549,9 +549,9 @@ Rechnungen benutzt, wird aber in Zukunft deutlich mehr Aufgaben
+

-

nächstes: , aufwärts: Der Task-Server @@ -565,14 +565,14 @@ sind:
  • login: gültiger Lx-Office-Benutzername, der benutzt wird, um die zu verwendende Datenbankverbindung auszulesen. Der Benutzer muss in der Administration angelegt werden. Diese Option muss angegeben werden. -
  • run_as: Wird der Server vom Systembenutzer root gestartet, so wechselt er auf den mit run_as angegebenen Systembenutzer. Der Systembenutzer muss dieselben Lese- und Schreibrechte haben, wie auch der Webserverbenutzer (siehe see Manuelle Installation des Programmpaketes). Daher ist es sinnvoll, hier denselben Systembenutzer einzutragen, unter dem auch der Webserver läuft. +
  • run_as: Wird der Server vom Systembenutzer root gestartet, so wechselt er auf den mit run_as angegebenen Systembenutzer. Der Systembenutzer muss dieselben Lese- und Schreibrechte haben, wie auch der Webserverbenutzer (siehe siehe Manuelle Installation des Programmpaketes). Daher ist es sinnvoll, hier denselben Systembenutzer einzutragen, unter dem auch der Webserver läuft.
  • debug: Schaltet Debug-Informationen an und aus.
+

-

voriges: Prozesskontrolle, aufwärts: Der Task-Server @@ -625,8 +625,8 @@ Datei den Pfad zum Task-Server an (Zeile exec ....). service lx-office-task-server start
-

+ nächstes: , voriges: Konfiguration des Task-Servers, aufwärts: Der Task-Server @@ -655,8 +655,8 @@ Runlevel-Scripte benutzt werden (siehe oben).
-

+ nächstes: , voriges: Der Task-Server, aufwärts: Top @@ -679,8 +679,8 @@ die Verwaltung von Gruppen und weitere Einstellungen
-

+ nächstes: , aufwärts: Benutzerauthentifizierung und Administratorpasswort @@ -711,8 +711,8 @@ v2.6.0 angelegt werden. Eine Beispielkonfigurationsdatei benutzt werden kann.
-

+ nächstes: , voriges: Grundlagen zur Benutzerauthentifizierung, aufwärts: Benutzerauthentifizierung und Administratorpasswort @@ -727,8 +727,8 @@ mehr im Administrationsinterface selber geändert werden. Der Parameter dazu heißt $self->{admin_password}.
-

+ nächstes: , voriges: Administratorpasswort, aufwärts: Benutzerauthentifizierung und Administratorpasswort @@ -753,9 +753,9 @@ Parameter anzugeben: automatisch anlegen (mehr dazu siehe unten).
+

-

nächstes: , voriges: Authentifizierungsdatenbank, aufwärts: Benutzerauthentifizierung und Administratorpasswort @@ -797,9 +797,9 @@ den LDAP-Server in $self->{LDAP_config} angegeben werden:
+

-

nächstes: , voriges: Passwortüberprüfung, aufwärts: Benutzerauthentifizierung und Administratorpasswort @@ -817,8 +817,8 @@ Parameter $self->{cookie_name} gesetzt. existiert.
-

+ voriges: Name des Session-Cookies, aufwärts: Benutzerauthentifizierung und Administratorpasswort @@ -836,9 +836,9 @@ sein sollte:
+

-

nächstes: , voriges: Benutzerauthentifizierung und Administratorpasswort, aufwärts: Top @@ -866,9 +866,9 @@ unter folgender URL finden:
+

-

nächstes: , aufwärts: Benutzer- und Gruppenverwaltung @@ -915,8 +915,8 @@ angelegt werden sollten, lautet:
-

+ nächstes: , voriges: Zusammenhänge, aufwärts: Benutzer- und Gruppenverwaltung @@ -944,8 +944,8 @@ kann. Auch die Authentifizierungsdatenbank muss mit diesem Zeichensatz angelegt worden sein.
-

+ nächstes: , voriges: Datenbanken anlegen, aufwärts: Benutzer- und Gruppenverwaltung @@ -964,8 +964,8 @@ Authentifizierungsdatenbank gespeichert werden. Sie gelten für alle Datenbanken, die in dieser Installation verwaltet werden.
-

+ nächstes: , voriges: Gruppen anlegen, aufwärts: Benutzer- und Gruppenverwaltung @@ -988,8 +988,8 @@ aktiv, so ist das Passwort-Feld deaktiviert. angelegten Datenbanken eingetragen werden.
-

+ nächstes: , voriges: Benutzer anlegen, aufwärts: Benutzer- und Gruppenverwaltung @@ -1012,8 +1012,8 @@ ausgewählten Spalte hinzugefügt.
-

+ voriges: Gruppenmitgliedschaften verwalten, aufwärts: Benutzer- und Gruppenverwaltung @@ -1041,9 +1041,9 @@ wieder anmelden und mit dem System arbeiten.
+

-

nächstes: , voriges: Benutzer- und Gruppenverwaltung, aufwärts: Top @@ -1088,9 +1088,9 @@ darf.
+

-

nächstes: , voriges: Drucken mit Lx-Office, aufwärts: Top @@ -1140,7 +1140,7 @@ Python-UNO-Bindings benötigt, die Bestandteil von OpenOffice 2 sind. Dokument OpenOffice neu gestartet und die Konvertierung mit Hilfe eines Makros durchgeführt. Dieses Makro muss in der Dokumentenvorlage enthalten sein und “Standard.Conversion.ConvertSelfToPDF()” -heißen. Die Beispielvorlage ‘templates/German-invoice.odt’ +heißen. Die Beispielvorlage ‘templates/mastertemplates/German/invoice.odt’ enthält ein solches Makro, das in jeder anderen Dokumentenvorlage ebenfalls enthalten sein muss. @@ -1156,14 +1156,14 @@ folgender Befehl auszuführen:

Dieses Verzeichnis, wie auch das komplette users-Verzeichnis, muss vom Webserver beschreibbar sein. Dieses wurde bereits erledigt -(see Manuelle Installation des Programmpaketes), kann aber erneut überprüft +(siehe Manuelle Installation des Programmpaketes), kann aber erneut überprüft werden, wenn die Konvertierung nach PDF fehlschlägt.

+

-

voriges: OpenDocument-Vorlagen, aufwärts: Top diff --git a/doc/INSTALL.texi b/doc/INSTALL.texi index 56d47ddc7..785f25cdf 100644 --- a/doc/INSTALL.texi +++ b/doc/INSTALL.texi @@ -890,7 +890,7 @@ Ist @code{$openofficeorg_daemon} nicht gesetzt, so wird für jedes Dokument OpenOffice neu gestartet und die Konvertierung mit Hilfe eines Makros durchgeführt. Dieses Makro muss in der Dokumentenvorlage enthalten sein und ``Standard.Conversion.ConvertSelfToPDF()'' -heißen. Die Beispielvorlage @samp{templates/German-invoice.odt} +heißen. Die Beispielvorlage @samp{templates/mastertemplates/German/invoice.odt} enthält ein solches Makro, das in jeder anderen Dokumentenvorlage ebenfalls enthalten sein muss. diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt index 2e08f0c14..3539c127e 100644 --- a/doc/INSTALL.txt +++ b/doc/INSTALL.txt @@ -1,5 +1,5 @@ -Inhaltsverzeichnis -****************** +Table of Contents +***************** Inhalt der Anleitung 1 Aktuelle Hinweise @@ -837,9 +837,9 @@ benötigt, die Bestandteil von OpenOffice 2 sind. Dokument OpenOffice neu gestartet und die Konvertierung mit Hilfe eines Makros durchgeführt. Dieses Makro muss in der Dokumentenvorlage enthalten sein und "Standard.Conversion.ConvertSelfToPDF()" heißen. Die -Beispielvorlage `templates/German-invoice.odt' enthält ein solches -Makro, das in jeder anderen Dokumentenvorlage ebenfalls enthalten sein -muss. +Beispielvorlage `templates/mastertemplates/German/invoice.odt' enthält +ein solches Makro, das in jeder anderen Dokumentenvorlage ebenfalls +enthalten sein muss. Als letztes muss herausgefunden werden, welchen Namen OpenOffice.org Writer dem Verzeichnis mit den Benutzereinstellungen gibt. Unter Debian diff --git a/doc/changelog b/doc/changelog index d044bcaa1..23fe6ab4c 100644 --- a/doc/changelog +++ b/doc/changelog @@ -23,6 +23,9 @@ - Buchungsjournal um Filter nach Bearbeiter und Buchungsdatum (ungleich Rechnungsdatum) erweitert +- Mastertemplates für den Ausdruck sind in eigene Unterverzeichnisse gewandert. + Dadurch wird das Hinzufügen neuer Vorlagensätze einfacher. + Kleinere neue Features und Detailverbesserungen: - á (LATIN SMALL LETTER A WITH ACUTE) wird in Latex-Vorlagen nicht mehr durch diff --git a/templates/Default-balance_sheet.html b/templates/mastertemplates/Default/balance_sheet.html similarity index 100% rename from templates/Default-balance_sheet.html rename to templates/mastertemplates/Default/balance_sheet.html diff --git a/templates/Default-bin_list.html b/templates/mastertemplates/Default/bin_list.html similarity index 100% rename from templates/Default-bin_list.html rename to templates/mastertemplates/Default/bin_list.html diff --git a/templates/Default-bin_list.tex b/templates/mastertemplates/Default/bin_list.tex similarity index 100% rename from templates/Default-bin_list.tex rename to templates/mastertemplates/Default/bin_list.tex diff --git a/templates/Default-check.tex b/templates/mastertemplates/Default/check.tex similarity index 100% rename from templates/Default-check.tex rename to templates/mastertemplates/Default/check.tex diff --git a/templates/Default-income_statement.html b/templates/mastertemplates/Default/income_statement.html similarity index 100% rename from templates/Default-income_statement.html rename to templates/mastertemplates/Default/income_statement.html diff --git a/templates/Default-invoice.html b/templates/mastertemplates/Default/invoice.html similarity index 100% rename from templates/Default-invoice.html rename to templates/mastertemplates/Default/invoice.html diff --git a/templates/Default-invoice.tex b/templates/mastertemplates/Default/invoice.tex similarity index 100% rename from templates/Default-invoice.tex rename to templates/mastertemplates/Default/invoice.tex diff --git a/templates/Default-pick_list.html b/templates/mastertemplates/Default/pick_list.html similarity index 100% rename from templates/Default-pick_list.html rename to templates/mastertemplates/Default/pick_list.html diff --git a/templates/Default-pick_list.tex b/templates/mastertemplates/Default/pick_list.tex similarity index 100% rename from templates/Default-pick_list.tex rename to templates/mastertemplates/Default/pick_list.tex diff --git a/templates/Default-purchase_order.html b/templates/mastertemplates/Default/purchase_order.html similarity index 100% rename from templates/Default-purchase_order.html rename to templates/mastertemplates/Default/purchase_order.html diff --git a/templates/Default-purchase_order.tex b/templates/mastertemplates/Default/purchase_order.tex similarity index 100% rename from templates/Default-purchase_order.tex rename to templates/mastertemplates/Default/purchase_order.tex diff --git a/templates/Default-receipt.tex b/templates/mastertemplates/Default/receipt.tex similarity index 100% rename from templates/Default-receipt.tex rename to templates/mastertemplates/Default/receipt.tex diff --git a/templates/Default-request_quotation.html b/templates/mastertemplates/Default/request_quotation.html similarity index 100% rename from templates/Default-request_quotation.html rename to templates/mastertemplates/Default/request_quotation.html diff --git a/templates/Default-request_quotation.tex b/templates/mastertemplates/Default/request_quotation.tex similarity index 100% rename from templates/Default-request_quotation.tex rename to templates/mastertemplates/Default/request_quotation.tex diff --git a/templates/Default-sales_order.html b/templates/mastertemplates/Default/sales_order.html similarity index 100% rename from templates/Default-sales_order.html rename to templates/mastertemplates/Default/sales_order.html diff --git a/templates/Default-sales_order.tex b/templates/mastertemplates/Default/sales_order.tex similarity index 100% rename from templates/Default-sales_order.tex rename to templates/mastertemplates/Default/sales_order.tex diff --git a/templates/Default-sales_quotation.html b/templates/mastertemplates/Default/sales_quotation.html similarity index 100% rename from templates/Default-sales_quotation.html rename to templates/mastertemplates/Default/sales_quotation.html diff --git a/templates/Default-sales_quotation.tex b/templates/mastertemplates/Default/sales_quotation.tex similarity index 100% rename from templates/Default-sales_quotation.tex rename to templates/mastertemplates/Default/sales_quotation.tex diff --git a/templates/Default-statement.html b/templates/mastertemplates/Default/statement.html similarity index 100% rename from templates/Default-statement.html rename to templates/mastertemplates/Default/statement.html diff --git a/templates/Default-statement.tex b/templates/mastertemplates/Default/statement.tex similarity index 100% rename from templates/Default-statement.tex rename to templates/mastertemplates/Default/statement.tex diff --git a/templates/French-balance_sheet.html b/templates/mastertemplates/French/balance_sheet.html similarity index 100% rename from templates/French-balance_sheet.html rename to templates/mastertemplates/French/balance_sheet.html diff --git a/templates/French-check.tex b/templates/mastertemplates/French/check.tex similarity index 100% rename from templates/French-check.tex rename to templates/mastertemplates/French/check.tex diff --git a/templates/French-income_statement.html b/templates/mastertemplates/French/income_statement.html similarity index 100% rename from templates/French-income_statement.html rename to templates/mastertemplates/French/income_statement.html diff --git a/templates/French-invoice.html b/templates/mastertemplates/French/invoice.html similarity index 100% rename from templates/French-invoice.html rename to templates/mastertemplates/French/invoice.html diff --git a/templates/French-invoice.tex b/templates/mastertemplates/French/invoice.tex similarity index 100% rename from templates/French-invoice.tex rename to templates/mastertemplates/French/invoice.tex diff --git a/templates/French-purchase_order.html b/templates/mastertemplates/French/purchase_order.html similarity index 100% rename from templates/French-purchase_order.html rename to templates/mastertemplates/French/purchase_order.html diff --git a/templates/French-purchase_order.tex b/templates/mastertemplates/French/purchase_order.tex similarity index 100% rename from templates/French-purchase_order.tex rename to templates/mastertemplates/French/purchase_order.tex diff --git a/templates/French-receipt.tex b/templates/mastertemplates/French/receipt.tex similarity index 100% rename from templates/French-receipt.tex rename to templates/mastertemplates/French/receipt.tex diff --git a/templates/French-sales_order.html b/templates/mastertemplates/French/sales_order.html similarity index 100% rename from templates/French-sales_order.html rename to templates/mastertemplates/French/sales_order.html diff --git a/templates/French-sales_order.tex b/templates/mastertemplates/French/sales_order.tex similarity index 100% rename from templates/French-sales_order.tex rename to templates/mastertemplates/French/sales_order.tex diff --git a/templates/French-statement.html b/templates/mastertemplates/French/statement.html similarity index 100% rename from templates/French-statement.html rename to templates/mastertemplates/French/statement.html diff --git a/templates/French-statement.tex b/templates/mastertemplates/French/statement.tex similarity index 100% rename from templates/French-statement.tex rename to templates/mastertemplates/French/statement.tex diff --git a/templates/German-balance_sheet.html b/templates/mastertemplates/German/balance_sheet.html similarity index 100% rename from templates/German-balance_sheet.html rename to templates/mastertemplates/German/balance_sheet.html diff --git a/templates/German-bin_list.html b/templates/mastertemplates/German/bin_list.html similarity index 100% rename from templates/German-bin_list.html rename to templates/mastertemplates/German/bin_list.html diff --git a/templates/German-bin_list.tex b/templates/mastertemplates/German/bin_list.tex similarity index 100% rename from templates/German-bin_list.tex rename to templates/mastertemplates/German/bin_list.tex diff --git a/templates/German-bwa.html b/templates/mastertemplates/German/bwa.html similarity index 100% rename from templates/German-bwa.html rename to templates/mastertemplates/German/bwa.html diff --git a/templates/German-check.tex b/templates/mastertemplates/German/check.tex similarity index 100% rename from templates/German-check.tex rename to templates/mastertemplates/German/check.tex diff --git a/templates/German-credit_note.tex b/templates/mastertemplates/German/credit_note.tex similarity index 100% rename from templates/German-credit_note.tex rename to templates/mastertemplates/German/credit_note.tex diff --git a/templates/German-income_statement.html b/templates/mastertemplates/German/income_statement.html similarity index 100% rename from templates/German-income_statement.html rename to templates/mastertemplates/German/income_statement.html diff --git a/templates/German-invoice.html b/templates/mastertemplates/German/invoice.html similarity index 100% rename from templates/German-invoice.html rename to templates/mastertemplates/German/invoice.html diff --git a/templates/German-invoice.odt b/templates/mastertemplates/German/invoice.odt similarity index 100% rename from templates/German-invoice.odt rename to templates/mastertemplates/German/invoice.odt diff --git a/templates/German-invoice.tex b/templates/mastertemplates/German/invoice.tex similarity index 100% rename from templates/German-invoice.tex rename to templates/mastertemplates/German/invoice.tex diff --git a/templates/German-pick_list.html b/templates/mastertemplates/German/pick_list.html similarity index 100% rename from templates/German-pick_list.html rename to templates/mastertemplates/German/pick_list.html diff --git a/templates/German-pick_list.tex b/templates/mastertemplates/German/pick_list.tex similarity index 100% rename from templates/German-pick_list.tex rename to templates/mastertemplates/German/pick_list.tex diff --git a/templates/German-purchase_order.html b/templates/mastertemplates/German/purchase_order.html similarity index 100% rename from templates/German-purchase_order.html rename to templates/mastertemplates/German/purchase_order.html diff --git a/templates/German-purchase_order.tex b/templates/mastertemplates/German/purchase_order.tex similarity index 100% rename from templates/German-purchase_order.tex rename to templates/mastertemplates/German/purchase_order.tex diff --git a/templates/German-receipt.tex b/templates/mastertemplates/German/receipt.tex similarity index 100% rename from templates/German-receipt.tex rename to templates/mastertemplates/German/receipt.tex diff --git a/templates/German-request_quotation.html b/templates/mastertemplates/German/request_quotation.html similarity index 100% rename from templates/German-request_quotation.html rename to templates/mastertemplates/German/request_quotation.html diff --git a/templates/German-request_quotation.tex b/templates/mastertemplates/German/request_quotation.tex similarity index 100% rename from templates/German-request_quotation.tex rename to templates/mastertemplates/German/request_quotation.tex diff --git a/templates/German-sales_delivery_order.tex b/templates/mastertemplates/German/sales_delivery_order.tex similarity index 100% rename from templates/German-sales_delivery_order.tex rename to templates/mastertemplates/German/sales_delivery_order.tex diff --git a/templates/German-sales_order.html b/templates/mastertemplates/German/sales_order.html similarity index 100% rename from templates/German-sales_order.html rename to templates/mastertemplates/German/sales_order.html diff --git a/templates/German-sales_order.tex b/templates/mastertemplates/German/sales_order.tex similarity index 100% rename from templates/German-sales_order.tex rename to templates/mastertemplates/German/sales_order.tex diff --git a/templates/German-sales_quotation.html b/templates/mastertemplates/German/sales_quotation.html similarity index 100% rename from templates/German-sales_quotation.html rename to templates/mastertemplates/German/sales_quotation.html diff --git a/templates/German-sales_quotation.odt b/templates/mastertemplates/German/sales_quotation.odt similarity index 100% rename from templates/German-sales_quotation.odt rename to templates/mastertemplates/German/sales_quotation.odt diff --git a/templates/German-sales_quotation.tex b/templates/mastertemplates/German/sales_quotation.tex similarity index 100% rename from templates/German-sales_quotation.tex rename to templates/mastertemplates/German/sales_quotation.tex diff --git a/templates/German-statement.html b/templates/mastertemplates/German/statement.html similarity index 100% rename from templates/German-statement.html rename to templates/mastertemplates/German/statement.html diff --git a/templates/German-statement.tex b/templates/mastertemplates/German/statement.tex similarity index 100% rename from templates/German-statement.tex rename to templates/mastertemplates/German/statement.tex diff --git a/templates/German-taxbird.txb b/templates/mastertemplates/German/taxbird.txb similarity index 100% rename from templates/German-taxbird.txb rename to templates/mastertemplates/German/taxbird.txb diff --git a/templates/German-ustva-2004.tex b/templates/mastertemplates/German/ustva-2004.tex similarity index 100% rename from templates/German-ustva-2004.tex rename to templates/mastertemplates/German/ustva-2004.tex diff --git a/templates/German-ustva-2005.tex b/templates/mastertemplates/German/ustva-2005.tex similarity index 100% rename from templates/German-ustva-2005.tex rename to templates/mastertemplates/German/ustva-2005.tex diff --git a/templates/German-ustva-2006.tex b/templates/mastertemplates/German/ustva-2006.tex similarity index 100% rename from templates/German-ustva-2006.tex rename to templates/mastertemplates/German/ustva-2006.tex diff --git a/templates/German-ustva-2007.tex b/templates/mastertemplates/German/ustva-2007.tex similarity index 100% rename from templates/German-ustva-2007.tex rename to templates/mastertemplates/German/ustva-2007.tex diff --git a/templates/German-ustva-2008.tex b/templates/mastertemplates/German/ustva-2008.tex similarity index 100% rename from templates/German-ustva-2008.tex rename to templates/mastertemplates/German/ustva-2008.tex diff --git a/templates/German-ustva.html b/templates/mastertemplates/German/ustva.html similarity index 100% rename from templates/German-ustva.html rename to templates/mastertemplates/German/ustva.html diff --git a/templates/German-ustva.tex b/templates/mastertemplates/German/ustva.tex similarity index 100% rename from templates/German-ustva.tex rename to templates/mastertemplates/German/ustva.tex diff --git a/templates/German-winston.xml b/templates/mastertemplates/German/winston.xml similarity index 100% rename from templates/German-winston.xml rename to templates/mastertemplates/German/winston.xml diff --git a/templates/German-zahlungserinnerung.tex b/templates/mastertemplates/German/zahlungserinnerung.tex similarity index 100% rename from templates/German-zahlungserinnerung.tex rename to templates/mastertemplates/German/zahlungserinnerung.tex diff --git a/templates/German-zahlungserinnerung_invoice.tex b/templates/mastertemplates/German/zahlungserinnerung_invoice.tex similarity index 100% rename from templates/German-zahlungserinnerung_invoice.tex rename to templates/mastertemplates/German/zahlungserinnerung_invoice.tex diff --git a/templates/Service-balance_sheet.html b/templates/mastertemplates/Service/balance_sheet.html similarity index 100% rename from templates/Service-balance_sheet.html rename to templates/mastertemplates/Service/balance_sheet.html diff --git a/templates/Service-check.tex b/templates/mastertemplates/Service/check.tex similarity index 100% rename from templates/Service-check.tex rename to templates/mastertemplates/Service/check.tex diff --git a/templates/Service-income_statement.html b/templates/mastertemplates/Service/income_statement.html similarity index 100% rename from templates/Service-income_statement.html rename to templates/mastertemplates/Service/income_statement.html diff --git a/templates/Service-invoice.html b/templates/mastertemplates/Service/invoice.html similarity index 100% rename from templates/Service-invoice.html rename to templates/mastertemplates/Service/invoice.html diff --git a/templates/Service-invoice.tex b/templates/mastertemplates/Service/invoice.tex similarity index 100% rename from templates/Service-invoice.tex rename to templates/mastertemplates/Service/invoice.tex diff --git a/templates/Service-purchase_order.html b/templates/mastertemplates/Service/purchase_order.html similarity index 100% rename from templates/Service-purchase_order.html rename to templates/mastertemplates/Service/purchase_order.html diff --git a/templates/Service-purchase_order.tex b/templates/mastertemplates/Service/purchase_order.tex similarity index 100% rename from templates/Service-purchase_order.tex rename to templates/mastertemplates/Service/purchase_order.tex diff --git a/templates/Service-receipt.tex b/templates/mastertemplates/Service/receipt.tex similarity index 100% rename from templates/Service-receipt.tex rename to templates/mastertemplates/Service/receipt.tex diff --git a/templates/Service-sales_order.html b/templates/mastertemplates/Service/sales_order.html similarity index 100% rename from templates/Service-sales_order.html rename to templates/mastertemplates/Service/sales_order.html diff --git a/templates/Service-sales_order.tex b/templates/mastertemplates/Service/sales_order.tex similarity index 100% rename from templates/Service-sales_order.tex rename to templates/mastertemplates/Service/sales_order.tex diff --git a/templates/Service-statement.html b/templates/mastertemplates/Service/statement.html similarity index 100% rename from templates/Service-statement.html rename to templates/mastertemplates/Service/statement.html diff --git a/templates/Service-statement.tex b/templates/mastertemplates/Service/statement.tex similarity index 100% rename from templates/Service-statement.tex rename to templates/mastertemplates/Service/statement.tex -- 2.20.1