X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fpurchase_delivery_order.tex;h=ddadec8975c1bc4dad57f41c0a461d0353492cc7;hb=2065624062cd59d7d21a6e1f39ae433a9668301e;hp=39e861dcc45063d0906bad80ea02379594e5526c;hpb=4987cdc759332a4226006c34f3b7c78ee031bc62;p=kivitendo-erp.git

diff --git a/templates/print/marei/purchase_delivery_order.tex b/templates/print/marei/purchase_delivery_order.tex
index 39e861dcc..ddadec897 100644
--- a/templates/print/marei/purchase_delivery_order.tex
+++ b/templates/print/marei/purchase_delivery_order.tex
@@ -11,108 +11,110 @@
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
 
+<%if template_meta.formname == "supplier_delivery_order"%>
+  \renewcommand{\einkaufslieferschein} {\beistelllieferschein}
+<%end%>
+
 
 % laufende Kopfzeile:
 \ourhead{}{}{\einkaufslieferschein}{<%donumber%>}{<%dodate%>}
 
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%dodate%>}
+
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+  \einkaufslieferschein~\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}
+
+<%if shiptoname%>%
+\makeatletter
+\begin{lrbox}\shippingAddressBox
+  \parbox{\useplength{toaddrwidth}}{
+    \backaddr@format{\scriptsize\usekomafont{backaddress}%
+      \strut\abweichendeLieferadresse
+    }
+    \par\smallskip
+    \setlength{\parskip}{\z@}
+    \par
+    \normalsize
+    <%shiptoname%>\par
+    <%if shiptocontact%> <%shiptocontact%><%end if%>\par
+    <%shiptodepartment_1%>\par
+    <%shiptodepartment_2%>\par
+    <%shiptostreet%>\par
+    <%shiptozipcode%> <%shiptocity%>%
+  }
+\end{lrbox}
+\makeatother
+<%end if%>%
 
-\begin{document}
-
-\begin{minipage}[t]{8cm}
-  \scriptsize
-
-  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
-  \normalsize
-
-  \vspace*{0.3cm}
-
-  <%name%>
-
-  <%if department_1%><%department_1%><%end if%>
-
-  <%if department_2%><%department_2%><%end if%>
-
-  <%cp_givenname%> <%cp_name%>
-
-  <%street%>
-
-  ~
-
-  <%zipcode%> <%city%>
-
-  <%country%>
-\end{minipage}
-\hfill
-\begin{minipage}{6cm}
-  \rightline{\LARGE\textbf{\textit{\einkaufslieferschein}}} \vspace*{0.2cm}
-  \rightline{\large\textbf{\textit{\nr ~<%donumber%>
-  }}} \vspace*{0.2cm}
-
-  \datum:\hfill <%dodate%>
-
-  <%if cusordnumber%>\unsereBestellnummer:\hfill <%cusordnumber%><%end if%>
 
-  <%if ordnumber%>\auftragsnummer:\hfill <%ordnumber%><%end if%>
-
-  \ansprechpartner:\hfill <%employee_name%>
-
-  <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>
-\end{minipage}
-
-<%if shiptoname%>
-  \vspace{0.8cm}
-  \scriptsize \underline{\abweichendeLieferadresse:}\\
-  \normalsize    <%shiptoname%>
-
-                 <%if shiptocontact%> <%shiptocontact%><%end if%>
-
-                 <%shiptodepartment_1%>
-
-                  <%shiptodepartment_2%>
-
-                  <%shiptostreet%>
-
-                  <%shiptozipcode%> <%shiptocity%>
-<%end if%>
-\vspace*{1.5cm}
-
-
-%
-% - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
-%   Übertrag machen
-% - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
-%   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
-%   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
-%
-\begin{SimpleTabular}
-% eigentliche Tabelle
-<%foreach number%>
-          <%runningnumber%> &
-          <%qty%> <%unit%> &
-          \textbf{<%description%>} \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
-
-          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>
-          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
-          <%if reqdate%> && \scriptsize \lieferdatum: <%reqdate%>\\<%end reqdate%>
-          <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
-          <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
-          <%foreach si_number%><%if si_chargenumber%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>
-
-          \\[-0.8em]
-<%end number%>
-\end{SimpleTabular}
-
-\vspace{0.2cm}
+\begin{document}
 
-<%if notes%>
-        \vspace{5mm}
-        <%notes%>
-        \vspace{5mm}
-<%end if%>
 
-<%if delivery_term%>
-  \lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>
+\begin{letter}{
+<%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
+}
+
+
+\opening{}
+\thispagestyle{kivitendo.letter.first}
+
+\begin{PricingTabular*}[columns={pos,amount,desc}]
+  % eigentliche Tabelle
+  \FakeTable{
+  <%foreach number%>%
+  <%runningnumber%> &
+  <%qty%> <%unit%> &
+  \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%>%
+    \tabularnewline
+    <%end number%>%
+  }
+\end{PricingTabular*}
+
+\medskip
+
+<%if notes%>%
+<%notes%>%
+\medskip
+<%end if%>%
+
+<%if delivery_term%>%
+\lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>%
+
+\end{letter}
 
 \end{document}