RB Druckvorlagen weiter überarbeitet
authorBernd Blessmann <bibi@online.de>
Thu, 23 Feb 2012 11:34:48 +0000 (12:34 +0100)
committerBernd Blessmann <bibi@online.de>
Thu, 23 Feb 2012 11:34:48 +0000 (12:34 +0100)
  - Sprache nach langcode (meta) und nicht nach tmpfile wählen
  - keine symb. Links mehr für verschiedene Sprachen
  - echte RB-Firmenangaben
  - Mandant nach titlebar wählen

40 files changed:
templates/print/RB/Readme.tex
templates/print/RB/credit_note.tex
templates/print/RB/credit_note_DE.tex [deleted symlink]
templates/print/RB/credit_note_EN.tex [deleted symlink]
templates/print/RB/deutsch.tex
templates/print/RB/english.tex
templates/print/RB/firma/euro_account.tex
templates/print/RB/firma/ident.tex
templates/print/RB/firma/usd_account.tex
templates/print/RB/insettings.tex
templates/print/RB/invoice.tex
templates/print/RB/invoice_DE.tex [deleted symlink]
templates/print/RB/invoice_EN.tex [deleted symlink]
templates/print/RB/purchase_delivery_order.tex
templates/print/RB/purchase_delivery_order_DE.tex [deleted symlink]
templates/print/RB/purchase_delivery_order_EN.tex [deleted symlink]
templates/print/RB/purchase_order.tex
templates/print/RB/purchase_order_DE.tex [deleted symlink]
templates/print/RB/purchase_order_EN.tex [deleted symlink]
templates/print/RB/request_quotation.tex
templates/print/RB/request_quotation_DE.tex [deleted symlink]
templates/print/RB/request_quotation_EN.tex [deleted symlink]
templates/print/RB/sales_delivery_order.tex
templates/print/RB/sales_delivery_order_DE.tex [deleted symlink]
templates/print/RB/sales_delivery_order_EN.tex [deleted symlink]
templates/print/RB/sales_order.tex
templates/print/RB/sales_order_DE.tex [deleted symlink]
templates/print/RB/sales_order_EN.tex [deleted symlink]
templates/print/RB/sales_quotation.tex
templates/print/RB/sales_quotation_DE.tex [deleted symlink]
templates/print/RB/sales_quotation_EN.tex [deleted symlink]
templates/print/RB/statement.tex
templates/print/RB/statement_DE.tex [deleted symlink]
templates/print/RB/statement_EN.tex [deleted symlink]
templates/print/RB/zahlungserinnerung.tex
templates/print/RB/zahlungserinnerung_DE.tex [deleted symlink]
templates/print/RB/zahlungserinnerung_EN.tex [deleted symlink]
templates/print/RB/zahlungserinnerung_invoice.tex
templates/print/RB/zahlungserinnerung_invoice_DE.tex [deleted symlink]
templates/print/RB/zahlungserinnerung_invoice_EN.tex [deleted symlink]

index d0f03f2..817eaee 100644 (file)
 %   Dokument vorher mit \newcommand neu definiert.
 %
 % Sprachen:
-%   In 'insettings.tex' wird anhand des herangezogenen
-%   Vorlagen-Dateinamens die Sprache unterschieden und eine
-%   entsprechende Übersetzungsdatei geladen, die Textbausteine
-%   bzw. -Schnipsel enthält. Die Vorlagen verwenden nur diese
-%   Schnipsel. Im Moment sind die Vorlagenkürzel DE und EN in
+%   In 'insettings.tex' wird anhand des verwendeten Sprachkürzels die
+%   Sprache unterschieden und eine entsprechende Übersetzungsdatei geladen,
+%   die Textbausteine  bzw. -Schnipsel enthält. Die Vorlagen verwenden nur
+%   diese Schnipsel. Im Moment werden die Vorlagenkürzel DE und EN in
 %   Benutzung mit den entsprechenden Übersetzungsdateien 'deutsch.tex'
-%   und 'english.tex'.
-%
-%   Die eigentlichen Vorlagen sind gleich, deshalb sind die Dateien
-%   für die Sprachen (z.B. invoice_DE.tex) nur symbolische Links auf
-%   die Default-Datei ohne Sprachkürzel (z.B. invoice.tex).
-%
+%   und 'english.tex' unterschieden.
 %
 % Mandanten / Firma:
 %   Um gleiche Vorlagen für verschiedene Firmen verwenden zu können, wird je
-%   nach dem Wert der Lx-Office-Variablen <%employee_company%> ein
+%   nach dem Wert der Lx-Office-Variablen <%titlebar%> ein
 %   Firmenverzeichnis ausgewählt (siehe 'insettings.tex'), in dem Briefkopf,
 %   Identitäten und Währungs-/Kontoeinstellungen hinterlegt sind.
-%   <%employee_company%> entspricht dem Feld "Firma" bei den
-%   Benutzereinstellungen. Ist kein Firmenname eingetragen, so wird das
+%   <%titlebar%> enthält den Namen des Benutzers und der verwendeten
+%   Mandantendatenbank. Ist kein Firmenname eingetragen, so wird das
 %   generische Unterverzeichnis 'firma' verwendet.
-
+%   Das heißt, dass ein Firmenverzeichnis mit dem Namen der Mandantendatenbank
+%   angelegt werden sollte.
 %
 % Identitäten:
 %    In jedem Firmen-Unterverzeichnis soll eine Datei 'ident.tex'
index fe69e9f..f64222d 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/credit_note_DE.tex b/templates/print/RB/credit_note_DE.tex
deleted file mode 120000 (symlink)
index 12eca38..0000000
+++ /dev/null
@@ -1 +0,0 @@
-credit_note.tex
\ No newline at end of file
diff --git a/templates/print/RB/credit_note_EN.tex b/templates/print/RB/credit_note_EN.tex
deleted file mode 120000 (symlink)
index 12eca38..0000000
+++ /dev/null
@@ -1 +0,0 @@
-credit_note.tex
\ No newline at end of file
index 03cef40..997c3a0 100644 (file)
@@ -40,7 +40,8 @@
 \newcommand{\weiteraufnaechsterseite} {weiter auf der nächsten Seite ...}
 
 \newcommand{\zahlung} {Zahlungsbedingungen:}
-
+\newcommand{\textTelefon} {Tel.:}
+\newcommand{\textFax} {Fax:}
 
 % angebot (sales_quotion)
 \newcommand{\angebot} {Angebot}
index 8a36b89..901fbd2 100644 (file)
@@ -39,7 +39,8 @@
 \newcommand{\weiteraufnaechsterseite} {to be continued on next page  ..}
 
 \newcommand{\zahlung} {Payment terms:}
-
+\newcommand{\textTelefon} {Tel.:}
+\newcommand{\textFax} {Fax:}
 
 % angebot (sales_quotion)
 \newcommand{\angebot} {Quotation}
index 6407de9..fff1ac5 100644 (file)
@@ -1,6 +1,6 @@
 \newcommand{\currency}{\euro}
-\newcommand{\kontonummer}{123456789}
-\newcommand{\bank}{Unsere Bank}
-\newcommand{\bankleitzahl}{10010010}
-\newcommand{\bic}{BICXYZ}
-\newcommand{\iban}{IBAN 12345679 1001001}
+\newcommand{\kontonummer}{4004 283 800}
+\newcommand{\bank}{GLS Bank eG}
+\newcommand{\bankleitzahl}{430 609 67}
+\newcommand{\bic}{DE87430609674004283800}
+\newcommand{\iban}{GENODEM1GLS}
index 65e798b..3c82c64 100644 (file)
@@ -1,8 +1,9 @@
-\newcommand{\telefon} {012323}
-\newcommand{\fax} {012324}
-\newcommand{\firma} {R\&B}
+\newcommand{\telefon} {++49 228 360 14 351}
+\newcommand{\fax} {}
+\newcommand{\firma} {Richardson \& Büren GbR}
 \newcommand{\strasse} {Siemensstr. 8}
 \newcommand{\ort} {53121 Bonn}
-\newcommand{\ustid} {uuu1231221}
-\newcommand{\email} {tralla@tra.la}
-\newcommand{\homepage} {http://www.tra.la}
+\newcommand{\ustid} {DE238288407}
+\newcommand{\finanzamt} {Finanzamt Bonn-Innenstadt}
+\newcommand{\email} {information@lx-office-hosting.de}
+\newcommand{\homepage} {http://www.lx-office-hosting.de}
index 67b89fb..01b8fc0 100644 (file)
@@ -1,6 +1,6 @@
 \newcommand{\currency}{\$}
-\newcommand{\kontonummer}{123456789}
-\newcommand{\bank}{Unsere Bank}
-\newcommand{\bankleitzahl}{10010010}
-\newcommand{\bic}{BICXYZ}
-\newcommand{\iban}{IBAN 12345679 1001002}
+\newcommand{\kontonummer}{4004 283 800}
+\newcommand{\bank}{GLS Bank eG}
+\newcommand{\bankleitzahl}{430 609 67}
+\newcommand{\bic}{DE87430609674004283800}
+\newcommand{\iban}{GENODEM1GLS}
index 2d9f333..cccffb9 100644 (file)
@@ -1,6 +1,6 @@
 % Sprachüberprüfung
-\IfSubStringInString{\_EN}{\lxtmpfile}{\input{english.tex}}{
-  \IfSubStringInString{\_DE}{\lxtmpfile}{\input{deutsch.tex}}{\input{deutsch.tex}}
+\ifthenelse{\equal{\lxlangcode}{EN}}{\input{english.tex}}{
+  \ifthenelse{\equal{\lxlangcode}{DE}}{\input{deutsch.tex}}{\input{deutsch.tex}}
 } % Ende EN
 
 
@@ -10,8 +10,8 @@
 % Hat man mehrere Mandanten muß man statt "Firma1" den Datenbanknamen seines
 % Mandanten eingeben.
 
-\IfSubStringInString{Firma1}{\lxcompany}{\newcommand{\identpath}{firma1}}{
-  \IfSubStringInString{Firma2}{\lxcompany}{\newcommand{\identpath}{firma2}}
+\IfSubStringInString{Firma1}{\lxtitlebar}{\newcommand{\identpath}{firma1}}{
+  \IfSubStringInString{Firma2}{\lxtitlebar}{\newcommand{\identpath}{firma2}}
     {\newcommand{\identpath}{firma}} % sonst
 } % Ende Firma1
 
 \cfoot{
   {\normalfont\fontfamily{cmss} \tiny
      \begin{tabular}{p{5cm}p{4.5cm}lr}
-        \firma    & \email              & \textKontonummer & \kontonummer \\
-        \strasse  & \homepage           & \textBank        & \bank \\
-        \ort      & \textUstid\ \ustid  & \textIban        & \iban \\
+        \firma                 & \email              & \textKontonummer & \kontonummer \\
+        \strasse               & \homepage           & \textBank        & \bank \\
+        \ort                   & \textUstid\ \ustid  & \textIban        & \iban \\
+        \textTelefon~\telefon  & \finanzamt          & \textBic         & \bic \\
+        \ifthenelse{\equal{\fax}{}}{}{\textFax~\fax} &&& \\
      \end{tabular}
   }
 }
-
index bd3fa45..097f90d 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/invoice_DE.tex b/templates/print/RB/invoice_DE.tex
deleted file mode 120000 (symlink)
index b6a6ad8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-invoice.tex
\ No newline at end of file
diff --git a/templates/print/RB/invoice_EN.tex b/templates/print/RB/invoice_EN.tex
deleted file mode 120000 (symlink)
index b6a6ad8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-invoice.tex
\ No newline at end of file
index a231b1f..5f4a674 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/purchase_delivery_order_DE.tex b/templates/print/RB/purchase_delivery_order_DE.tex
deleted file mode 120000 (symlink)
index 7d185e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-purchase_delivery_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/purchase_delivery_order_EN.tex b/templates/print/RB/purchase_delivery_order_EN.tex
deleted file mode 120000 (symlink)
index 7d185e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-purchase_delivery_order.tex
\ No newline at end of file
index d1bc3fd..e1a737a 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
@@ -20,6 +20,8 @@
 \ourfont
 
 \begin{minipage}{8cm}
+  \vspace*{1.0cm}
+
   <%name%>
 
   <%street%>
diff --git a/templates/print/RB/purchase_order_DE.tex b/templates/print/RB/purchase_order_DE.tex
deleted file mode 120000 (symlink)
index a9fdc31..0000000
+++ /dev/null
@@ -1 +0,0 @@
-purchase_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/purchase_order_EN.tex b/templates/print/RB/purchase_order_EN.tex
deleted file mode 120000 (symlink)
index a9fdc31..0000000
+++ /dev/null
@@ -1 +0,0 @@
-purchase_order.tex
\ No newline at end of file
index 4cce5b5..ceb554b 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/request_quotation_DE.tex b/templates/print/RB/request_quotation_DE.tex
deleted file mode 120000 (symlink)
index 6b0aa64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-request_quotation.tex
\ No newline at end of file
diff --git a/templates/print/RB/request_quotation_EN.tex b/templates/print/RB/request_quotation_EN.tex
deleted file mode 120000 (symlink)
index 6b0aa64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-request_quotation.tex
\ No newline at end of file
index 2db1b3d..690fd13 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/sales_delivery_order_DE.tex b/templates/print/RB/sales_delivery_order_DE.tex
deleted file mode 120000 (symlink)
index e01d614..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_delivery_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/sales_delivery_order_EN.tex b/templates/print/RB/sales_delivery_order_EN.tex
deleted file mode 120000 (symlink)
index e01d614..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_delivery_order.tex
\ No newline at end of file
index 97f4b11..0e15a1a 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/sales_order_DE.tex b/templates/print/RB/sales_order_DE.tex
deleted file mode 120000 (symlink)
index df07c2a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/sales_order_EN.tex b/templates/print/RB/sales_order_EN.tex
deleted file mode 120000 (symlink)
index df07c2a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_order.tex
\ No newline at end of file
index 7481b7f..277eb07 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/sales_quotation_DE.tex b/templates/print/RB/sales_quotation_DE.tex
deleted file mode 120000 (symlink)
index 75262f7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_quotation.tex
\ No newline at end of file
diff --git a/templates/print/RB/sales_quotation_EN.tex b/templates/print/RB/sales_quotation_EN.tex
deleted file mode 120000 (symlink)
index 75262f7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_quotation.tex
\ No newline at end of file
index b545a67..4b3610e 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/statement_DE.tex b/templates/print/RB/statement_DE.tex
deleted file mode 120000 (symlink)
index 67ba506..0000000
+++ /dev/null
@@ -1 +0,0 @@
-statement.tex
\ No newline at end of file
diff --git a/templates/print/RB/statement_EN.tex b/templates/print/RB/statement_EN.tex
deleted file mode 120000 (symlink)
index 67ba506..0000000
+++ /dev/null
@@ -1 +0,0 @@
-statement.tex
\ No newline at end of file
index 6be829b..3460007 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/zahlungserinnerung_DE.tex b/templates/print/RB/zahlungserinnerung_DE.tex
deleted file mode 120000 (symlink)
index 92fc494..0000000
+++ /dev/null
@@ -1 +0,0 @@
-zahlungserinnerung.tex
\ No newline at end of file
diff --git a/templates/print/RB/zahlungserinnerung_EN.tex b/templates/print/RB/zahlungserinnerung_EN.tex
deleted file mode 120000 (symlink)
index 92fc494..0000000
+++ /dev/null
@@ -1 +0,0 @@
-zahlungserinnerung.tex
\ No newline at end of file
index 017d69b..7470888 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/zahlungserinnerung_invoice_DE.tex b/templates/print/RB/zahlungserinnerung_invoice_DE.tex
deleted file mode 120000 (symlink)
index 40b9d06..0000000
+++ /dev/null
@@ -1 +0,0 @@
-zahlungserinnerung_invoice.tex
\ No newline at end of file
diff --git a/templates/print/RB/zahlungserinnerung_invoice_EN.tex b/templates/print/RB/zahlungserinnerung_invoice_EN.tex
deleted file mode 120000 (symlink)
index 40b9d06..0000000
+++ /dev/null
@@ -1 +0,0 @@
-zahlungserinnerung_invoice.tex
\ No newline at end of file