X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/420cc628dce84d55be98be5f9987b13879c2010e..b720e272:/templates/print/Standard/credit_note.tex

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