X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/4987cdc759332a4226006c34f3b7c78ee031bc62..9aa2a4ab43ef36bc672e54dd82964ce5fb0dd738:/templates/print/marei/statement.tex

diff --git a/templates/print/marei/statement.tex b/templates/print/marei/statement.tex
index eb50804f7..76c1944b7 100644
--- a/templates/print/marei/statement.tex
+++ b/templates/print/marei/statement.tex
@@ -20,7 +20,7 @@
 
 \setkomavar{title}{
 	\sammelrechnung~
-	\nr~<%quonumber%>
+	\nr~<%quonumber%>%
 }
 \setkomavar{transaction}{<%transaction_description%>}
 \setkomavar{customer}{<%customernumber%>}
@@ -31,18 +31,19 @@
 
 \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}
@@ -90,10 +91,10 @@
 \endlastfoot
 
 % eigentliche Tabelle
-<%foreach invnumber%>
+<%foreach invnumber%>%
           <%invnumber%> & <%invdate%> & <%duedate%> &
           <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
-<%end invnumber%>
+<%end invnumber%>%
 
 \end{longtable}