"ModeOfTransport" und "WaybillNumber"

versandauftrag/vl-versandauftrag.cls

@@ -199,23 +199,23 @@
 \newcommand*\vl@ModeOfTransport{}
 \newcommand*\ModeOfTransport[1]{%
   \expandafter\@ModeOfTransport#1 \@nil
-  \ifShippingCompany
-    \edef\vl@tempb{\noexpand\vl@setcommand{vl@ModeOfTransport}{\vl@tempa}}%
-    \vl@tempb
-  \else
-    \vl@setcommand{vl@ModeOfTransport}{#1}
-  \fi
 }
 \newcommand*\@ModeOfTransport{}
 \def\@ModeOfTransport#1 #2\@nil{%
   \def\vl@tempa{#2}%
-  \if#1*
+  \if#1*%
     \ShippingCompanytrue
+    \edef\vl@tempb{\noexpand\vl@setcommand{vl@ModeOfTransport}{\vl@tempa}}%
+    \vl@tempb
   \else
     \ShippingCompanyfalse
+    \vl@setcommand{vl@ModeOfTransport}{#1 #2}%
   \fi
 }
 
+\newcommand*\vl@WaybillNumber{}
+\newcommand*\WaybillNumber[1]{\vl@setcommand{vl@WaybillNumber}{#1}}
+
 \newcounter{vl@TransportType} \setcounter{vl@TransportType}{0}
 \newcommand*\TransportType[1]{\vl@setcounter{vl@TransportType}{#1}}
 \newcounter{vl@Shippingtype} \setcounter{vl@Shippingtype}{0}