X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fprint%2Fmarei%2Fcredit_note.tex;h=8c05c10fd3675bf25dd8ed920b59f52b51b9e421;hb=8540560e68dfb3bd999c36e7f7c6642d9b77d32d;hp=ea84e00e38233c1fd294c7f99ab613fca6ed3e29;hpb=87d40b072835b5651af0848650320287cbed6157;p=kivitendo-erp.git

diff --git a/templates/print/marei/credit_note.tex b/templates/print/marei/credit_note.tex
index ea84e00e3..8c05c10fd 100644
--- a/templates/print/marei/credit_note.tex
+++ b/templates/print/marei/credit_note.tex
@@ -15,16 +15,30 @@
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\gutschrift}{<%invnumber%>}{<%invdate%>}
 
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%transdate%>}	
+\setkomavar{customer}{<%customernumber%>}
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+	\gutschrift~
+	\nr ~<%invnumber%>%
+}
 
-\begin{document}
-	
+<%if invnumber_for_credit_note%>%
+	\setkomavar*{myref}{\fuerRechnung}
+	\setkomavar{myref}{<%invnumber_for_credit_note%>}
+<%end if%>%
 
-<%if shiptoname%>
+
+
+<%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
 	\parbox{\useplength{toaddrwidth}}{
 		\backaddr@format{\scriptsize\usekomafont{backaddress}%
-			\strut abweichende Lieferadresse
+			\strut\abweichendeLieferadresse
 		}
 		\par\smallskip
 		\setlength{\parskip}{\z@}
@@ -35,35 +49,18 @@
 		<%shiptodepartment_1%>\par
 		<%shiptodepartment_2%>\par
 		<%shiptostreet%>\par
-		<%shiptozipcode%> <%shiptocity%>
+		<%shiptozipcode%> <%shiptocity%>%
 	}
 \end{lrbox}
 \makeatother
-<%end if%>
-
-	
-\setkomavar{title}{
-	\gutschrift~
-	\nr ~<%invnumber%>
-}
+<%end if%>%
 
-<%if invnumber_for_credit_note%>
-\setkomavar*{myref}{\fuerRechnung}
-\setkomavar{myref}{<%invnumber_for_credit_note%>}
-<%end if%>
-
-\setkomavar*{date}{\datum}
+\begin{document}
 
-\setkomavar{date}{<%transdate%>}
-\setkomavar{customer}{<%customernumber%>}
-\setkomavar{fromname}{<%employee_name%>}
-\setkomavar{fromphone}{<%employee_tel%>}
-\setkomavar{fromemail}{<%employee_email%>}
-	
 \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\\
@@ -73,27 +70,27 @@
 % 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%>,
-			}
 		}
+	}
 \thispagestyle{kivitendo.letter.first}
 
 
 \gutschriftformel
 
-\begin{PricingTabular*}
-% eigentliche Tabelle
-\FakeTable{
+\begin{PricingTabular*}%
+% eigentliche Tabelle%
+\FakeTable{%
 	<%foreach number%>%
-	<%runningnumber%> &%
-	<%number%> &%
-	\textbf{<%description%>}%
+		<%runningnumber%> &%
+		<%number%> &%
+		\textbf{<%description%>}%
 		<%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
 		<%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
 		<%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
@@ -101,24 +98,24 @@
 		&%
 		<%qty%> <%unit%> &%
 		<%sellprice%>&%
-		\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
-			<%linetotal%>\tabularnewline
-			<%end number%>
-	}
-	\begin{PricingTotal}
+		\Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
+		<%linetotal%>\tabularnewline%
+	<%end number%>%
+	}%
+	\begin{PricingTotal}%
 		% Tabellenende letzte Seite
-		\nettobetrag & <%subtotal%>\\
-		<%foreach tax%>
-		<%taxdescription%> & <%tax%>\\
-		<%end tax%>
-		\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
-	\end{PricingTotal}
+		\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%>%
 
 \closing{\gruesse}