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

diff --git a/templates/print/RB/invoice.tex b/templates/print/RB/invoice.tex
index bd3fa4581..78d63b46b 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{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
@@ -24,6 +24,12 @@
 
   <%name%>
 
+  <%department_1%>
+
+  <%department_2%>
+
+  <%cp_givenname%> <%cp_name%>
+
   <%street%>
 
   ~
@@ -67,8 +73,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 +145,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}}