X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fsales_delivery_order.tex;h=2811e50c771a1aa56bfd7860b70f38fcbe75ff04;hb=549f187d3a2b1d15f96c4556714666ed954447bb;hp=5e9684ee10a07d004b3ce0750bb77c91cf34096f;hpb=b06bdb41e39a7b62e0b56b317b447353318ab410;p=kivitendo-erp.git

diff --git a/templates/print/marei/sales_delivery_order.tex b/templates/print/marei/sales_delivery_order.tex
index 5e9684ee1..2811e50c7 100644
--- a/templates/print/marei/sales_delivery_order.tex
+++ b/templates/print/marei/sales_delivery_order.tex
@@ -15,87 +15,86 @@
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\lieferschein}{<%donumber%>}{<%dodate%>}
 
-
-\begin{document}
-
-\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%>}
+\setkomavar{title}{
+  \lieferschein~
+  \nr~<%donumber%>%
+}
+<%if ordnumber%>
+  \setkomavar{orderID}{<%ordnumber%>}
+<%end if%>%
+<%if cusordnumber%>%
+  \setkomavar*{yourref}{\unsereBestellnummer}
+  \setkomavar{yourref}{<%cusordnumber%>}
+<%end if%>%
+\setkomavar{transaction}{<%transaction_description%>}
+
 <%if globalprojectnumber%>%
   \setkomavar{projectID}{<%globalprojectnumber%>}
 <%end globalprojectnumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}
-
 \setkomafont{extraDescription}{\scriptsize}
 
+\begin{document}
+
 \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)
-	<%shiptoname%>\strut\\
-	<%if shiptocontact%> <%shiptocontact%><%end if%>\strut\\
-	<%shiptodepartment_1%>\strut\\
-	<%shiptodepartment_2%>\strut\\
-	<%shiptostreet%>\strut\\
-	<%shiptozipcode%> <%shiptocity%>\strut
-	} % ende ifthenelse LIEFERADRESSE
+\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)
+  <%shiptoname%>\strut\\
+  <%if shiptocontact%> <%shiptocontact%><%end if%>\strut\\
+  <%shiptodepartment_1%>\strut\\
+  <%shiptodepartment_2%>\strut\\
+  <%shiptostreet%>\strut\\
+  <%shiptozipcode%> <%shiptocity%>\strut
+} % 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
-<%end number%>%
-}
+  % eigentliche Tabelle
+  \FakeTable{
+  <%foreach number%>%
+  <%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%>\\
+\lieferung ~<%delivery_term.description_long%>\\
 <%end delivery_term%>%
 
 \end{letter}