X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fprint%2Fmarei%2Fcredit_note.tex;h=b764c1da5b143a06d745e9bfda0d3b0563b6ba7e;hb=3ad96f211f51589c061900f0dfad4cd1daedd2f6;hp=aadd3ab135aaa446568297d6f3f134810ea19427;hpb=3d229eb932520febe9d8147cf3413c7b13a23b4b;p=kivitendo-erp.git

diff --git a/templates/print/marei/credit_note.tex b/templates/print/marei/credit_note.tex
index aadd3ab13..b764c1da5 100644
--- a/templates/print/marei/credit_note.tex
+++ b/templates/print/marei/credit_note.tex
@@ -16,41 +16,40 @@
 \ourhead{\kundennummer}{<%customernumber%>}{\gutschrift}{<%invnumber%>}{<%invdate%>}
 
 \setkomavar*{date}{\datum}
-\setkomavar{date}{<%transdate%>}	
+\setkomavar{date}{<%invdate%>}
 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
-	\gutschrift~
-	\nr ~<%invnumber%>%
+  \gutschrift~
+  \nr ~<%invnumber%>%
 }
 
 <%if invnumber_for_credit_note%>%
-	\setkomavar*{myref}{\fuerRechnung}
-	\setkomavar{myref}{<%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\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%>%
-	}
+  \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%>%
@@ -84,6 +83,12 @@
 
 \gutschriftformel
 
+<%if notes%>%
+<%notes%>%
+\vspace{0.5cm}
+<%end if%>%
+
+
 \begin{PricingTabular*}%
   % eigentliche Tabelle%
   \FakeTable{%
@@ -108,14 +113,10 @@
     <%foreach tax%>%
     <%taxdescription%> & <%tax%>\\%
     <%end tax%>%
-    \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
+    \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
   \end{PricingTotal}%
 \end{PricingTabular*}
 
-<%if notes%>%
-<%notes%>%
-\medskip
-<%end if%>%
 
 \closing{\gruesse}