X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2FStandard%2Fproforma.tex;h=b71f1d32ff0bdcf3a57697e757aba192e5568476;hb=c7c7d2d52ba0092604eac610b18fd285c2ef5b4e;hp=adefdde1786ba00746cfaef3aefb93ce02e3e576;hpb=420cc628dce84d55be98be5f9987b13879c2010e;p=kivitendo-erp.git

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)$