X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fsales_order.tex;h=6bb10c5b78b615add7ee4d095f6c140a2a746728;hb=70d2e323918fe9594f43f8c3e11c66027c8851ad;hp=81b4f40eed054930bd3d4e4f04c1fbede582d68d;hpb=4987cdc759332a4226006c34f3b7c78ee031bc62;p=kivitendo-erp.git

diff --git a/templates/print/marei/sales_order.tex b/templates/print/marei/sales_order.tex
index 81b4f40ee..6bb10c5b7 100644
--- a/templates/print/marei/sales_order.tex
+++ b/templates/print/marei/sales_order.tex
@@ -16,27 +16,28 @@
 \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%>
+<%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
 	\parbox{\useplength{toaddrwidth}}{
@@ -52,28 +53,31 @@
 		<%shiptodepartment_1%>\par
 		<%shiptodepartment_2%>\par
 		<%shiptostreet%>\par
-		<%shiptozipcode%> <%shiptocity%>
+		<%shiptozipcode%> <%shiptocity%>%
 	}
 \end{lrbox}
 \makeatother
-<%end if%>
+<%end if%>%
+
+\begin{document}
 
 \begin{letter}{
 		<%name%>\strut\\
-		<%if department_1%><%department_1%>\\<%end if%>
-		<%if department_2%><%department_2%>\\<%end if%>
+		<%if department_1%><%department_1%>\\<%end if%>%
+		<%if department_2%><%department_2%>\\<%end if%>%
 		<%cp_givenname%> <%cp_name%>\strut\\
 		<%street%>\strut\\
 		<%zipcode%> <%city%>\strut\\
 		<%country%> \strut
 	}
 
-% Anrede nach Geschlecht unterscheiden
+% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
 \opening{
-	\ifstr{<%cp_name%>}{}
-	{\anrede}
+	\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%>,
@@ -86,7 +90,7 @@
 \begin{PricingTabular*}
 	% eigentliche Tabelle
 	\FakeTable{
-		<%foreach number%>%
+	<%foreach number%>%
 		<%runningnumber%> &%
 		<%number%> &%
 		\textbf{<%description%>}%
@@ -98,32 +102,32 @@
 		&%
 		<%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%>\\
-		<%foreach tax%>
-		<%taxdescription%> & <%tax%>\\
-		<%end tax%>
-		\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
+		\nettobetrag & <%subtotal%>\\%
+		<%foreach tax%>%
+		<%taxdescription%> & <%tax%>\\%
+		<%end tax%>%
+		\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
 	\end{PricingTotal}
 \end{PricingTabular*}
 
-<%if notes%>
-<%notes%>
+<%if notes%>%
+<%notes%>%
 \medskip
-<%end if%>
+<%end if%>%
 
-<%if delivery_term%>
+<%if delivery_term%>%
   \lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>
+<%end delivery_term%>%
 
-<%if reqdate%>
+<%if reqdate%>%
 \lieferungErfolgtAm ~<%reqdate%>.
-<%end if%>
+<%end if%>%
 
 \textit{\auftragpruefen}
 
@@ -132,4 +136,3 @@
 \end{letter}
 
 \end{document}
-