projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RecordLinks für neue Lieferscheintypen
[kivitendo-erp.git]
/
templates
/
print
/
RB
/
sales_order.tex
diff --git
a/templates/print/RB/sales_order.tex
b/templates/print/RB/sales_order.tex
index
0e15a1a
..
dfec85c
100644
(file)
--- a/
templates/print/RB/sales_order.tex
+++ b/
templates/print/RB/sales_order.tex
@@
-5,7
+5,7
@@
\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
\newcommand{\lxmedia} {<%media%>}
\newcommand{\lxcurrency} {<%currency%>}
\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
\newcommand{\lxmedia} {<%media%>}
\newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\
lxtitlebar} {<%titlebar
%>}
+\newcommand{\
kivicompany} {<%employee_company
%>}
% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
\input{insettings.tex}
% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
\input{insettings.tex}
@@
-18,12
+18,22
@@
\begin{document}
\ourfont
\begin{document}
\ourfont
-
\begin{minipage}[t]{8cm}
\begin{minipage}[t]{8cm}
- \vspace*{1.0cm}
+ \scriptsize
+
+ {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
+ \normalsize
+
+ \vspace*{0.3cm}
<%name%>
<%name%>
+ <%if department_1%><%department_1%><%end if%>
+
+ <%if department_2%><%department_2%><%end if%>
+
+ <%cp_givenname%> <%cp_name%>
+
<%street%>
~
<%street%>
~
@@
-52,15
+62,34
@@
\ansprechpartner:\hfill <%employee_name%>
\ansprechpartner:\hfill <%employee_name%>
- <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>
+ \textTelefon \hfill <%employee_tel%>
+
+ \textEmail \hfill <%employee_email%>
\end{minipage}
\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}
\hfill
\vspace*{1.5cm}
\hfill
-% Anrede nach Geschlecht unterscheiden
-\ifthenelse{\equal{<%cp_name%>}{}}{\anrede}{
+% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+\ifthenelse{\equal{<%cp_name%>}{}}{
+ <%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}{
\ifthenelse{\equal{<%cp_gender%>}{f}}
{\anredefrau}{\anredeherr} <%cp_title%> <%cp_name%>,}\\
\ifthenelse{\equal{<%cp_gender%>}{f}}
{\anredefrau}{\anredeherr} <%cp_title%> <%cp_name%>,}\\
@@
-122,6
+151,12
@@
<%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
<%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
<%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
<%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
<%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
<%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
+ <%if optional%> && \scriptsize \optional \\<%end%>
+ <%if customer_make%>
+ <%foreach customer_make%>
+ \ifthenelse{\equal{<%customer_make%>}{<%name%>}}{&& \kundenartnr: <%customer_model%>\\}{}
+ <%end foreach%>
+ <%end if%>
\\[-0.8em]
<%end number%>
\\[-0.8em]
<%end number%>
@@
-136,6
+171,10
@@
\vspace{5mm}
<%end if%>
\vspace{5mm}
<%end if%>
+<%if delivery_term%>
+ \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
<%if reqdate%>
\lieferungErfolgtAm ~<%reqdate%>. \\
<%end if%>
<%if reqdate%>
\lieferungErfolgtAm ~<%reqdate%>. \\
<%end if%>