projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sprache um Attribut ungültig erweitert
[kivitendo-erp.git]
/
templates
/
print
/
RB
/
invoice.tex
diff --git
a/templates/print/RB/invoice.tex
b/templates/print/RB/invoice.tex
index
bd3fa45
..
1435e73
100644
(file)
--- a/
templates/print/RB/invoice.tex
+++ b/
templates/print/RB/invoice.tex
@@
-2,10
+2,10
@@
% Variablen, die in settings verwendet werden
% Variablen, die in settings verwendet werden
-\newcommand{\lx
tmpfile} {<%tmpfil
e%>}
+\newcommand{\lx
langcode} {<%template_meta.language.template_cod
e%>}
\newcommand{\lxmedia} {<%media%>}
\newcommand{\lxcurrency} {<%currency%>}
\newcommand{\lxmedia} {<%media%>}
\newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\
lx
company} {<%employee_company%>}
+\newcommand{\
kivi
company} {<%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%>
~
@@
-56,19
+66,42
@@
\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%>,}\\
+%\rechnungsformel\\
+
+<%if notes%>
+ <%notes%>
+<%end if%>
-\rechnungsformel\\
\vspace{0.5cm}
\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 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%>
\\[-0.8em]
<%end number%>
@@
-135,18
+173,16
@@
\vspace{0.2cm}
\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%>
\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}}
<%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>
\ifthenelse{\equal{<%taxzone_id%>}{1}}
@@
-158,4
+194,3
@@
<%employee_name%>
\end{document}
<%employee_name%>
\end{document}
-