new structure to sales_delivery_order.tex

diff --git a/sales_delivery_order.tex b/sales_delivery_order.tex
index bab678224e9890ca29356efd235774bfe41b1bba..a612f7e567e8de2b1261348066496ebb21b23895 100644 (file)
--- a/sales_delivery_order.tex
+++ b/sales_delivery_order.tex
@@ -18,68 +18,45 @@
 
 \begin{document}
 
 
 \begin{document}
 

-\begin{minipage}[t]{8cm}
-  \scriptsize
-  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
-  \normalsize
-
-  \vspace*{0.3cm}
-  \ifthenelse{\equal{<%shiptoname%>}{}}{ % KEINE ABWEICHENDE LIEFERADRESSE
-
-    <%name%>
-
-    <%street%>
-
-    ~
-
-    <%zipcode%> <%city%>
-
-    <%country%>
-
+\setkomavar{title}{
+       \lieferschein~
+       \nr~<%donumber%>
+}
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%dodate%>}
+<%if cusordnumber%>
+       \setkomavar*{yourref}{\unsereBestellnummer}
+       \setkomavar{yourref}{<%cusordnumber%>}
+<%end if%>
+<%if ordnumber%>\setkomavar{orderID}{<%ordnumber%>}<%end if%>
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
+<%if globalprojectnumber%>\setkomavar{projectID}{<%globalprojectnumber%}><%end globalprojectnumber%>
+
+\setkomavar{transaction}{<%transaction_description%>}
+
+
+\begin{letter}{
+  \ifstr{<%shiptoname%>}{}{ % KEINE ABWEICHENDE LIEFERADRESSE
+       <%name%>\strut\\
+       <%if department_1%><%department_1%>\\<%end if%>
+       <%if department_2%><%department_2%>\\<%end if%>
+       <%cp_givenname%> <%cp_name%>\strut\\
+       <%street%>\strut\\
+       <%zipcode%> <%city%>\strut\\
+       <%country%> \strut

   }{ % ABWEICHENDE LIEFERADRESSE (Aus Stammdaten oder Beleg)
   }{ % ABWEICHENDE LIEFERADRESSE (Aus Stammdaten oder Beleg)

+       <%shiptoname%>\strut\\
+       <%if shiptocontact%> <%shiptocontact%><%end if%>\strut\\
+       <%shiptodepartment_1%>\strut\\
+       <%shiptodepartment_2%>\strut\\
+       <%shiptostreet%>\strut\\
+       <%shiptozipcode%> <%shiptocity%>\strut
+       } % ende ifthenelse LIEFERADRESSE
+}

 
 

-    <%shiptoname%>
-
-    <%shiptostreet%>
-
-    ~
-
-    <%shiptozipcode%> <%shiptocity%>
-
-    <%shiptocountry%>
-  } % ende ifthenelse LIEFERADRESSE
-\end{minipage}
-
-
-\hfill
-\begin{minipage}[t]{6cm}
-  \hfill{\LARGE\textbf{\lieferschein}}
-
-  \vspace*{0.2cm}
-
-  \hfill{\large\textbf{\nr ~<%donumber%>}}
-
-  \vspace*{0.2cm}
-
-  \datum:\hfill <%dodate%>
-
-  \kundennummer:\hfill <%customernumber%>
-
-  <%if cusordnumber%>\ihreBestellnummer:\hfill <%cusordnumber%><%end if%>
-
-  <%if ordnumber%>\auftragsnummer:\hfill <%ordnumber%><%end if%>
-
-  \ansprechpartner:\hfill <%employee_name%>
-
-  \textTelefon \hfill <%employee_tel%>
-
-  \textEmail \hfill <%employee_email%>
-
-  <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>
-\end{minipage}
-
-\vspace*{1.5cm}
-
+\opening{}%muss existieren, damit seitenstil erzeugt wird.

 
 %
 % - longtable kann innerhalb der Tabelle umbrechen
 
 %
 % - longtable kann innerhalb der Tabelle umbrechen


@@ -136,13 +113,15 @@
 \vspace{0.2cm}
 
 <%if notes%>
 \vspace{0.2cm}
 
 <%if notes%>

-        \vspace{5mm}
-        <%notes%>
-        \vspace{5mm}
+<%notes%>
+\medskip

 <%end if%>
 
 <%end if%>
 

+

 <%if delivery_term%>
   \lieferung ~<%delivery_term.description_long%>\\
 <%end delivery_term%>
 
 <%if delivery_term%>
   \lieferung ~<%delivery_term.description_long%>\\
 <%end delivery_term%>
 

+\end{letter}
+

 \end{document}
 \end{document}