X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fpick_list.tex;h=23736b55bb11435bd29d29c60b6eb44c0dbf4b44;hb=a1ee0d462be910dc77be3e084a689d20144a3edb;hp=1a7c96495dd22cbe2dabab50c94c6a9884be4388;hpb=77d85523b2aa5e7a6f2e0abe59e23b92508bd1bf;p=kivitendo-erp.git diff --git a/templates/print/marei/pick_list.tex b/templates/print/marei/pick_list.tex index 1a7c96495..23736b55b 100644 --- a/templates/print/marei/pick_list.tex +++ b/templates/print/marei/pick_list.tex @@ -13,60 +13,59 @@ \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} + \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} } \makeatletter \setkomavar{location}{ - \normalsize - <%shiptocontact%>% - <%if shiptophone%>% - \\\textTelefon : <%shiptophone%> - <%end shiptophone%>% - <%if shiptofax%>% - \\\textFax : <%shiptofax%> - <%end shiptofax%>% - \\% - <%shiptoemail%>% - } + \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%> +\begin{letter}{\strut% +<%shiptoname%>\ifhmode\\\fi +<%shiptostreet%>\ifhmode\\\fi +<%shiptozipcode%>\ifhmode\\\fi +<%shiptocity%>\ifhmode\\\fi +<%shiptocountry%>% } \opening{} \begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt - <%if warehouse%>% - &\bfseries\lager% - <%end warehouse%>% - &\bfseries\lagerplatz&\bfseries\lieferungMit}] - + <%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%>% @@ -77,11 +76,11 @@ \bigskip -\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%> +\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} \end{letter}