Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / templates / print / marei / pick_list.tex

diff --git a/templates/print/marei/pick_list.tex b/templates/print/marei/pick_list.tex
index 8268b14..23736b5 100644 (file)
--- a/templates/print/marei/pick_list.tex
+++ b/templates/print/marei/pick_list.tex
@@ -1,123 +1,89 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{17cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
+\documentclass[twoside,parskip=half-]{scrartcl}
+\usepackage[reffields,backaddress=false,addrfield=topaligned,nofooter]{kiviletter}
 
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{9cm}
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 
-\pagestyle{myheadings}
-\thispagestyle{empty}
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
 
-\vspace*{-1.3cm}
+\KOMAoptions{fontsize=10pt}
+\begin{document}
 
-\parbox{\textwidth}{
-  \parbox[b]{.42\textwidth}{
-    <%company%>%
+\setkomavar{title}{\sammelliste}
 
-    <%address%>%
-  }\hfill
-  \begin{tabular}[b]{rr@{}}
-  Tel & <%tel%>\\
-  Fax & <%fax%>%
+\setkomavar{firsthead}{
+  \normalsize
+  \noindent\begin{tabular}[t]{@{}l@{}}
+    <%company%>\strut\\
+    <%address%>
   \end{tabular}
-
-  \rule[1.5ex]{\textwidth}{0.5pt}
+  \hfill
+  \begin{tabular}[t]{rr@{}}
+    Tel & < %tel%>\\
+    Fax & < %fax%>%
+  \end{tabular}
+  \rule{\linewidth}{\heavyrulewidth}
 }
 
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-  \textbf{Lieferanschrift}
-} \hfill
-
-\vspace{0.7cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-
-<%shiptoname%> \\
-<%shiptostreet%> \\
-<%shiptozipcode%> \\
-<%shiptocity%> \\
-<%shiptocountry%>%
-}
-\parbox[t]{.4\textwidth}{
+\makeatletter
+\setkomavar{location}{
+  \normalsize
   <%shiptocontact%>%
-
   <%if shiptophone%>%
-  Tel: <%shiptophone%>%
+  \\\textTelefon : <%shiptophone%>
   <%end shiptophone%>%
-
   <%if shiptofax%>%
-  Fax: <%shiptofax%>%
+  \\\textFax : <%shiptofax%>
   <%end shiptofax%>%
-
+  \\%
   <%shiptoemail%>%
 }
-\hfill
+\makeatother
 
-\vspace{1cm}
+\setkomavar{backaddress}{\lieferanschrift}
+
+\begin{letter}{\strut%
+<%shiptoname%>\ifhmode\\\fi
+<%shiptostreet%>\ifhmode\\\fi
+<%shiptozipcode%>\ifhmode\\\fi
+<%shiptocity%>\ifhmode\\\fi
+<%shiptocountry%>%
+}
 
-\textbf{S A M M E L L I S T E}
-\hfill
+\opening{}
 
-\vspace{1cm}
 
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
-  \textbf{BestellNr. \#} & \textbf{Datum} & \textbf{Kontakt}
-  <%if warehouse%>%
-  & \textbf{Lager}
-  <%end warehouse%>%
-  & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5em]
-  \hline
+\begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
+        <%if warehouse%>%
+        &\bfseries\lager%
+        <%end warehouse%>%
+        &\bfseries\lagerplatz&\bfseries\lieferungMit}]
   <%ordnumber%>%
+  &%
   <%if shippingdate%>%
-  & <%shippingdate%>%
+  <%shippingdate%>%
   <%end shippingdate%>%
   <%if not shippingdate%>%
-  & <%orddate%>%
+  <%orddate%>%
   <%end shippingdate%>%
   & <%employee%>%
   <%if warehouse%>%
   & <%warehouse%>%
   <%end warehouse%>%
   & <%shippingpoint%> & <%shipvia%> \\
-  \hline
-\end{tabularx}
+\end{SimpleTabular}
 
-\vspace{1cm}
+\bigskip
 
-\begin{tabular*}{\textwidth}{@{}rlp{\descrwidth}@{\extracolsep\fill}rcll@{}}
-  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} &
-  \textbf{Menge} & \textbf{Lagerausgang} & & \textbf{Lagerplatz} \\
-<%foreach number%>%
-  <%runningnumber%> & <%number%> & <%description%> &
-  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\
-<%end number%>%
-\end{tabular*}
+\begin{SimpleTabular}[colspec=rlXrcll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\menge&\bfseries\lagerausgang&&\bfseries\lagerplatz}]%
+  <%foreach number%>%
+  <%runningnumber%> & <%number%> & <%description%> &%
+  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\%
+  <%end number%>%
+\end{SimpleTabular}
 
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-}
+\end{letter}
 
 \end{document}