Merge branch 'b-3.6.1' into mebil

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

diff --git a/templates/print/marei/proforma.tex b/templates/print/marei/proforma.tex
index 9545f61..6730a7e 100644 (file)
--- a/templates/print/marei/proforma.tex
+++ b/templates/print/marei/proforma.tex
@@ -17,109 +17,110 @@
 
 
 \begin{document}
-       
+
 \setkomavar{title}{
-       \proformarechnung~
-       \nr ~<%ordnumber%>
+  \proformarechnung~
+  \nr ~<%ordnumber%>%
 }
 \setkomavar*{date}{\datum}
 
 \setkomavar{date}{<%orddate%>}
 \setkomavar{customer}{<%customernumber%>}
-<%if cusordnumber%>
-       \setkomavar*{yourref}{\ihreBestellnummer}
-       \setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>
-<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>
+<%if cusordnumber%>%
+\setkomavar*{yourref}{\ihreBestellnummer}
+\setkomavar{yourref}{<%cusordnumber%>}
+<%end if%>%
+<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{transaction}{<%transaction_description%>}
-       
-<%if shiptoname%>
+
+<%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%>
-       }
+  \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%>%
+  }
 \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
-       }
-
-% Anrede nach Geschlecht unterscheiden
+<%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%>}{}
-               {\anrede}
-               {
-                       \ifstr{<%cp_gender%>}{f}
-                               {\anredefrau}
-                               {\anredeherr}
-                               <%cp_title%> <%cp_name%>,
-                       }
-               }
-               \thispagestyle{kivitendo.letter.first}
+\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}
 
 \auftragsformel
- 
-\begin{PricingTabular*}
-\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%>
-}
-% Tabellenende letzte Seite
-       \begin{PricingTotal}
-       % Tabellenende letzte Seite
-       \nettobetrag & <%subtotal%>\\
-       <%foreach tax%>
-       <%taxdescription%> & <%tax%>\\
-       <%end tax%>
-       \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
-\end{PricingTotal}
+
+\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 <%invtotal%>\\%
+  \end{PricingTotal}%
 \end{PricingTabular*}
 
-<%if notes%>
-<%notes%>
+<%if notes%>%
+<%notes%>%
 \medskip
-<%end if%>
+<%end if%>%
 
-<%if reqdate%>
+<%if reqdate%>%
 \lieferungErfolgtAm ~<%reqdate%>. \\
-<%end if%>
+<%end if%>%
 
 \textit{\auftragpruefen}