Lieferbedingungen in R&B-Vorlagensatz aufgenommen.

diff --git a/templates/print/RB/deutsch.tex b/templates/print/RB/deutsch.tex
index 94270209393b8c2932cb35d09d171d7e80618a0b..75bee25b483aab7388c39ebc84a594b5b5f09945 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 efed0a7d8f2ead1fd218c6a86bafeaa54dafb0b6..2812389610b0f89c58e005ef2de2d12cc5c35841 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 097f90da5d9104fe6515786dad356697d5ce0bd4..9959c452f53b86f3ce67f746fb750035362678c2 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 5f4a674e4cbca0aaef724e95df93dc8f832822e1..09833b88e7b91b37856d1752db00909855f9a942 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 e1a737ab25b00c53ddad882826a0a3d0d5b989c8..bd820eed677a66f3f9dc139c40aa8fc3704392f8 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 ceb554b5cd3af195ac46642da76960e0a19d804a..5e0268272bf357592f49c87227581c3879f3e5e6 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 690fd137f1e46e7fcc22c31b3b76f69a40c8cb84..2f18eef274aa442ad53f68ba31bbd591057838c2 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 0e15a1aae4386c4e86ec069b977be72bc5836542..b86f1594d6cf938337a020b74bfce8aa30623e3c 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 277eb076192f36883a106313a9ffe4e60e5a4e2b..8ef6b5ba7b984fa068b3e7d13cee72fc50aeb5f8 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%>.