Factur-X/ZUGFeRD: Unterstütztung für Profil »XRechnung 2.0.0«

[kivitendo-erp.git] / templates / print / marei / sales_delivery_order.tex

diff --git a/templates/print/marei/sales_delivery_order.tex b/templates/print/marei/sales_delivery_order.tex
index 5e9684e..657abd9 100644 (file)
--- a/templates/print/marei/sales_delivery_order.tex
+++ b/templates/print/marei/sales_delivery_order.tex
@@ -15,33 +15,35 @@
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\lieferschein}{<%donumber%>}{<%dodate%>}
 
-
-\begin{document}
-
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%dodate%>}
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
        \lieferschein~
        \nr~<%donumber%>%
 }
-\setkomavar*{date}{\datum}
-\setkomavar{date}{<%dodate%>}
+<%if ordnumber%>
+       \setkomavar{orderID}{<%ordnumber%>}
+<%end if%>%
 <%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%>}
+\setkomavar{transaction}{<%transaction_description%>}
+
 <%if globalprojectnumber%>%
-  \setkomavar{projectID}{<%globalprojectnumber%>}
+       \setkomavar{projectID}{<%globalprojectnumber%>}
 <%end globalprojectnumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}
-
 \setkomafont{extraDescription}{\scriptsize}
 
+\begin{document}
+
 \begin{letter}{
-  \ifstr{<%shiptoname%>}{}{ % KEINE ABWEICHENDE LIEFERADRESSE
+  \Ifstr{<%shiptoname%>}{}{ % KEINE ABWEICHENDE LIEFERADRESSE
        <%name%>\strut\\
        <%if department_1%><%department_1%>\\<%end if%>%
        <%if department_2%><%department_2%>\\<%end if%>%
@@ -59,41 +61,38 @@
        } % ende ifthenelse LIEFERADRESSE
 }
 
-\opening{}%muss existieren, damit seitenstil erzeugt wird.
+\opening{}
+\thispagestyle{kivitendo.letter.first}
 
 \begin{PricingTabular*}[columns={pos, id, desc, amount}]
 % eigentliche Tabelle
 \FakeTable{
 <%foreach number%>%
-          <%runningnumber%> &
-          <%number%> &
-          \textbf{<%description%>}&
-          <%qty%> <%unit%>%
-          <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-          <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
-          <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
-          <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
-          <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-                 <%foreach si_number%>%
-                       <%if si_chargenumber%>\ExtraDescription{\charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%><%si_qty%>~<%si_unit%><%end si_chargenumber%>}%
-                 <%end si_number%>%
-                 \tabularnewline
+       <%runningnumber%> &
+       <%number%> &
+       \textbf{<%description%>}
+               <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+               <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
+               <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+               <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+               <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+               <%foreach si_number%>%
+                       <%if si_chargenumber%>\ExtraDescription{\charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%><%si_qty%>~<%si_unit%><%end si_chargenumber%>}%
+               <%end si_number%>%
+       &
+               <%qty%> <%unit%>%
+       \tabularnewline
 <%end number%>%
 }
 \end{PricingTabular*}
 
-
-
-
-
-\vspace{0.2cm}
+\medskip
 
 <%if notes%>%
 <%notes%>%
 \medskip
 <%end if%>%
 
-
 <%if delivery_term%>%
   \lieferung ~<%delivery_term.description_long%>\\
 <%end delivery_term%>%