X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fsales_order.tex;h=6bb10c5b78b615add7ee4d095f6c140a2a746728;hb=be076f02fed09b50c15c8ee8d0585542bd55347d;hp=7eac6ae7cfc00dd3b90a7f1f4725536b5cb31168;hpb=9aa2a4ab43ef36bc672e54dd82964ce5fb0dd738;p=kivitendo-erp.git

diff --git a/templates/print/marei/sales_order.tex b/templates/print/marei/sales_order.tex
index 7eac6ae7c..6bb10c5b7 100644
--- a/templates/print/marei/sales_order.tex
+++ b/templates/print/marei/sales_order.tex
@@ -16,25 +16,26 @@
 \ourhead{\kundennummer}{<%customernumber%>}{\auftragsbestaetigung}{<%ordnumber%>}{<%orddate%>}
 
 
-\begin{document}
-\setkomavar{title}{
-	\auftragsbestaetigung~
-	\nr~<%ordnumber%>%
-}
+
 \setkomavar*{date}{\datum}
 \setkomavar{date}{<%orddate%>}
-<%if cusordnumber%>%
-\setkomavar*{yourref}{\ihreBestellnummer}
-\setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>%
-<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+	\auftragsbestaetigung~
+	\nr~<%ordnumber%>%
+}
+<%if cusordnumber%>%
+	\setkomavar*{yourref}{\ihreBestellnummer}
+	\setkomavar{yourref}{<%cusordnumber%>}
+<%end if%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
-
+<%if quonumber%>
+	\setkomavar{quote}{<%quonumber%>}
+<%end if%>%
 
 <%if shiptoname%>%
 \makeatletter
@@ -58,6 +59,8 @@
 \makeatother
 <%end if%>%
 
+\begin{document}
+
 \begin{letter}{
 		<%name%>\strut\\
 		<%if department_1%><%department_1%>\\<%end if%>%
@@ -71,10 +74,10 @@
 % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
 % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
 \opening{
-	\ifstr{<%cp_name%>}{}
+	\Ifstr{<%cp_name%>}{}
 	{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
 	{
-		\ifstr{<%cp_gender%>}{f}
+		\Ifstr{<%cp_gender%>}{f}
 			{\anredefrau}
 			{\anredeherr}
 			<%cp_title%> <%cp_name%>,
@@ -87,7 +90,7 @@
 \begin{PricingTabular*}
 	% eigentliche Tabelle
 	\FakeTable{
-		<%foreach number%>%
+	<%foreach number%>%
 		<%runningnumber%> &%
 		<%number%> &%
 		\textbf{<%description%>}%
@@ -99,17 +102,17 @@
 		&%
 		<%qty%> <%unit%> &%
 		<%sellprice%>&%
-		\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
+		\Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
 		<%linetotal%>\tabularnewline
-		<%end number%>%
-	}
-	\begin{PricingTotal}
+	<%end number%>%
+	}%
+	\begin{PricingTotal}%
 		% Tabellenende letzte Seite
-		\nettobetrag & <%subtotal%>\\
+		\nettobetrag & <%subtotal%>\\%
 		<%foreach tax%>%
-		<%taxdescription%> & <%tax%>\\
+		<%taxdescription%> & <%tax%>\\%
 		<%end tax%>%
-		\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
+		\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
 	\end{PricingTotal}
 \end{PricingTabular*}
 
@@ -133,4 +136,3 @@
 \end{letter}
 
 \end{document}
-