From: Marei (peiTeX) <marei@peitex.de>
Date: Tue, 29 Sep 2020 20:15:38 +0000 (+0200)
Subject: marei: restructure pick_list
X-Git-Tag: kivitendo-mebil_0.1-0~9^2~689
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=33ae80773d86157519a284de8c147ba0ec94e3f8;p=kivitendo-erp.git

marei: restructure pick_list
---

diff --git a/templates/print/marei/bin_list.tex b/templates/print/marei/bin_list.tex
index 1bd1f6f8f..36738a747 100644
--- a/templates/print/marei/bin_list.tex
+++ b/templates/print/marei/bin_list.tex
@@ -10,8 +10,7 @@
 \KOMAoptions{fontsize=10pt}
 \begin{document}
 
-\setkomavar{title}{Lagerliste}
-
+\setkomavar{title}{\lagerliste}
 
 \setkomavar{firsthead}{
 	\normalsize
diff --git a/templates/print/marei/deutsch.tex b/templates/print/marei/deutsch.tex
index f47bd3486..bf24eeb13 100644
--- a/templates/print/marei/deutsch.tex
+++ b/templates/print/marei/deutsch.tex
@@ -142,6 +142,7 @@
 \newcommand*{\verrechnet}{Verrechnet}
 
 %lagerliste/bin_list
+\newcommand*{\lagerliste}{Lagerliste}
 \newcommand*{\lieferanschrift}{Lieferanschrift}
 \newcommand*{\bestellnummer}{Bestellnummer}
 \newcommand*{\kontakt}{Kontakt}
@@ -150,4 +151,8 @@
 \newcommand*{\lieferungMit}{Lieferung mit}
 \newcommand*{\nummer}{Nummer}
 \newcommand*{\beschreibung}{Beschreibung}
-\newcommand*{\erh}{Erh}
\ No newline at end of file
+\newcommand*{\erh}{Erh}
+
+%sammelliste
+\newcommand*{\sammelliste}{Sammelliste}
+\newcommand*{\lagerausgang}{Lagerausgang}
\ No newline at end of file
diff --git a/templates/print/marei/pick_list.tex b/templates/print/marei/pick_list.tex
index 8268b1470..ad0ad7a9b 100644
--- a/templates/print/marei/pick_list.tex
+++ b/templates/print/marei/pick_list.tex
@@ -1,123 +1,90 @@
-\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]{kiviletter}
 
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{9cm}
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\vspace*{-1.3cm}
-
-\parbox{\textwidth}{
-  \parbox[b]{.42\textwidth}{
-    <%company%>%
-
-    <%address%>%
-  }\hfill
-  \begin{tabular}[b]{rr@{}}
-  Tel & <%tel%>\\
-  Fax & <%fax%>%
-  \end{tabular}
-
-  \rule[1.5ex]{\textwidth}{0.5pt}
-}
-
-\vspace*{0.5cm}
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-  \textbf{Lieferanschrift}
-} \hfill
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
 
-\vspace{0.7cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
+\KOMAoptions{fontsize=10pt}
+\begin{document}
 
-<%shiptoname%> \\
-<%shiptostreet%> \\
-<%shiptozipcode%> \\
-<%shiptocity%> \\
-<%shiptocountry%>%
+\setkomavar{title}{\sammelliste}
+
+\setkomavar{firsthead}{
+	\normalsize
+	\noindent\begin{tabular}[t]{@{}l@{}}
+		<%company%>\strut\\
+		<%address%>
+	\end{tabular}
+	\hfill
+ \begin{tabular}[t]{rr@{}}
+		Tel & <%tel%>\\
+		Fax & <%fax%>%
+	\end{tabular}
+	\rule{\linewidth}{\heavyrulewidth}
 }
-\parbox[t]{.4\textwidth}{
-  <%shiptocontact%>%
-
-  <%if shiptophone%>%
-  Tel: <%shiptophone%>%
-  <%end shiptophone%>%
-
-  <%if shiptofax%>%
-  Fax: <%shiptofax%>%
-  <%end shiptofax%>%
 
-  <%shiptoemail%>%
+\makeatletter
+\setkomavar{location}{
+	\normalsize
+	<%shiptocontact%>%
+	<%if shiptophone%>%
+	\\\textTelefon : <%shiptophone%>
+	<%end shiptophone%>%
+	<%if shiptofax%>%
+	\\\textFax : <%shiptofax%>
+	<%end shiptofax%>%
+	\\%
+	<%shiptoemail%>%
+	}
+\makeatother
+
+\setkomavar{backaddress}{\lieferanschrift}
+
+\begin{letter}{
+	<%shiptoname%>\ifhmode\\\fi
+	<%shiptostreet%>\ifhmode\\\fi
+	<%shiptozipcode%>\ifhmode\\\fi
+	<%shiptocity%>\ifhmode\\\fi
+	<%shiptocountry%>
 }
-\hfill
 
-\vspace{1cm}
+\opening{}
 
-\textbf{S A M M E L L I S T E}
-\hfill
 
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
-  \textbf{BestellNr. \#} & \textbf{Datum} & \textbf{Kontakt}
+\begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
   <%if warehouse%>%
-  & \textbf{Lager}
+  &\bfseries\lager%
   <%end warehouse%>%
-  & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5em]
-  \hline
+  &\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}