X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fcredit_note.tex;h=b764c1da5b143a06d745e9bfda0d3b0563b6ba7e;hb=97a6f6d623a9810e1d324f44a5f8bcd12294f5d3;hp=f8744bbe04a203a4e9a36e7ca8d436348625cc71;hpb=9aa2a4ab43ef36bc672e54dd82964ce5fb0dd738;p=kivitendo-erp.git

diff --git a/templates/print/marei/credit_note.tex b/templates/print/marei/credit_note.tex
index f8744bbe0..b764c1da5 100644
--- a/templates/print/marei/credit_note.tex
+++ b/templates/print/marei/credit_note.tex
@@ -15,111 +15,109 @@
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\gutschrift}{<%invnumber%>}{<%invdate%>}
 
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%invdate%>}
+\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%>%
 
+\setkomavar{transaction}{<%transaction_description%>}
 <%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
-	\parbox{\useplength{toaddrwidth}}{
-		\backaddr@format{\scriptsize\usekomafont{backaddress}%
-			\strut abweichende Lieferadresse
-		}
-		\par\smallskip
-		\setlength{\parskip}{\z@}
-		\par
-		\normalsize
-		<%shiptoname%>\par
-		<%if shiptocontact%> <%shiptocontact%><%end if%>\par
-		<%shiptodepartment_1%>\par
-		<%shiptodepartment_2%>\par
-		<%shiptostreet%>\par
-		<%shiptozipcode%> <%shiptocity%>%
-	}
+  \parbox{\useplength{toaddrwidth}}{
+    \backaddr@format{\scriptsize\usekomafont{backaddress}%
+      \strut\abweichendeLieferadresse
+    }
+    \par\smallskip
+    \setlength{\parskip}{\z@}
+    \par
+    \normalsize
+    <%shiptoname%>\par
+    <%if shiptocontact%> <%shiptocontact%><%end if%>\par
+    <%shiptodepartment_1%>\par
+    <%shiptodepartment_2%>\par
+    <%shiptostreet%>\par
+    <%shiptozipcode%> <%shiptocity%>%
+  }
 \end{lrbox}
 \makeatother
 <%end if%>%
 
-	
-\setkomavar{title}{
-	\gutschrift~
-	\nr ~<%invnumber%>%
-}
-
-<%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%>%
-		<%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}
 
 
 \gutschriftformel
 
-\begin{PricingTabular*}
-% eigentliche Tabelle
-\FakeTable{
-	<%foreach number%>%
-	<%runningnumber%> &%
-	<%number%> &%
-	\textbf{<%description%>}%
-		<%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-		<%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%>%
 <%notes%>%
-\medskip
+\vspace{0.5cm}
 <%end if%>%
 
+
+\begin{PricingTabular*}%
+  % eigentliche Tabelle%
+  \FakeTable{%
+  <%foreach number%>%
+  <%runningnumber%> &%
+  <%number%> &%
+  \textbf{<%description%>}%
+  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+  <%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 <%invtotal%>\\%
+  \end{PricingTotal}%
+\end{PricingTabular*}
+
+
 \closing{\gruesse}
 
 \end{letter}