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

diff --git a/templates/print/marei/proforma.tex b/templates/print/marei/proforma.tex
index 4151dc6ea..b5396cd8f 100644
--- a/templates/print/marei/proforma.tex
+++ b/templates/print/marei/proforma.tex
@@ -41,7 +41,7 @@
 \begin{lrbox}\shippingAddressBox
 	\parbox{\useplength{toaddrwidth}}{
 		\backaddr@format{\scriptsize\usekomafont{backaddress}%
-			\strut abweichende Lieferadresse
+			\strut\abweichendeLieferadresse
 		}
 		\par\smallskip
 		\setlength{\parskip}{\z@}
@@ -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,33 +84,33 @@
 
 \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
+	\Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
+	<%linetotal%>\tabularnewline%
 	<%end number%>%
-}
-% Tabellenende letzte Seite
-	\begin{PricingTotal}
-	% Tabellenende letzte Seite
-	\nettobetrag & <%subtotal%>\\
+}%
+\begin{PricingTotal}%
+	% Tabellenende letzte Seite%
+	\nettobetrag & <%subtotal%>\\%
 	<%foreach tax%>%
-	<%taxdescription%> & <%tax%>\\
+	<%taxdescription%> & <%tax%>\\%
 	<%end tax%>%
-	\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
-\end{PricingTotal}
+	\bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
+\end{PricingTotal}%
 \end{PricingTabular*}
 
 <%if notes%>%