From: root Date: Mon, 6 Jan 2014 18:52:48 +0000 (+0100) Subject: Dokumentvorlagen Standard LaTeX X-Git-Tag: release-3.1.0beta1~22^2~40^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a473872b10c9413761dc38580bb376bb505367a0;p=kivitendo-erp.git Dokumentvorlagen Standard LaTeX * fix #2410 waehrungsdefinition * fix dateiname fuer ausgelagerte tabellen-Datei \filecontents --- diff --git a/templates/print/Standard/credit_note.tex b/templates/print/Standard/credit_note.tex index 3dd8b586a..12538f453 100755 --- a/templates/print/Standard/credit_note.tex +++ b/templates/print/Standard/credit_note.tex @@ -37,7 +37,7 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- % \newcommand{\companybank}{$(company_bank)$} @@ -99,11 +99,10 @@ \newcommand{\shiptofax}{$(shiptofax)$} % ---------- Währungszeichen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ---------- @@ -208,7 +207,7 @@ $(foreach number)$ \ifthenelse{\isempty{$(sellprice)$}}{&}{ \numprint{$(sellprice)$} \ifthenelse{\equal{$(p_discount)$}{0}}{}{ -$(p_discount)$\%} & - \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$} + \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$} }\\ % $(end number)$ @@ -229,7 +228,7 @@ $(foreach number)$ % {$(taxdescription)$ auf }\numprint{$(taxbase)$}~\currency: & \numprint{$(tax)$}& \\ {$(taxdescription)$}: & \numprint{$(tax)$}& \currency\\ $(end tax)$ - \midrule + \midrule {\textbf{Rechnungsbetrag:}} & \bfseries\numprint{\invtotal} & \textbf{\currency}\\ % ---------- Wenn bereits etwas gezahlt wurde ---------- $(if invtotal != total)$ diff --git a/templates/print/Standard/invoice.tex b/templates/print/Standard/invoice.tex index 78710fdfc..be93079e5 100644 --- a/templates/print/Standard/invoice.tex +++ b/templates/print/Standard/invoice.tex @@ -37,7 +37,7 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- % \newcommand{\companybank}{$(company_bank)$} @@ -98,11 +98,10 @@ \newcommand{\shiptofax}{$(shiptofax)$} % ---------- Währungszeichen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ---------- @@ -142,10 +141,10 @@ % ---------- Begrüßung und Bemerkungen ---------- \vspace{ 5mm} \lettergreeting -Hiermit erlauben wir uns, Ihnen die nachfolgenden Positionen $(if orddate)$gemäß +Hiermit erlauben wir uns, Ihnen die nachfolgenden Positionen $(if orddate)$gemäß Ihrem Auftrag vom \orddate{ }$(end)$in Rechnung zu stellen.\\ -Für Nachfragen steht Ihnen \employeename \ per Telefon (\employeetel) +Für Nachfragen steht Ihnen \employeename \ per Telefon (\employeetel) oder per E-Mail (\employeeemail) gerne zur Verfügung.\\[1\baselineskip] \ifthenelse{\isempty{$(notes)$}}{}{ $(notes)$\\[1\baselineskip] @@ -207,7 +206,7 @@ $(foreach number)$ \ifthenelse{\isempty{$(sellprice)$}}{&}{ \numprint{$(sellprice)$} \ifthenelse{\equal{$(p_discount)$}{0}}{}{ -$(p_discount)$\%} & - \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$} + \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$} }\\ % $(end number)$ @@ -228,7 +227,7 @@ $(foreach number)$ % {$(taxdescription)$ auf }\numprint{$(taxbase)$}~\currency: & \numprint{$(tax)$}& \\ {$(taxdescription)$}: & \numprint{$(tax)$}& \currency\\ $(end tax)$ - \midrule + \midrule {\textbf{Rechnungsbetrag:}} & \bfseries\numprint{\invtotal} & \textbf{\currency}\\ % ---------- Wenn bereits etwas gezahlt wurde ---------- $(if invtotal != total)$ @@ -270,7 +269,7 @@ $(end)$ % ---------- Nachbemerkung mit max. Abstand nach unten ---------- $(if payment_terms)$ \vspace*{0.5em} -\textbf{Zahlungsbedingungen:}\hfill\parbox[t]{0.7\textwidth}{$(payment_terms)$}\\ +\textbf{Zahlungsbedingungen:}\hfill\parbox[t]{0.7\textwidth}{$(payment_terms)$}\\ $(end)$ \vspace*{0.5em} %Bitte überweisen Sie den Rechnungsbetrag in Höhe von diff --git a/templates/print/Standard/mahnung.tex b/templates/print/Standard/mahnung.tex index d5347696d..5da19ac10 100644 --- a/templates/print/Standard/mahnung.tex +++ b/templates/print/Standard/mahnung.tex @@ -36,7 +36,7 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- % \newcommand{\companybank}{$(company_bank)$} @@ -101,11 +101,10 @@ \newcommand{\shiptofax}{$(shiptofax)$} % ---------- Währungszeichen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ---------- @@ -164,7 +163,7 @@ $(foreach dn_invnumber)$ $(dn_amount)$ \euro & $(dn_fee)$ \euro & $(dn_interest)$ \euro & $(dn_linetotal)$ \euro \\[1pt] $(end dn_invnumber)$ \cline{1-7}\\ - Insgesamt: & & & $(total_open_amount)$ \euro & $(fee)$ \euro & $(total_interest)$ \euro & \textbf{$(total_amount)$ \euro} + Insgesamt: & & & $(total_open_amount)$ \euro & $(fee)$ \euro & $(total_interest)$ \euro & \textbf{$(total_amount)$ \euro} \end{tabular*} \rule{\textwidth}{0.5pt} diff --git a/templates/print/Standard/mahnung_invoice.tex b/templates/print/Standard/mahnung_invoice.tex index a60b698dd..182db66da 100644 --- a/templates/print/Standard/mahnung_invoice.tex +++ b/templates/print/Standard/mahnung_invoice.tex @@ -36,7 +36,7 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- % \newcommand{\companybank}{$(company_bank)$} @@ -101,11 +101,10 @@ \newcommand{\shiptofax}{$(shiptofax)$} % ---------- Währungszeichen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ---------- diff --git a/templates/print/Standard/proforma.tex b/templates/print/Standard/proforma.tex index adefdde17..b71f1d32f 100644 --- a/templates/print/Standard/proforma.tex +++ b/templates/print/Standard/proforma.tex @@ -37,7 +37,7 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} % ---------- eigene Bankverbindung falls nicht im Briefkopf ---------- % \newcommand{\companybank}{$(company_bank)$} @@ -91,11 +91,10 @@ \newcommand{\shiptofax}{$(shiptofax)$} % ---------- Währung setzen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ---------- @@ -199,7 +198,7 @@ nachfolgend aufgeführte Bestellung auf das unten angegebene Konto. \ifthenelse{\isempty{$(sellprice)$}}{&}{ \numprint{$(sellprice)$} \ifthenelse{\equal{$(p_discount)$}{0}}{}{ -$(p_discount)$\%} & - \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$} + \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$} }\\ % $(end number)$ diff --git a/templates/print/Standard/purchase_order.tex b/templates/print/Standard/purchase_order.tex index 3abc8716c..8315e1cab 100644 --- a/templates/print/Standard/purchase_order.tex +++ b/templates/print/Standard/purchase_order.tex @@ -35,7 +35,7 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- % \newcommand{\companybank}{$(company_bank)$} @@ -87,11 +87,10 @@ \newcommand{\shiptofax}{$(shiptofax)$} % ---------- Währungszeichen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ---------- @@ -221,7 +220,7 @@ Bei Fragen zur Bestellung, steht Ihnen \employeename \ per Telefon (\employeetel \end{tabular} } \vfill -Grundlage dieses Auftrages sind unsere Einkaufsbedingungen. +Grundlage dieses Auftrages sind unsere Einkaufsbedingungen. Wir bitten um gleichlautende Auftragsbestätigung.\\ \vspace{1.5\baselineskip} diff --git a/templates/print/Standard/request_quotation.tex b/templates/print/Standard/request_quotation.tex index 913df1e1f..d70cd11cf 100644 --- a/templates/print/Standard/request_quotation.tex +++ b/templates/print/Standard/request_quotation.tex @@ -36,7 +36,7 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} % ---------- Adressat ---------- \newcommand{\name}{$(name)$} @@ -83,11 +83,10 @@ \newcommand{\shiptofax}{$(shiptofax)$} % ---------- Währungszeichen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ---------- diff --git a/templates/print/Standard/sales_delivery_order.tex b/templates/print/Standard/sales_delivery_order.tex index bcad78be0..51842a89e 100644 --- a/templates/print/Standard/sales_delivery_order.tex +++ b/templates/print/Standard/sales_delivery_order.tex @@ -4,7 +4,7 @@ % Version 2.5 vom 15.Oktober 2011 % Basiert auf der Arbeit von kmk@lilalaser.de / 2007 % Diese Vorlage steht unter der GPL-Lizenz, Version 3 -% siehe http://www.gnu.de/licenses/gpl-3.0.html +% siehe http://www.gnu.de/licenses/gpl-3.0.html % ---------- % config: tag-style=$( )$ % ---------- @@ -12,9 +12,9 @@ \usepackage{fancyhdr} % Für den Seitenkopf und -Fuß \usepackage{ifpdf} % Erlaubt eine Code-Weiche für PDF, oder DVI Ausgabe \usepackage{xifthen} % Allgemeine Code-Weiche -\usepackage{graphicx} % Fuer die Einbindung der Logo-Graphik +\usepackage{graphicx} % Fuer die Einbindung der Logo-Graphik \usepackage{german} % Deutsche Trenn-Tabelle -\usepackage[utf8]{inputenc} % Umlaute direkt eingeben +\usepackage[utf8]{inputenc} % Umlaute direkt eingeben \usepackage{textcomp} % Sonderzeichen \usepackage{lastpage} % Fuer die Angabe "Seite 2 von 5" \usepackage{filecontents} % Um von latex aus eine Datei schreiben zu koennen @@ -24,8 +24,8 @@ \newcommand*{\sperren}[1]{\normalsize\textls*[200]{#1}} %Sperrung Überrschriften -% ---------- Report-Variablen zur Verwendung in kivitendobriefkopf.tex ---------- -% ---------- Die eigenen Daten ---------- +% ---------- Report-Variablen zur Verwendung in kivitendobriefkopf.tex ---------- +% ---------- Die eigenen Daten ---------- \newcommand{\employeename}{$(employee_name)$} \newcommand{\employeecompany}{$(employee_company)$} \newcommand{\employeeaddress}{$(employee_address)$} @@ -34,14 +34,14 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} -% ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- +% ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- % \newcommand{\companybank}{$(company_bank)$} % \newcommand{\companybankcode}{$(company_bank_code)$} % \newcommand{\companyaccountnumber}{$(company_account_number)$} -% ---------- Adressat ---------- +% ---------- Adressat ---------- \newcommand{\name}{$(name)$} \newcommand{\departmentone}{$(department_1)$} \newcommand{\departmenttwo}{$(department_2)$} @@ -56,7 +56,7 @@ \newcommand{\phone}{$(customerphone)$} \newcommand{\fax}{$(customerfax)$} \newcommand{\lettergreeting}{ - \ifthenelse{\equal{$(cp_gender)$}{f}} + \ifthenelse{\equal{$(cp_gender)$}{f}} {Sehr geehrte Frau $(cp_name)$,} {\ifthenelse{\equal{$(cp_gender)$}{m}} {Sehr geehrter Herr $(cp_name)$,} @@ -64,7 +64,7 @@ }\\[0.3em] } -% ---------- Bestellvariablen ---------- +% ---------- Bestellvariablen ---------- \newcommand{\ordnumber}{$(ordnumber)$} \newcommand{\donumber}{$(donumber)$} %\newcommand{\donumber}{Lieferschein zu Auftrag Nr. \ordnumber} @@ -74,7 +74,7 @@ \newcommand{\reqdate}{$(reqdate)$} \newcommand{\kundennummer}{$(customernumber)$} -% ---------- Lieferadresse ---------- +% ---------- Lieferadresse ---------- \newcommand{\shiptoname}{$(shiptoname)$} \newcommand{\shiptocontact}{$(shiptocontact)$} \newcommand{\shiptodepartmentone}{$(shiptodepartment_1)$} @@ -86,28 +86,27 @@ \newcommand{\shiptozipcode}{$(shiptozipcode)$} \newcommand{\shiptofax}{$(shiptofax)$} -% ---------- Währungszeichen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +% ---------- Währungszeichen ---------- +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ---------- -% ---------- Briefkopf dazuladen ---------- +% ---------- Briefkopf dazuladen ---------- \input{kivitendobriefkopf} \begin{document} -% ---------- Schrift Hauptdokuments (Computermodern-sanserif) ---------- +% ---------- Schrift Hauptdokuments (Computermodern-sanserif) ---------- % \fontfamily{cmss}\fontsize{10}{12pt plus 0.12pt minus 0.1pt}\selectfont % ---------- Schrift Helvetica ------------------------ \fontfamily{phv}\fontsize{10}{12pt plus 0.12pt minus 0.1pt}\selectfont -% ---------- Firmenlogo nur erste Seite ---------- -\thispagestyle{briefkopf} -% ---------- Datum und Nummern ---------- +% ---------- Firmenlogo nur erste Seite ---------- +\thispagestyle{briefkopf} +% ---------- Datum und Nummern ---------- % Position unterhalb des Briefkopfs -\vspace*{\vlogospacing} +\vspace*{\vlogospacing} \renewcommand{\arraystretch}{0.9} \begin{minipage}[b]{177mm} \sperren{\textbf{Lieferschein Nr. \donumber}} @@ -120,27 +119,27 @@ \textbf{Auftrag Nr.} & \ordnumber\\ \textbf{Lieferschein Nr.} & \donumber\\ \nonemptyline{\textbf{Vorraussichtl. Lieferdatum:} &}{\reqdate} - \textbf{Ansprechpartner} & \employeename\\ + \textbf{Ansprechpartner} & \employeename\\ \nonemptyline{\textbf{Durchwahl} &}{\employeetel} - \nonemptyline{\textbf{E-Mail} &}{\employeeemail} + \nonemptyline{\textbf{E-Mail} &}{\employeeemail} \end{tabular}\\[10mm plus 20mm minus 10mm] \end{minipage} -\renewcommand{\arraystretch}{1} +\renewcommand{\arraystretch}{1} \normalsize -% ---------- Begrüßung und Bemerkungen ---------- +% ---------- Begrüßung und Bemerkungen ---------- \vspace{ 5mm} %\lettergreeting Wir liefern Ihnen gemäß Ihrem Auftrag % -\ifthenelse{\equal{\orddate}{\leer}}{}{vom \orddate{ }}% +\ifthenelse{\equal{\orddate}{\leer}}{}{vom \orddate{ }}% die unten aufgeführten Positionen.\\ Für Nachfragen steht Ihnen \employeename \ per Telefon (\employeetel) oder per E-Mail (\employeeemail) gerne zur Verfügnung.\par - -% ---------- Die eigentliche-Tabelle ---------- -% ---------- Tabelle puffern ---------- + +% ---------- Die eigentliche-Tabelle ---------- +% ---------- Tabelle puffern ---------- \begin{filecontents}{\employeetable} -% ---------- Spaltendefinition ---------- +% ---------- Spaltendefinition ---------- \begin{longtable}{@{}rlX@{ }rl@{}} -% ---------- Kopfzeile der Tabelle ---------- +% ---------- Kopfzeile der Tabelle ---------- \textbf{Pos} & \textbf{Art.Nr.} & \textbf{Bezeichnung} & @@ -148,7 +147,7 @@ Für Nachfragen steht Ihnen \employeename \ per Telefon (\employeetel) oder per \textbf{ME} \\ \midrule \endfirsthead -% ---------- Tabellenkopf nach dem Umbruch ---------- +% ---------- Tabellenkopf nach dem Umbruch ---------- \textbf{Pos} & \textbf{Art.Nr.} & \textbf{Bezeichnung} & @@ -156,25 +155,25 @@ Für Nachfragen steht Ihnen \employeename \ per Telefon (\employeetel) oder per \textbf{ME} \\ \midrule \endhead -% ---------- Fuss der Teiltabellen ---------- +% ---------- Fuss der Teiltabellen ---------- \midrule \endfoot -% ---------- Das Ende der Tabelle ---------- +% ---------- Das Ende der Tabelle ---------- \midrule \endlastfoot -% ---------- Positionen ---------- +% ---------- Positionen ---------- $(foreach number)$ $(runningnumber)$ & $(number)$ & $(description)$ & $(qty)$ & - $(unit)$ - \\ % + $(unit)$ + \\ % $(end number)$ \end{longtable} -% ---------- Ende der Hilfsdatei ---------- -\end{filecontents} -% ---------- Puffertabelle öffnen ---------- +% ---------- Ende der Hilfsdatei ---------- +\end{filecontents} +% ---------- Puffertabelle öffnen ---------- \LTXtable{\textwidth}{\employeetable} \vfill diff --git a/templates/print/Standard/sales_order.tex b/templates/print/Standard/sales_order.tex index 048a560d5..672b80226 100644 --- a/templates/print/Standard/sales_order.tex +++ b/templates/print/Standard/sales_order.tex @@ -38,7 +38,7 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- % \newcommand{\companybank}{$(company_bank)$} @@ -91,11 +91,10 @@ \newcommand{\shiptofax}{$(shiptofax)$} % ---------- Währungszeichen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ---------- @@ -198,7 +197,7 @@ und bestätigen Ihnen diesen wie folgt.\\ \ifthenelse{\isempty{$(sellprice)$}}{&}{ \numprint{$(sellprice)$} \ifthenelse{\equal{$(p_discount)$}{0}}{}{ -$(p_discount)$\%} & - \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$} + \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$} }\\ % $(end number)$ diff --git a/templates/print/Standard/sales_quotation.tex b/templates/print/Standard/sales_quotation.tex index f608ca08c..356f68522 100644 --- a/templates/print/Standard/sales_quotation.tex +++ b/templates/print/Standard/sales_quotation.tex @@ -38,7 +38,7 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- % \newcommand{\companybank}{$(company_bank)$} @@ -88,11 +88,10 @@ \newcommand{\shiptofax}{$(shiptofax)$} % ---------- Währungszeichen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ---------- @@ -190,7 +189,7 @@ wir bedanken uns für Ihre Anfrage und bieten Ihnen gemäß unserer Liefer- und \ifthenelse{\isempty{$(sellprice)$}}{&}{ \numprint{$(sellprice)$} \ifthenelse{\equal{$(p_discount)$}{0}}{}{ -$(p_discount)$\%} & - \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$} + \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$} }\\ % $(end number)$ diff --git a/templates/print/Standard/zahlungserinnerung.tex b/templates/print/Standard/zahlungserinnerung.tex index f98f1a557..65d5b3938 100644 --- a/templates/print/Standard/zahlungserinnerung.tex +++ b/templates/print/Standard/zahlungserinnerung.tex @@ -37,7 +37,7 @@ \newcommand{\employeeemail}{$(employee_email)$} \newcommand{\employeecoustid}{$(employee_co_ustid)$} \newcommand{\employeetaxnumber}{$(employee_taxnumber)$} -\newcommand{\employeetable}{tabelle$(employee_login)$.tex} +\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex} % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- % \newcommand{\companybank}{$(company_bank)$} @@ -100,11 +100,10 @@ \newcommand{\shiptofax}{$(shiptofax)$} % ---------- Währungszeichen ---------- -\newcommand{\currency}{$(currency)$} -\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{} -\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{} -\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{} -\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{} +\newcommand{\currency}{\euro} +\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{} +\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{} +\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{} % ---------- Ende Reportvariablen-Umsetzung ----------