From: Marei (peiTeX) <marei@peitex.de>
Date: Tue, 29 Sep 2020 20:27:53 +0000 (+0200)
Subject: marei: receipt = check
X-Git-Tag: kivitendo-mebil_0.1-0~9^2~687
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ca6a2fadea4548ad993562919fdd12478d80a782;p=kivitendo-erp.git

marei: receipt = check
---

diff --git a/templates/print/marei/check.tex b/templates/print/marei/check.tex
index b609e04c7..272514097 100644
--- a/templates/print/marei/check.tex
+++ b/templates/print/marei/check.tex
@@ -12,8 +12,6 @@
 
 \KOMAoptions{fontsize=9pt}
 
-\begin{document}
-
 
 \setplength{firstheadvpos}{4cm}
 
@@ -50,5 +48,7 @@
 <%end invnumber%>%
 \end{SimpleTabular}
 
+\end{letter}
+
 \end{document}
 
diff --git a/templates/print/marei/receipt.tex b/templates/print/marei/receipt.tex
index 86ba76eb9..272514097 100644
--- a/templates/print/marei/receipt.tex
+++ b/templates/print/marei/receipt.tex
@@ -1,71 +1,54 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{17cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
-  <%company%>%
-
-  <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
+\documentclass[paper=a4]{scrartcl}
+\usepackage[reffields,backaddress=false]{kiviletter}
 
-\vspace*{0.6cm}
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
+\newcommand{\lxmedia} {<%media%>}
+\newcommand{\lxcurrency} {<%currency%>}
+\newcommand{\kivicompany} {<%employee_company%>}
 
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
 
-\vspace{0.5cm}
+\KOMAoptions{fontsize=9pt}
 
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>%
 
-\vspace{0.5cm}
+\setplength{firstheadvpos}{4cm}
 
-<%name%>%
+\setkomavar{firsthead}{
+	\noindent\begin{tabular}[t]{@{}l@{}}
+		<%company%>\strut\\
+		<%address%>
+	\end{tabular}
+	\hfill
+	<%source%>\par
+	\medskip
+	<%text\_amount%> \dotfill <%decimal%>/100 \par\smallskip
+	\hfill <%datepaid%> \hspace{2cm}\strut<%amount%>
+}
 
-<%street%>%
 
-<%zipcode%>%
-
-<%city%>%
-
-<%country%>%
-
-\vspace{2.8cm}
+\begin{document}
 
-<%company%>%
+\begin{letter}{
+		<%name%>\ifhmode\\\fi
+		<%street%>\ifhmode\\\fi
+		<%zipcode%> <%city%>\ifhmode\\\fi
+		<%country%>%
+	}
 
-\vspace{0.5cm}
+\opening{<%company%>}
+\pagestyle{empty}
 
 <%name%> \hfill <%datepaid%> \hfill <%source%>%
 
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Rechnung} & \textbf{Ausgestellt}
-  & \textbf{Fällig} & \textbf{Verrechnet} \\
+\begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]
 <%foreach invnumber%>%
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
+<%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
 <%end invnumber%>%
-\end{tabularx}
+\end{SimpleTabular}
 
-\vfill
+\end{letter}
 
 \end{document}