Merge branch 'b-3.6.1' into mebil

[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 612fa0c..23736b5 100644 (file)
--- a/templates/print/marei/pick_list.tex
+++ b/templates/print/marei/pick_list.tex
@@ -13,59 +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}{\strut%
-       <%shiptoname%>\ifhmode\\\fi
-       <%shiptostreet%>\ifhmode\\\fi
-       <%shiptozipcode%>\ifhmode\\\fi
-       <%shiptocity%>\ifhmode\\\fi
-       <%shiptocountry%>%
+<%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,10 +77,10 @@
 \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%>%
+  <%foreach number%>%
+  <%runningnumber%> & <%number%> & <%description%> &%
+  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\%
+  <%end number%>%
 \end{SimpleTabular}
 
 \end{letter}