Lieferbedingungen in R&B-Vorlagensatz aufgenommen.

diff --git a/templates/print/RB/deutsch.tex b/templates/print/RB/deutsch.tex
index 9427020..75bee25 100644 (file)
--- a/templates/print/RB/deutsch.tex
+++ b/templates/print/RB/deutsch.tex
@@ -40,6 +40,7 @@
 \newcommand{\weiteraufnaechsterseite} {weiter auf der nächsten Seite ...}
 
 \newcommand{\zahlung} {Zahlungsbedingungen:}
+\newcommand{\lieferung} {Lieferbedingungen:}
 \newcommand{\textTelefon} {Tel.:}
 \newcommand{\textFax} {Fax:}
 

diff --git a/templates/print/RB/english.tex b/templates/print/RB/english.tex
index efed0a7..2812389 100644 (file)
--- a/templates/print/RB/english.tex
+++ b/templates/print/RB/english.tex
@@ -39,6 +39,7 @@
 \newcommand{\weiteraufnaechsterseite} {to be continued on next page  ..}
 
 \newcommand{\zahlung} {Payment terms:}
+\newcommand{\lieferung} {Delivery terms:}
 \newcommand{\textTelefon} {Tel.:}
 \newcommand{\textFax} {Fax:}
 

diff --git a/templates/print/RB/invoice.tex b/templates/print/RB/invoice.tex
index 097f90d..9959c45 100644 (file)
--- a/templates/print/RB/invoice.tex
+++ b/templates/print/RB/invoice.tex
@@ -147,6 +147,10 @@
   \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}}

diff --git a/templates/print/RB/purchase_delivery_order.tex b/templates/print/RB/purchase_delivery_order.tex
index 5f4a674..09833b8 100644 (file)
--- a/templates/print/RB/purchase_delivery_order.tex
+++ b/templates/print/RB/purchase_delivery_order.tex
@@ -106,5 +106,9 @@
         \vspace{5mm}
 <%end if%>
 
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
 \end{document}
 

diff --git a/templates/print/RB/purchase_order.tex b/templates/print/RB/purchase_order.tex
index e1a737a..bd820ee 100644 (file)
--- a/templates/print/RB/purchase_order.tex
+++ b/templates/print/RB/purchase_order.tex
@@ -134,6 +134,10 @@
         \vspace{5mm}
 <%end if%>
 
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
 \gruesse \\ \\ \\
   <%employee_name%>
 

diff --git a/templates/print/RB/request_quotation.tex b/templates/print/RB/request_quotation.tex
index ceb554b..5e02682 100644 (file)
--- a/templates/print/RB/request_quotation.tex
+++ b/templates/print/RB/request_quotation.tex
@@ -116,6 +116,10 @@
         \vspace{5mm}
 <%end if%>
 
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
 <%if reqdate%>
 \anfrageBenoetigtBis~<%reqdate%>.
 <%end if%>

diff --git a/templates/print/RB/sales_delivery_order.tex b/templates/print/RB/sales_delivery_order.tex
index 690fd13..2f18eef 100644 (file)
--- a/templates/print/RB/sales_delivery_order.tex
+++ b/templates/print/RB/sales_delivery_order.tex
@@ -118,5 +118,9 @@
         \vspace{5mm}
 <%end if%>
 
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
 \end{document}
 

diff --git a/templates/print/RB/sales_order.tex b/templates/print/RB/sales_order.tex
index 0e15a1a..b86f159 100644 (file)
--- a/templates/print/RB/sales_order.tex
+++ b/templates/print/RB/sales_order.tex
@@ -136,6 +136,10 @@
         \vspace{5mm}
 <%end if%>
 
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
 <%if reqdate%>
 \lieferungErfolgtAm ~<%reqdate%>. \\
 <%end if%>

diff --git a/templates/print/RB/sales_quotation.tex b/templates/print/RB/sales_quotation.tex
index 277eb07..8ef6b5b 100644 (file)
--- a/templates/print/RB/sales_quotation.tex
+++ b/templates/print/RB/sales_quotation.tex
@@ -132,6 +132,10 @@
         \vspace{5mm}
 <%end if%>
 
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
 \angebotdanke\\
 <%if reqdate%>
 \angebotgueltig~<%reqdate%>.