X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2FRB%2Finvoice.tex;h=f3a7761f2263734702a76257f4770cb3f3152b48;hb=ce904bd69f1eaafe99dbdda7956471b2ea219feb;hp=bd3fa4581fe01fab166f1041980c0e3340bed019;hpb=77527022ef849e10970f285717b9db5d383a1a2e;p=kivitendo-erp.git

diff --git a/templates/print/RB/invoice.tex b/templates/print/RB/invoice.tex
index bd3fa4581..f3a7761f2 100644
--- a/templates/print/RB/invoice.tex
+++ b/templates/print/RB/invoice.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%>
 
   ~
@@ -56,8 +66,25 @@
 
   \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}
 
@@ -67,8 +94,12 @@
 \ifthenelse{\equal{<%cp_name%>}{}}{\anrede}{
   \ifthenelse{\equal{<%cp_gender%>}{f}}
     {\anredefrau}{\anredeherr} <%cp_title%> <%cp_name%>,}\\
+%\rechnungsformel\\
+
+<%if notes%>
+        <%notes%>
+<%end if%>
 
-\rechnungsformel\\
 
 \vspace{0.5cm}
 
@@ -135,18 +166,16 @@
 
 \vspace{0.2cm}
 
-<%if notes%>
-        \vspace{5mm}
-        <%notes%>
-        \vspace{5mm}
-<%end if%>
-
 \ifthenelse{\equal{<%deliverydate%>}{}}{\leistungsdatumGleichRechnungsdatum}{\lieferungErfolgtAm ~<%deliverydate%>.} \\
 
 <%if payment_terms%>
   \zahlung ~<%payment_terms%>\\
 <%end payment_terms%>
 
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
 <%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>
 
 \ifthenelse{\equal{<%taxzone_id%>}{1}}
@@ -158,4 +187,3 @@
   <%employee_name%>
 
 \end{document}
-