projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t/wh/inventory.t: Nach Test richtig aufräumen
[kivitendo-erp.git]
/
templates
/
print
/
RB
/
sales_order.tex
diff --git
a/templates/print/RB/sales_order.tex
b/templates/print/RB/sales_order.tex
index
1949fe5
..
ad0de3e
100644
(file)
--- a/
templates/print/RB/sales_order.tex
+++ b/
templates/print/RB/sales_order.tex
@@
-86,8
+86,10
@@
\hfill
\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%>,}\\
@@
-149,6
+151,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%>