X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2FRB%2Fcredit_note.tex;h=7a60d3d8837dc777a2798c548e2ff5a139e224b9;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=fe69e9f3c824860cd725adf7dcc24d6f0f05a390;hpb=21c964b9ec4972346d9c6b7fef370268b4caf789;p=kivitendo-erp.git

diff --git a/templates/print/RB/credit_note.tex b/templates/print/RB/credit_note.tex
index fe69e9f3c..7a60d3d88 100644
--- a/templates/print/RB/credit_note.tex
+++ b/templates/print/RB/credit_note.tex
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\kivicompany} {<%employee_company%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
@@ -18,12 +18,22 @@
 \begin{document}
 
 \ourfont
-
 \begin{minipage}[t]{8cm}
-  \vspace*{1.0cm}
+  \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%>
 
   ~
@@ -31,7 +41,6 @@
   <%zipcode%> <%city%>
 
   <%country%>
-
 \end{minipage}
 \hfill
 \begin{minipage}[t]{6cm}
@@ -55,15 +64,39 @@
 
   \ansprechpartner:\hfill <%employee_name%>
 
+  \textTelefon \hfill <%employee_tel%>
+
+  \textEmail \hfill <%employee_email%>
+
   <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>
 \end{minipage}
 
+<%if shiptoname%>
+  \vspace{0.8cm}
+ % \hfill \fbox{\parbox{5.55cm}{%
+ % \raggedright
+  \scriptsize \underline{\abweichendeLieferadresse:}\\
+  \normalsize    <%shiptoname%>
+
+                 <%if shiptocontact%> <%shiptocontact%><%end if%>
+
+                 <%shiptodepartment_1%>
+
+                  <%shiptodepartment_2%>
+
+                  <%shiptostreet%>
+
+                  <%shiptozipcode%> <%shiptocity%>
+%  }}
+<%end if%>
 \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%>,}\\
 
@@ -124,7 +157,6 @@
           <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
           <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
           <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
-
           \\[-0.8em]
 <%end number%>