From: Marei Peischl <marei@peitex.de>
Date: Thu, 21 Nov 2019 13:17:10 +0000 (+0100)
Subject: location -> komavars
X-Git-Tag: release-3.5.6.1~356
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7108de66008d0bbe6b3cc9e5003b74835a331a4f;p=kivitendo-erp.git

location -> komavars
---

diff --git a/kiviletter.sty b/kiviletter.sty
index fe39c96cb..c05713ddf 100644
--- a/kiviletter.sty
+++ b/kiviletter.sty
@@ -85,6 +85,29 @@ contents={\usebox\shippingAddressBox}
 
 \ExplSyntaxOff
 
+
+\setkomavar{location}{
+	\begin{flushright}
+		\bfseries
+		\LARGE
+		\usekomavar{title}
+%		\angebot
+%		\par
+%		\medskip
+%		\large\nr ~<%quonumber%>
+	\end{flushright}
+
+	\medskip
+	\begin{tabularx}{\linewidth}{@{}l<{:}>{\raggedright\arraybackslash}X@{}}
+		\datum&\usekomavar{date}\\%%<%transdate%>\\
+		\kundennummer&\usekomavar{customer}\\%<%customernumber%>\\
+		\ansprechpartner&\usekomavar{fromname}\\%<%employee_name%>\\
+		\textTelefon&\usekomavar{fromphone}\\%<%employee_tel%>\\
+		\textEmail&\usekomavar{fromemail}\\%<%employee_email%>
+	\end{tabularx}
+}
+
+
 \renewcommand*{\raggedsignature}{\raggedright}
 
 \endinput
diff --git a/sales_quotation.tex b/sales_quotation.tex
index 64fd84f54..ea81db52c 100644
--- a/sales_quotation.tex
+++ b/sales_quotation.tex
@@ -23,12 +23,17 @@
 <%salesman_name%>%
 }
 
-\setkomavar{offer}{<%quonumber%>}
 \setkomavar{date}{<%transdate%>}
 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+	\angebot
+	\par
+	\medskip
+	\large\nr ~<%quonumber%>
+}
 
 %\begin{minipage}[t]{8cm}
 %  \scriptsize