X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fsales_order.tex;h=7eac6ae7cfc00dd3b90a7f1f4725536b5cb31168;hb=9aa2a4ab43ef36bc672e54dd82964ce5fb0dd738;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..7eac6ae7c 100644
--- a/templates/print/marei/sales_order.tex
+++ b/templates/print/marei/sales_order.tex
@@ -19,15 +19,15 @@
 \begin{document}
 \setkomavar{title}{
 	\auftragsbestaetigung~
-	\nr~<%ordnumber%>
+	\nr~<%ordnumber%>%
 }
 \setkomavar*{date}{\datum}
 \setkomavar{date}{<%orddate%>}
-<%if cusordnumber%>
+<%if cusordnumber%>%
 \setkomavar*{yourref}{\ihreBestellnummer}
 \setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>
-<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>
+<%end if%>%
+<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
@@ -36,7 +36,7 @@
 
 
 
-<%if shiptoname%>
+<%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
 	\parbox{\useplength{toaddrwidth}}{
@@ -52,26 +52,27 @@
 		<%shiptodepartment_1%>\par
 		<%shiptodepartment_2%>\par
 		<%shiptostreet%>\par
-		<%shiptozipcode%> <%shiptocity%>
+		<%shiptozipcode%> <%shiptocity%>%
 	}
 \end{lrbox}
 \makeatother
-<%end if%>
+<%end if%>%
 
 \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}
+	{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
 	{
 		\ifstr{<%cp_gender%>}{f}
 			{\anredefrau}
@@ -100,30 +101,30 @@
 		<%sellprice%>&%
 		\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
 		<%linetotal%>\tabularnewline
-		<%end number%>
+		<%end number%>%
 	}
 	\begin{PricingTotal}
 		% Tabellenende letzte Seite
 		\nettobetrag & <%subtotal%>\\
-		<%foreach tax%>
+		<%foreach tax%>%
 		<%taxdescription%> & <%tax%>\\
-		<%end 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}