X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fprint%2Fmarei%2Fsales_order.tex;h=d809224b0c333b84918e8ae8571d2934d417e9c6;hb=88fc44c8f6ac2351a5be768cdcdeaaa3e4bda86a;hp=6bb10c5b78b615add7ee4d095f6c140a2a746728;hpb=2336386b8740cb6fb493e83cf31ddefa17da045a;p=kivitendo-erp.git

diff --git a/templates/print/marei/sales_order.tex b/templates/print/marei/sales_order.tex
index 6bb10c5b7..d809224b0 100644
--- a/templates/print/marei/sales_order.tex
+++ b/templates/print/marei/sales_order.tex
@@ -62,58 +62,58 @@
 \begin{document}
 
 \begin{letter}{
-		<%name%>\strut\\
-		<%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
-	}
+<%name%>\strut\\
+<%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
+}
 
 % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
 % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
 \opening{
-	\Ifstr{<%cp_name%>}{}
-	{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-	{
-		\Ifstr{<%cp_gender%>}{f}
-			{\anredefrau}
-			{\anredeherr}
-			<%cp_title%> <%cp_name%>,
-	}
-}
+\Ifstr{<%cp_name%>}{}
+{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+  {
+    \Ifstr{<%cp_gender%>}{f}
+        {\anredefrau}
+        {\anredeherr}
+      <%cp_title%> <%cp_name%>,
+    }
+  }
 \thispagestyle{kivitendo.letter.first}
 
 \auftragsformel
 
 \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 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%>%
-	}%
-	\begin{PricingTotal}%
-		% Tabellenende letzte Seite
-		\nettobetrag & <%subtotal%>\\%
-		<%foreach tax%>%
-		<%taxdescription%> & <%tax%>\\%
-		<%end tax%>%
-		\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
-	\end{PricingTotal}
+  % eigentliche Tabelle
+  \FakeTable{
+  <%foreach number%>%
+  <%runningnumber%> &%
+  <%number%> &%
+  \textbf{<%description%>}%
+  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+  <%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%>%
+  }%
+  \begin{PricingTotal}%
+    % Tabellenende letzte Seite
+    \nettobetrag & <%subtotal%>\\%
+    <%foreach tax%>%
+    <%taxdescription%> & <%tax%>\\%
+    <%end tax%>%
+    \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
+  \end{PricingTotal}
 \end{PricingTabular*}
 
 <%if notes%>%
@@ -122,7 +122,7 @@
 <%end if%>%
 
 <%if delivery_term%>%
-  \lieferung ~<%delivery_term.description_long%>\\
+\lieferung ~<%delivery_term.description_long%>\\
 <%end delivery_term%>%
 
 <%if reqdate%>%