From: Bernd Bleßmann Date: Fri, 6 Dec 2013 14:34:57 +0000 (+0100) Subject: Lieferbedingungen in R&B-Vorlagensatz aufgenommen. X-Git-Tag: release-3.1.0beta1~22^2~102^2^2~4 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=de43e13499661a6b2032926392686943c2cbdfd2;p=kivitendo-erp.git Lieferbedingungen in R&B-Vorlagensatz aufgenommen. --- diff --git a/templates/print/RB/deutsch.tex b/templates/print/RB/deutsch.tex index 942702093..75bee25b4 100644 --- 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 efed0a7d8..281238961 100644 --- 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 097f90da5..9959c452f 100644 --- 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 5f4a674e4..09833b88e 100644 --- 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 e1a737ab2..bd820eed6 100644 --- 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 ceb554b5c..5e0268272 100644 --- 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 690fd137f..2f18eef27 100644 --- 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 0e15a1aae..b86f1594d 100644 --- 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 277eb0761..8ef6b5ba7 100644 --- 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%>.