projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Passwörter: Unterstützung für crypt, MD5 und SHA-1 entfernt
[kivitendo-erp.git]
/
templates
/
print
/
RB
/
sales_delivery_order.tex
diff --git
a/templates/print/RB/sales_delivery_order.tex
b/templates/print/RB/sales_delivery_order.tex
index
ca67a69
..
681e6ac
100644
(file)
--- a/
templates/print/RB/sales_delivery_order.tex
+++ b/
templates/print/RB/sales_delivery_order.tex
@@
-21,15
+21,33
@@
\begin{minipage}[t]{8cm}
\vspace*{1.0cm}
\begin{minipage}[t]{8cm}
\vspace*{1.0cm}
+ \ifthenelse{\equal{<%shiptoname%>}{}}{ % KEINE ABWEICHENDE LIEFERADRESSE
-
<%shipto
name%>
+
<%
name%>
-
<%shipto
street%>
+
<%
street%>
- <%shiptozipcode%> <%shiptocity%>
+ ~
- <%shiptocountry%>
+ <%zipcode%> <%city%>
+
+ <%country%>
+
+ }{ % ABWEICHENDE LIEFERADRESSE (Aus Stammdaten oder Beleg)
+
+ <%shiptoname%>
+
+ <%shiptostreet%>
+
+ ~
+
+ <%shiptozipcode%> <%shiptocity%>
+
+ <%shiptocountry%>
+ } % ende ifthenelse LIEFERADRESSE
\end{minipage}
\end{minipage}
+
+
\hfill
\begin{minipage}[t]{6cm}
\hfill{\LARGE\textbf{\lieferschein}}
\hfill
\begin{minipage}[t]{6cm}
\hfill{\LARGE\textbf{\lieferschein}}