X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2FStandard%2Fsales_order.tex;h=672b80226296b16db266963a480a804225a2fa87;hb=4ec753d2cb56f519d0931896b4e2ce3ebb45c6bd;hp=048a560d59d110a100105e6ff80b5d963abe4103;hpb=2cd07f2f94e8e8fdba104dce374d0871cdd0820f;p=kivitendo-erp.git 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)$