X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/87d40b072835b5651af0848650320287cbed6157..8b5bed7fe5:/templates/print/marei/proforma.tex

diff --git a/templates/print/marei/proforma.tex b/templates/print/marei/proforma.tex
index d591fc41c..b5396cd8f 100644
--- a/templates/print/marei/proforma.tex
+++ b/templates/print/marei/proforma.tex
@@ -20,28 +20,28 @@
 	
 \setkomavar{title}{
 	\proformarechnung~
-	\nr ~<%ordnumber%>
+	\nr ~<%ordnumber%>%
 }
 \setkomavar*{date}{\datum}
 
 \setkomavar{date}{<%orddate%>}
 \setkomavar{customer}{<%customernumber%>}
-<%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{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{transaction}{<%transaction_description%>}
 	
-<%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@}
@@ -52,16 +52,16 @@
 		<%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\\
@@ -71,10 +71,10 @@
 % 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%>,
@@ -84,43 +84,43 @@
 
 \auftragsformel
  
-\begin{PricingTabular*}
-\FakeTable{
+\begin{PricingTabular*}%
+% eigentliche Tabelle
+\FakeTable{%
 	<%foreach number%>%
 	<%runningnumber%> &%
 	<%number%> &%
 	\textbf{<%description%>}%
 	<%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-    <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>
+	<%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
 	<%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
 	<%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
 	<%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
 	&%
 	<%qty%> <%unit%> &%
 	<%sellprice%>&%
-	\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
-	<%linetotal%>\tabularnewline
-	<%end number%>
-}
-% Tabellenende letzte Seite
-	\begin{PricingTotal}
-	% Tabellenende letzte Seite
-	\nettobetrag & <%subtotal%>\\
-	<%foreach tax%>
-	<%taxdescription%> & <%tax%>\\
-	<%end tax%>
-	\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
-\end{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 <%invtotal%>\\%
+\end{PricingTotal}%
 \end{PricingTabular*}
 
-<%if notes%>
-<%notes%>
+<%if notes%>%
+<%notes%>%
 \medskip
-<%end if%>
+<%end if%>%
 
-<%if reqdate%>
+<%if reqdate%>%
 \lieferungErfolgtAm ~<%reqdate%>. \\
-<%end if%>
+<%end if%>%
 
 \textit{\auftragpruefen}
 
