X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fprint%2Fmarei%2Fsales_quotation.tex;h=d6e03c87950ac36eae8432357b21d4259eaa4cdd;hb=fd7bc620f880f83feca6e787f07c26ffde082940;hp=bdd8a0309d212895fffbb4aa98df19d880e8afd4;hpb=4987cdc759332a4226006c34f3b7c78ee031bc62;p=kivitendo-erp.git

diff --git a/templates/print/marei/sales_quotation.tex b/templates/print/marei/sales_quotation.tex
index bdd8a0309..d6e03c879 100644
--- a/templates/print/marei/sales_quotation.tex
+++ b/templates/print/marei/sales_quotation.tex
@@ -19,9 +19,9 @@
 \begin{document}
 
 \setkomavar{signature}{%
-<%employee_company%>%
-\ifhmode\\\fi
-<%salesman_name%>%
+  <%employee_company%>%
+  \ifhmode\\\fi
+  <%salesman_name%>%
 }
 
 \setkomavar*{date}{\datum}
@@ -32,103 +32,104 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
-	\angebot~
-	\nr~<%quonumber%>
+  \angebot~
+  <%quonumber%>%
 }
 
 \setkomavar{transaction}{<%transaction_description%>}
 
-<%if shiptoname%>
+<%if shiptoname%>%
 \makeatletter
-  \begin{lrbox}\shippingAddressBox
+\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%>
- }
+    \backaddr@format{\scriptsize\usekomafont{backaddress}%
+      \strut\abweichendeLieferadresse
+    }
+    \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%>
+<%end if%>%
 
 
 \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
+<%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
+% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
 \opening{
-	\ifstr{<%cp_name%>}{}
-		{\anrede}
-		{
-		\ifstr{<%cp_gender%>}{f}
-			{\anredefrau}
-			{\anredeherr}
-			<%cp_title%> <%cp_name%>,
-		}
-}
+\Ifstr{<%cp_name%>}{}
+{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+  {
+    \Ifstr{<%cp_gender%>}{f}
+        {\anredefrau}
+        {\anredeherr}
+      <%cp_title%> <%cp_name%>,
+    }
+  }
 \thispagestyle{kivitendo.letter.first}
 
 \angebotsformel
 
 
 \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
-	\nettobetrag & <%subtotal%>\\
-	<%foreach tax%>
-	<%taxdescription%> & <%tax%>\\
-	<%end tax%>
-	\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
-	\end{PricingTotal}
+  % 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
+    \nettobetrag & <%subtotal%>\\
+    <%foreach tax%>%
+    <%taxdescription%> & <%tax%>\\
+    <%end tax%>%
+    \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
+  \end{PricingTotal}
 \end{PricingTabular*}
 
-<%if notes%>
-  <%notes%>
-  \medskip
-<%end if%>
+<%if notes%>%
+<%notes%>%
+\medskip
+<%end if%>%
 
-<%if delivery_term%>
-  \lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>
+<%if delivery_term%>%
+\lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>%
 
 \angebotdanke\\
-<%if reqdate%>
+<%if reqdate%>%
 \angebotgueltig~<%reqdate%>.
-<%end if%>
+<%end if%>%
 \angebotfragen
 
 
@@ -137,11 +138,11 @@
 \closing{\gruesse}
 
 \begin{minipage}{\textwidth}
-\rule{\linewidth}{.2pt}\par
-\auftragerteilt\par\bigskip
-\nurort:\rule[-.5ex]{8cm}{.2pt}\ ,\den\ \rule[-.5ex]{5cm}{.2pt}\par\bigskip
+  \rule{\linewidth}{.2pt}\par
+  \auftragerteilt\par\bigskip
+  \nurort:\rule[-.5ex]{8cm}{.2pt}\ ,\den\ \rule[-.5ex]{5cm}{.2pt}\par\bigskip
 
-\unterschrift/\stempel:\rule[-.5ex]{6cm}{.2pt}
+  \unterschrift/\stempel:\rule[-.5ex]{6cm}{.2pt}
 \end{minipage}