-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rll@{}}
- \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
- \textbf{Unit} & \textbf{Bin} \\
+\begin{tabularx}{\textwidth}{*{7}{|X}|} \hline
+ \textbf{Invoice \#} & \textbf{Order \#} & \textbf{Date} & \textbf{Contact}
+ <%if warehouse%>
+ & \textbf{Warehouse}
+ <%end warehouse%>
+ & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
+ \hline
+
+ <%invnumber%> & <%ordnumber%>
+ <%if shippingdate%>
+ & <%shippingdate%>
+ <%end shippingdate%>
+ <%if not shippingdate%>
+ & <%transdate%>
+ <%end shippingdate%>
+ & <%employee%>
+ <%if warehouse%>
+ & <%warehouse%>
+ <%end warehouse%>
+ & <%shippingpoint%> & <%shipvia%> \\
+ \hline
+\end{tabularx}
+
+\vspace{1cm}
+
+\begin{tabularx}{\textwidth}{@{}rlXllrrl@{}}
+ \textbf{Pos} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Ship} & \\
+