X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2FRB%2Finvoice.tex;h=1435e732db44955b4b4bd8fef89359f3f9a55786;hb=991369b17d679e2855f4d5086d0b9769dc2ae1aa;hp=9959c452f53b86f3ce67f746fb750035362678c2;hpb=e0e3eee4eb59b7d6fbe17fe9ad12167b6b8a388b;p=kivitendo-erp.git

diff --git a/templates/print/RB/invoice.tex b/templates/print/RB/invoice.tex
index 9959c452f..1435e732d 100644
--- a/templates/print/RB/invoice.tex
+++ b/templates/print/RB/invoice.tex
@@ -5,7 +5,7 @@
 \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}
@@ -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%>
 
   ~
@@ -56,19 +66,42 @@
 
   \ansprechpartner:\hfill <%employee_name%>
 
-  <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>
+  \textTelefon \hfill <%employee_tel%>
+
+  \textEmail \hfill <%employee_email%>
 \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
 
-% 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%>,}\\
+%\rechnungsformel\\
+
+<%if notes%>
+        <%notes%>
+<%end if%>
 
-\rechnungsformel\\
 
 \vspace{0.5cm}
 
@@ -126,6 +159,11 @@
           <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
           <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
           <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
+          <%if customer_make%>
+            <%foreach customer_make%>
+              \ifthenelse{\equal{<%customer_make%>}{<%name%>}}{&& \kundenartnr: <%customer_model%>\\}{}
+            <%end foreach%>
+          <%end if%>
 
           \\[-0.8em]
 <%end number%>
@@ -135,12 +173,6 @@
 
 \vspace{0.2cm}
 
-<%if notes%>
-        \vspace{5mm}
-        <%notes%>
-        \vspace{5mm}
-<%end if%>
-
 \ifthenelse{\equal{<%deliverydate%>}{}}{\leistungsdatumGleichRechnungsdatum}{\lieferungErfolgtAm ~<%deliverydate%>.} \\
 
 <%if payment_terms%>
@@ -162,4 +194,3 @@
   <%employee_name%>
 
 \end{document}
-