Merge branch 'b-3.6.1' into mebil

[kivitendo-erp.git] / templates / print / marei / sales_quotation.tex

diff --git a/templates/print/marei/sales_quotation.tex b/templates/print/marei/sales_quotation.tex
index 0190046..d6e03c8 100644 (file)
--- 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,98 +32,98 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
-       \angebot~
-       <%quonumber%>%
+  \angebot~
+  <%quonumber%>%
 }
 
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if shiptoname%>%
 \makeatletter
-  \begin{lrbox}\shippingAddressBox
+\begin{lrbox}\shippingAddressBox
   \parbox{\useplength{toaddrwidth}}{
-       \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%>%
- }
+    \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%>%
 
 
 \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
 }
 
 % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
 % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
 \opening{
-       \Ifstr{<%cp_name%>}{}
-               {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-               {
-               \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
+<%notes%>%
+\medskip
 <%end if%>%
 
 <%if delivery_term%>%
-  \lieferung ~<%delivery_term.description_long%>\\
+\lieferung ~<%delivery_term.description_long%>\\
 <%end delivery_term%>%
 
 \angebotdanke\\
@@ -138,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}