new structure to sales_delivery_order.tex

[kivitendo-erp.git] / sales_quotation.tex

diff --git a/sales_quotation.tex b/sales_quotation.tex
index 2cebc5d..bdd8a03 100644 (file)
--- a/sales_quotation.tex
+++ b/sales_quotation.tex
@@ -1,5 +1,5 @@
-\PassOptionsToPackage{faketable}{kiviletter}
-\input{inheaders.tex}
+\documentclass[paper=a4,fontsize=10pt]{scrartcl}
+\usepackage{kiviletter}
 
 
 % Variablen, die in settings verwendet werden
@@ -24,82 +24,41 @@
 <%salesman_name%>%
 }
 
+\setkomavar*{date}{\datum}
+
 \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%>
+       \angebot~
+       \nr~<%quonumber%>
 }
 
-%\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
+\setkomavar{transaction}{<%transaction_description%>}
+
+<%if shiptoname%>
+\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%>
 
 
 \begin{letter}{
@@ -136,6 +95,7 @@
 <%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%>%
@@ -150,7 +110,7 @@
        % Tabellenende letzte Seite
        \nettobetrag & <%subtotal%>\\
        <%foreach tax%>
-       %taxdescription%> & <%tax%>\\
+       <%taxdescription%> & <%tax%>\\
        <%end tax%>
        \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
        \end{PricingTotal}