X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2FStandard%2Fpick_list.tex;h=f505182669d765443d8414b04590f1d9d71889c2;hb=670205aa27d6491f1a88c9da902ae316a17614f3;hp=6da629b7f6039651f8ec32326a55ed32d6053251;hpb=8efbc44487e0f99236ec55539a61f1d0d04635a9;p=kivitendo-erp.git

diff --git a/templates/print/Standard/pick_list.tex b/templates/print/Standard/pick_list.tex
index 6da629b7f..f50518266 100644
--- a/templates/print/Standard/pick_list.tex
+++ b/templates/print/Standard/pick_list.tex
@@ -1,3 +1,14 @@
+% pick_list.tex
+% Sammelliste Verkauf
+% Überarbeitet von Norbert Simon, n.simon@linet-services.de
+% Version 2.5 vom 16.Oktober 2011
+% Basiert auf der Arbeit von kmk@lilalaser.de / 2007
+% Diese Vorlage steht unter der GPL-Lizenz, Version 3
+% siehe http://www.gnu.de/licenses/gpl-3.0.html
+% ----------
+% config: tag-style=$( )$
+% ----------
+
 \documentclass[twoside]{scrartcl}
 \usepackage[frame]{xy}
 \usepackage{tabularx}
@@ -29,19 +40,34 @@
 
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{
-    <%company%>
+    $(company)$
 
-    <%address%>
+    $(address)$
   }\hfill
   \begin{tabular}[b]{rr@{}}
-  Tel & <%tel%>\\
-  Fax & <%fax%>
+  Tel & $(tel)$\\
+  Fax & $(fax)$
   \end{tabular}
 
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
 
 
+%$(pagebreak 90 27 37)$
+%\end{tabular*}
+
+%\newpage
+
+\markboth{$(company)$\hfill $(ordnumber)$}{$(company)$\hfill $(ordnumber)$}
+
+\vspace*{-12pt}
+
+%\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rcll@{}}
+%  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} &
+%  \textbf{Menge} & \textbf{Lagerausgang} & & \textbf{Lagerplatz} \\
+%$(end pagebreak)$
+
+
 \vspace*{0.5cm}
 
 \parbox[t]{1cm}{\hfill}
@@ -54,24 +80,24 @@
 \parbox[t]{1cm}{\hfill}
 \parbox[t]{.5\textwidth}{
 
-<%shiptoname%> \\
-<%shiptostreet%> \\
-<%shiptozipcode%> \\
-<%shiptocity%> \\
-<%shiptocountry%>
+$(shiptoname)$ \\
+$(shiptostreet)$ \\
+$(shiptozipcode)$ \\
+$(shiptocity)$ \\
+$(shiptocountry)$
 }
 \parbox[t]{.4\textwidth}{
-  <%shiptocontact%>
+  $(shiptocontact)$
 
-  <%if shiptophone%>
-  Tel: <%shiptophone%>
-  <%end shiptophone%>
+  $(if shiptophone)$
+  Tel: $(shiptophone)$
+  $(end shiptophone)$
 
-  <%if shiptofax%>
-  Fax: <%shiptofax%>
-  <%end shiptofax%>
+  $(if shiptofax)$
+  Fax: $(shiptofax)$
+  $(end shiptofax)$
 
-  <%shiptoemail%>
+  $(shiptoemail)$
 }
 \hfill
 
@@ -81,44 +107,58 @@
 \hfill
 
 \vspace{1cm}
-
+\typeout{hier?}
 \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]
+  \textbf{BestellNr. \#} &
+  \textbf{Datum} &
+  \textbf{Kontakt} &
+  $(if warehouse)$ \textbf{Lager} & $(end warehouse)$
+  \textbf{Lagerplatz} &
+  \textbf{Lieferung mit} \\ [0.5em]
   \hline
-  <%ordnumber%>
-  <%if shippingdate%>
-  & <%shippingdate%>
-  <%end shippingdate%>
-  <%if not shippingdate%>
-  & <%orddate%>
-  <%end shippingdate%>
-  & <%employee%>
-  <%if warehouse%>
-  & <%warehouse%>
-  <%end warehouse%>
-  & <%shippingpoint%> & <%shipvia%> \\
+	$(ordnumber)$ &
+	$(if shippingdate)$ $(shippingdate)$ &$(end shippingdate)$
+	$(if not shippingdate)$ $(orddate)$ &$(end shippingdate)$
+	$(employee)$ &
+	$(if warehouse)$ $(warehouse)$ &$(end warehouse)$
+	$(shippingpoint)$ &
+	$(shipvia)$ \\
   \hline
 \end{tabularx}
 
 \vspace{1cm}
 
-\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{tabular*}{\textwidth}{@{}rlp{\descrwidth}@{\extracolsep\fill}rcll@{}}
+\setlength{\tabcolsep}{0mm}
+\begin{tabularx}{\textwidth}{p{1.5cm}p{6cm}p{2cm}p{2cm}p{4cm}p{1.5cm}}
+  \textbf{Art-Nr} &
+  \textbf{Beschreibung} &
+  \textbf{Serien-Nr} &
+  \textbf{Menge} &
+  \textbf{Lager} &
+  \textbf{Lagerplatz} \\
+$(foreach number)$
+ $(if si_qty)$
+  $(foreach si_number)$
+   $(si_number)$ &
+   $(si_description)$ &
+   $(si_chargenumber)$ &
+   \hfill $(si_qty)$ $(si_unit)$ &
+   $(si_warehouse)$ &
+   $(si_bin)$\\[1em]
+  $(end si_number)$
+ $(else)$
+  $(number)$ &
+  $(description)$ &
+  &
+  \hfill $(qty)$ $(unit)$ &
+  & \\[1em]
+ $(end si_qty)$
+$(end number)$
+\end{tabularx}
 
 \parbox{\textwidth}{
 \rule{\textwidth}{2pt}
 }
 
 \end{document}
-