X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=sales_quotation.tex;h=64fd84f540aa1e4c4fba90f79de55dc91ad5bfec;hb=ebfcd634a9b7a1a24e6e75659e904a46a3c174a9;hp=80cae0b7a581712abaa44e2186c72168ce31e64f;hpb=c5e0bbdda3970a5d9c8a3d6cd455b3f850be6bc4;p=kivitendo-erp.git

diff --git a/sales_quotation.tex b/sales_quotation.tex
index 80cae0b7a..64fd84f54 100644
--- a/sales_quotation.tex
+++ b/sales_quotation.tex
@@ -17,142 +17,141 @@
 
 \begin{document}
 
-\begin{minipage}[t]{8cm}
-  \scriptsize
-
-  {\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%>
-
-\end{minipage}
-
-<%if shiptoname%>
-  \vspace{0.8cm}
-  \scriptsize \underline{\abweichendeLieferadresse:}\\
-  \normalsize    <%shiptoname%>
-
-                 <%if shiptocontact%> <%shiptocontact%><%end if%>
-
-                 <%shiptodepartment_1%>
+\setkomavar{signature}{
+<%employee_company%>%
+\ifhmode\\\fi
+<%salesman_name%>%
+}
 
-                  <%shiptodepartment_2%>
+\setkomavar{offer}{<%quonumber%>}
+\setkomavar{date}{<%transdate%>}
+\setkomavar{customer}{<%customernumber%>}
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
 
-                  <%shiptostreet%>
+%\begin{minipage}[t]{8cm}
+%  \scriptsize
+%
+%  {\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%>
+%
+%\end{minipage}
+%
+%<%if shiptoname%>
+%  \vspace{0.8cm}
+%  \scriptsize \underline{\abweichendeLieferadresse:}\\
+%  \normalsize    <%shiptoname%>
+%
+%                 <%if shiptocontact%> <%shiptocontact%><%end if%>
+%
+%                 <%shiptodepartment_1%>
+%
+%                  <%shiptodepartment_2%>
+%
+%                  <%shiptostreet%>
+%
+%                  <%shiptozipcode%> <%shiptocity%>
+%<%end if%>
+%\vspace*{1.5cm}
+%
+%\hfill
 
-                  <%shiptozipcode%> <%shiptocity%>
-<%end if%>
-\vspace*{1.5cm}
 
-\hfill
+\begin{letter}{
+  <%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
-\ifthenelse{\equal{<%cp_name%>}{}}{\anrede}{
-  \ifthenelse{\equal{<%cp_gender%>}{f}}
-    {\anredefrau}{\anredeherr} <%cp_title%> <%cp_name%>,}\\
+\opening{
+	\ifstr{<%cp_name%>}{}
+		{\anrede}
+		{
+		\ifstr{<%cp_gender%>}{f}
+			{\anredefrau}
+			{\anredeherr}
+			<%cp_title%> <%cp_name%>,
+		}
+}
+\thispagestyle{kivitendo.letter.first}
 
 \angebotsformel\\
 
-\vspace{0.5cm}
-
-
-%
-% - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
-%   Übertrag machen
-% - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
-%   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
-%   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
-%
-\setlength\LTleft\parindent     % Tabelle beginnt am linken Textrand
-\setlength\LTright{0pt}         % Tabelle endet am rechten Textrand
-\begin{longtable}{@{}rrp{7cm}@{\extracolsep{\fill}}rrr@{}}
-% Tabellenkopf
-\hline
-\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
-\hline\\
-\endhead
-
-% Tabellenkopf erste Seite
-\hline
-\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
-\hline\\[-0.5em]
-\endfirsthead
-
-% Tabellenende
-\\
-\multicolumn{6}{@{}r@{}}{\weiteraufnaechsterseite}
-\endfoot
-
-% Tabellenende letzte Seite
-\hline\\
-\multicolumn{5}{@{}l}{\nettobetrag} & <%subtotal%> \currency\\
-<%foreach tax%>
-\multicolumn{5}{@{}l}{<%taxdescription%>} & <%tax%> \currency\\
-<%end tax%>
-\multicolumn{5}{@{}l}{\textbf{\schlussbetrag}} &  \textbf{<%ordtotal%>} \currency\\
-\hline\hline\\
-\endlastfoot
 
+\begin{PricingTabular}
+	% Tabellenende letzte Seite
+	\midrule
+	\multicolumn{5}{@{}l}{\nettobetrag} & <%subtotal%>\\
+	<%foreach tax%>
+	\multicolumn{5}{@{}l}{<%taxdescription%>} & <%tax%>\\
+	<%end tax%>
+	\multicolumn{5}{@{}l}{\bfseries\schlussbetrag} &  \textbf{<%ordtotal%>}\\
+	\bottomrule
+	\endlastfoot
 % eigentliche Tabelle
 <%foreach number%>
-          <%runningnumber%> &
-          <%number%> &
-          \textbf{<%description%>} &
-          \raggedleft <%qty%> <%unit%> &
-          <%sellprice%> \currency &
-          \ifthenelse{\equal{<%p_discount%>}{0}}{}{\sffamily\scriptsize{(-<%p_discount%> \%)}}
-          \ourfont{<%linetotal%> \currency} \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
-
-          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>
-          <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
-          <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
-          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
-          \\[-0.8em]
+<%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}
 
-\end{longtable}
-
-
-space{5mm}
-        <%notes%>
-        \vspace{5mm}
+<%if notes%>
+  <%notes%>
+  \medskip
 <%end if%>
 
 <%if delivery_term%>
@@ -165,20 +164,18 @@ space{5mm}
 <%end if%>
 \angebotfragen
 
-~\\
 
-\angebotagb \\ \\
+\angebotagb
 
-\gruesse \\ \\ \\
-<%employee_company%>
+\closing{\gruesse}
 
-<%salesman_name%>\\\\
+\begin{minipage}{\textwidth}
+\auftragerteilt\par\bigskip
+\nurort:\rule[-.5ex]{8cm}{.2pt}\ ,\den\ \rule[-.5ex]{5cm}{.2pt}\par\bigskip
 
-\parbox[t]{175mm}{
+\unterschrift/\stempel:\rule[-.5ex]{6cm}{.2pt}
+\end{minipage}
 
-  \auftragerteilt\\\\
-  \nurort:\uline{\hspace*{8cm}}\ ,\den\ \uline{\hspace*{5cm}}\\\\\\\\\\
 
-  \unterschrift / \stempel:\uline{\hspace*{6cm}}
-}
+\end{letter}
 \end{document}