X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fpurchase_order.tex;h=677e2abd6c7018e7e27f8f4bc68292db938bfb26;hb=7a22d3a4a4460f6e9e5647124358fd03071fc030;hp=d04ff319694c5cf1beabc0e9ca2a501e560bc96b;hpb=9aa2a4ab43ef36bc672e54dd82964ce5fb0dd738;p=kivitendo-erp.git

diff --git a/templates/print/marei/purchase_order.tex b/templates/print/marei/purchase_order.tex
index d04ff3196..677e2abd6 100644
--- a/templates/print/marei/purchase_order.tex
+++ b/templates/print/marei/purchase_order.tex
@@ -16,24 +16,27 @@
 \ourhead{}{}{\bestellung}{<%ordnumber%>}{<%orddate%>}
 
 
-\begin{document}
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%orddate%>}
 
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 	\bestellung~
 	\nr~<%ordnumber%>%
 }
-\setkomavar*{date}{\datum}
-\setkomavar{date}{<%orddate%>}
+
 <%if cusordnumber%>%
-\setkomavar*{yourref}{\unsereBestellnummer}
-\setkomavar{yourref}{<%cusordnumber%>}
+	\setkomavar*{yourref}{\unsereBestellnummer}
+	\setkomavar{yourref}{<%cusordnumber%>}
 <%end if%>%
-<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
-\setkomavar{fromname}{<%employee_name%>}
-\setkomavar{fromphone}{<%employee_tel%>}
-\setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{transaction}{<%transaction_description%>}
 
+<%if quonumber%>
+	\setkomavar{quote}{<%quonumber%>}
+<%end if%>%
+
 <%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
@@ -56,6 +59,7 @@
 \makeatother
 <%end if%>%
 
+\begin{document}
 
 \begin{letter}{
 		<%name%>\strut\\
@@ -70,14 +74,14 @@
 % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
 % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
 \opening{
-	\ifstr{<%cp_name%>}{}
-		{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-		{
-		\ifstr{<%cp_gender%>}{f}
+	\Ifstr{<%cp_name%>}{}
+	{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+	{
+		\Ifstr{<%cp_gender%>}{f}
 			{\anredefrau}
 			{\anredeherr}
 			<%cp_title%> <%cp_name%>,
-		}
+	}
 }
 \thispagestyle{kivitendo.letter.first}
 
@@ -86,7 +90,7 @@
 \begin{PricingTabular*}
 	% eigentliche Tabelle
 	\FakeTable{
-		<%foreach number%>%
+	<%foreach number%>%
 		<%runningnumber%> &%
 		<%number%> &%
 		\textbf{<%description%>}%
@@ -98,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*}