X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=sales_quotation.tex;h=bdd8a0309d212895fffbb4aa98df19d880e8afd4;hb=010c8d1e9af797f5223ef083d5653e8aae03fabf;hp=b4632436f520f02c0bafa4a11680f12f0d35f1c7;hpb=20a30dd1c7c4d568f4a7f27df6d8619c09690079;p=kivitendo-erp.git

diff --git a/sales_quotation.tex b/sales_quotation.tex
index b4632436f..bdd8a0309 100644
--- a/sales_quotation.tex
+++ b/sales_quotation.tex
@@ -1,4 +1,5 @@
-\input{inheaders.tex}
+\documentclass[paper=a4,fontsize=10pt]{scrartcl}
+\usepackage{kiviletter}
 
 
 % Variablen, die in settings verwendet werden
@@ -17,84 +18,57 @@
 
 \begin{document}
 
-\setkomavar{signature}{
-<%employee_company%>\ifhmode\\\fi<%salesman_name%>
+\setkomavar{signature}{%
+<%employee_company%>%
+\ifhmode\\\fi
+<%salesman_name%>%
 }
 
-\begin{minipage}[t]{8cm}
-  \scriptsize
+\setkomavar*{date}{\datum}
 
-  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
-  \normalsize
-
-  \vspace*{0.3cm}
-
-  <%name%>
-
-  <%if department_1%><%department_1%><%end if%>
-
-  <%if department_2%><%department_2%><%end if%>
-
-  <%cp_givenname%> <%cp_name%>
-
-  <%street%>
-
-  ~
-
-  <%zipcode%> <%city%>
-
-  <%country%>
-\end{minipage}
-\hfill
-\begin{minipage}[t]{6cm}
-  \hfill{\LARGE\textbf{\angebot}}
-
-  \vspace*{0.2cm}
-
-  \hfill{\large\textbf{\nr ~<%quonumber%>}}
-
-  \vspace*{0.2cm}
-
-  \datum:\hfill <%transdate%>
-
-  \kundennummer:\hfill <%customernumber%>
-
-  \ansprechpartner:\hfill <%employee_name%>
-
-  \textTelefon \hfill <%employee_tel%>
-
-  \textEmail \hfill <%employee_email%>
+\setkomavar{date}{<%transdate%>}
+\setkomavar{customer}{<%customernumber%>}
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+	\angebot~
+	\nr~<%quonumber%>
+}
 
-\end{minipage}
+\setkomavar{transaction}{<%transaction_description%>}
 
 <%if shiptoname%>
-  \vspace{0.8cm}
-  \scriptsize \underline{\abweichendeLieferadresse:}\\
-  \normalsize    <%shiptoname%>
-
-                 <%if shiptocontact%> <%shiptocontact%><%end if%>
-
-                 <%shiptodepartment_1%>
-
-                  <%shiptodepartment_2%>
-
-                  <%shiptostreet%>
-
-                  <%shiptozipcode%> <%shiptocity%>
+\makeatletter
+  \begin{lrbox}\shippingAddressBox
+  \parbox{\useplength{toaddrwidth}}{
+	\backaddr@format{\scriptsize\usekomafont{backaddress}%
+		\strut abweichende Lieferadresse
+	}
+	\par\smallskip
+	\setlength{\parskip}{\z@}
+	\par
+	\normalsize
+	<%shiptoname%>\par
+        <%if shiptocontact%> <%shiptocontact%><%end if%>\par
+	<%shiptodepartment_1%>\par
+	<%shiptodepartment_2%>\par
+	<%shiptostreet%>\par
+	<%shiptozipcode%> <%shiptocity%>
+ }
+\end{lrbox}
+\makeatother
 <%end if%>
-\vspace*{1.5cm}
-
-\hfill
 
 
 \begin{letter}{
-  <%name%>\\
-  <%if department_1%><%department_1%><%end if%>\\
-  <%if department_2%><%department_2%><%end if%>\\
-  <%cp_givenname%> <%cp_name%>\\
-  <%street%>\\
-  <%zipcode%> <%city%>\\
-  <%country%>
+  <%name%>\strut\\
+  <%if department_1%><%department_1%>\\<%end if%>
+  <%if department_2%><%department_2%>\\<%end if%>
+  <%cp_givenname%> <%cp_name%>\strut\\
+  <%street%>\strut\\
+  <%zipcode%> <%city%>\strut\\
+  <%country%> \strut
 }
 
 % Anrede nach Geschlecht unterscheiden
@@ -110,35 +84,37 @@
 }
 \thispagestyle{kivitendo.letter.first}
 
-\angebotsformel\\
+\angebotsformel
 
 
-\begin{PricingTabular}
+\begin{PricingTabular*}
+% eigentliche Tabelle
+\FakeTable{
+<%foreach number%>%
+<%runningnumber%> &%
+<%number%> &%
+\textbf{<%description%>}%
+	<%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+	<%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
+	<%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+	<%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+	<%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+	&%
+	<%qty%> <%unit%> &%
+	<%sellprice%>&%
+	\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
+			<%linetotal%>\tabularnewline
+<%end number%>
+}
+	\begin{PricingTotal}
 	% Tabellenende letzte Seite
-	\midrule
-	\multicolumn{5}{@{}l}{\nettobetrag} & <%subtotal%>\\
+	\nettobetrag & <%subtotal%>\\
 	<%foreach tax%>
-	\multicolumn{5}{@{}l}{<%taxdescription%>} & <%tax%>\\
+	<%taxdescription%> & <%tax%>\\
 	<%end tax%>
-	\multicolumn{5}{@{}l}{\bfseries\schlussbetrag} &  \textbf{<%ordtotal%>}\\
-	\bottomrule
-	\endlastfoot
-% eigentliche Tabelle
-<%foreach number%>
-<%runningnumber%> &
-<%number%> &
-\textbf{<%description%>}
-	<%if longdescription%> \newline\scriptsize <%longdescription%><%end longdescription%>
-	<%if serialnumber%> \newline\scriptsize \seriennummer: <%serialnumber%><%end serialnumber%>
-	<%if ean%> \newline\scriptsize \ean: <%ean%><%end ean%>
-	<%if projectnumber%>\newline\scriptsize \projektnummer: <%projectnumber%><%end projectnumber%>
-	&
-	<%qty%> <%unit%> &
-	<%sellprice%>&
-	\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}
-			<%linetotal%>\\
-<%end number%>
-\end{PricingTabular}
+	\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
+	\end{PricingTotal}
+\end{PricingTabular*}
 
 <%if notes%>
   <%notes%>
@@ -161,6 +137,7 @@
 \closing{\gruesse}
 
 \begin{minipage}{\textwidth}
+\rule{\linewidth}{.2pt}\par
 \auftragerteilt\par\bigskip
 \nurort:\rule[-.5ex]{8cm}{.2pt}\ ,\den\ \rule[-.5ex]{5cm}{.2pt}\par\bigskip