projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "JavaScript-Plugin: auch als Filter einsetzen können"
[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
690fd13
..
681e6ac
100644
(file)
--- a/
templates/print/RB/sales_delivery_order.tex
+++ b/
templates/print/RB/sales_delivery_order.tex
@@
-21,17
+21,33
@@
\begin{minipage}[t]{8cm}
\vspace*{1.0cm}
\begin{minipage}[t]{8cm}
\vspace*{1.0cm}
+ \ifthenelse{\equal{<%shiptoname%>}{}}{ % KEINE ABWEICHENDE LIEFERADRESSE
- <%name%>
+
<%name%>
- <%street%>
+
<%street%>
- ~
+
~
- <%zipcode%> <%city%>
+
<%zipcode%> <%city%>
- <%country%>
+ <%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}}
@@
-118,5
+134,9
@@
\vspace{5mm}
<%end if%>
\vspace{5mm}
<%end if%>
+<%if delivery_term%>
+ \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
\end{document}
\end{document}