marei: adjust indentation using latexindent according to kivitendo regulations 2...

diff --git a/templates/print/marei/bin_list.tex b/templates/print/marei/bin_list.tex
index 69a4e8a53e1eafa16a0062aea417110f0f8bfbe0..7907ebe22e06100834f512bb498b2348c01f29ba 100644 (file)
--- a/templates/print/marei/bin_list.tex
+++ b/templates/print/marei/bin_list.tex
@@ -13,57 +13,57 @@
 \setkomavar{title}{\lagerliste}
 
 \setkomavar{firsthead}{
 \setkomavar{title}{\lagerliste}
 
 \setkomavar{firsthead}{

-       \normalsize
-       \noindent\begin{tabular}[t]{@{}l@{}}
-               <%company%>\strut\\
-               <%address%>
-       \end{tabular}
-       \hfill
- \begin{tabular}[t]{rr@{}}
-               Tel & <%tel%>\\
-               Fax & <%fax%>%
-       \end{tabular}
-       \rule{\linewidth}{\heavyrulewidth}
+  \normalsize
+  \noindent\begin{tabular}[t]{@{}l@{}}
+    <%company%>\strut\\
+    <%address%>
+  \end{tabular}
+  \hfill
+  \begin{tabular}[t]{rr@{}}
+    Tel & < %tel%>\\
+    Fax & < %fax%>%
+  \end{tabular}
+  \rule{\linewidth}{\heavyrulewidth}

 }
 
 \makeatletter
 \setkomavar{location}{
 }
 
 \makeatletter
 \setkomavar{location}{

-               \backaddr@format{\scriptsize\usekomafont{backaddress}%
-                       \strut\lieferanschrift
-               }
-               \par\medskip\setlength{\parskip}{\z@}
-               \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\lieferanschrift
+  }
+  \par\medskip\setlength{\parskip}{\z@}
+  \normalsize
+  <%shiptoname%>\par
+  <%if shiptocontact%> <%shiptocontact%><%end if%>\par
+  <%shiptodepartment_1%>\par
+  <%shiptodepartment_2%>\par
+  <%shiptostreet%>\par
+  <%shiptozipcode%> <%shiptocity%>%
+}

 \makeatother
 
 \begin{letter}{
 \makeatother
 
 \begin{letter}{

-               <%name%>\ifhmode\\\fi
-               <%street%>\ifhmode\\\fi
-               <%zipcode%> <%city%>\ifhmode\\\fi
-               <%country%>
-       }
+<%name%>\ifhmode\\\fi
+<%street%>\ifhmode\\\fi
+<%zipcode%> <%city%>\ifhmode\\\fi
+<%country%>
+}

 
 \opening{}
 
 \begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
 
 \opening{}
 
 \begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt

-  <%if warehouse%>%
-  &\bfseries\lager%
-  <%end warehouse%>%
-  &\bfseries\lagerplatz&\bfseries\lieferungMit}]
+        <%if warehouse%>%
+        &\bfseries\lager%
+        <%end warehouse%>%
+        &\bfseries\lagerplatz&\bfseries\lieferungMit}]

 
   <%ordnumber%>%
   &%
   <%if shippingdate%>%
 
   <%ordnumber%>%
   &%
   <%if shippingdate%>%

-       <%shippingdate%>%
+  <%shippingdate%>%

   <%end shippingdate%>%
   <%if not shippingdate%>%
   <%end shippingdate%>%
   <%if not shippingdate%>%

-       <%orddate%>%
+  <%orddate%>%

   <%end shippingdate%>%
   & <%employee%>%
   <%if warehouse%>%
   <%end shippingdate%>%
   & <%employee%>%
   <%if warehouse%>%


@@ -75,10 +75,10 @@
 \bigskip
 
 \begin{SimpleTabular}[colspec=rlXllrrll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\seriennummer & &\bfseries\menge&\bfseries\erh&&\bfseries\lagerplatz}]
 \bigskip
 
 \begin{SimpleTabular}[colspec=rlXllrrll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\seriennummer & &\bfseries\menge&\bfseries\erh&&\bfseries\lagerplatz}]

-<%foreach number%>%
+  <%foreach number%>%

   <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
   <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
   <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
   <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\

-<%end number%>%
+  <%end number%>%

 \end{SimpleTabular}
 
 \end{letter}
 \end{SimpleTabular}
 
 \end{letter}

diff --git a/templates/print/marei/check.tex b/templates/print/marei/check.tex
index 2725140977c785aa00638e5c7a499b16dd2a761b..2d55cbde0167a51a90dd16a0e8c6c60ad9607e05 100644 (file)
--- a/templates/print/marei/check.tex
+++ b/templates/print/marei/check.tex
@@ -31,11 +31,11 @@
 \begin{document}
 
 \begin{letter}{
 \begin{document}
 
 \begin{letter}{

-               <%name%>\ifhmode\\\fi
-               <%street%>\ifhmode\\\fi
-               <%zipcode%> <%city%>\ifhmode\\\fi
-               <%country%>%
-       }
+<%name%>\ifhmode\\\fi
+<%street%>\ifhmode\\\fi
+<%zipcode%> <%city%>\ifhmode\\\fi
+<%country%>%
+}

 
 \opening{<%company%>}
 \pagestyle{empty}
 
 \opening{<%company%>}
 \pagestyle{empty}


@@ -43,9 +43,9 @@
 <%name%> \hfill <%datepaid%> \hfill <%source%>%
 
 \begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]
 <%name%> \hfill <%datepaid%> \hfill <%source%>%
 
 \begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]

-<%foreach invnumber%>%
-<%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
-<%end invnumber%>%
+  <%foreach invnumber%>%
+  <%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
+  <%end invnumber%>%

 \end{SimpleTabular}
 
 \end{letter}
 \end{SimpleTabular}
 
 \end{letter}

diff --git a/templates/print/marei/credit_note.tex b/templates/print/marei/credit_note.tex
index 8c05c10fd3675bf25dd8ed920b59f52b51b9e421..aadd3ab135aaa446568297d6f3f134810ea19427 100644 (file)
--- a/templates/print/marei/credit_note.tex
+++ b/templates/print/marei/credit_note.tex
@@ -58,58 +58,58 @@
 \begin{document}
 
 \begin{letter}{
 \begin{document}
 
 \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{
 
 % 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}
 
 
 \gutschriftformel
 
 \begin{PricingTabular*}%
 \thispagestyle{kivitendo.letter.first}
 
 
 \gutschriftformel
 
 \begin{PricingTabular*}%

-% eigentliche Tabelle%
-\FakeTable{%
-       <%foreach number%>%
-               <%runningnumber%> &%
-               <%number%> &%
-               \textbf{<%description%>}%
-               <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-               <%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 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%>%
 \end{PricingTabular*}
 
 <%if notes%>%

diff --git a/templates/print/marei/ic_supply.tex b/templates/print/marei/ic_supply.tex
index b2dd261843015831f69e1e685a88a6f3a0d0291f..6539b115bef85c74b65e157522bf9339166a6491 100644 (file)
--- a/templates/print/marei/ic_supply.tex
+++ b/templates/print/marei/ic_supply.tex
@@ -23,7 +23,7 @@ in einen anderen EU-Mitgliedstaat (Gelangensbestätigung)
 \vspace{0.4cm}
 
 {\color{purple} Bitte unterschreiben und faxen/mailen an:
 \vspace{0.4cm}
 
 {\color{purple} Bitte unterschreiben und faxen/mailen an:

-  \begin{center} <%employee_fax%> / <%employee_email%> \end{center}}
+\begin{center} <%employee_fax%> / <%employee_email%> \end{center}}

 \normalsize
 \vspace{0.4cm}
 <%name%>, <%street%>, <%zipcode%> <%city%>, <%country%>\hspace*{\fill}\\
 \normalsize
 \vspace{0.4cm}
 <%name%>, <%street%>, <%zipcode%> <%city%>, <%country%>\hspace*{\fill}\\


@@ -45,7 +45,7 @@ innergemeinschaftlichen Lieferung\\
 im\\
 
 \uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\
 im\\
 
 \uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\

-{\color{gray}(Monat und Jahr des Erhalts des Liefergegenstands im Mitgliedstaat, in den der Liefergegenstand gelangt ist, wenn der liefernde Unternehmer den Liefergegenstand befördert oder versendet hat oder wenn der Abnehmer den Liefergegenstand versendet hat)}\\
+  {\color{gray}(Monat und Jahr des Erhalts des Liefergegenstands im Mitgliedstaat, in den der Liefergegenstand gelangt ist, wenn der liefernde Unternehmer den Liefergegenstand befördert oder versendet hat oder wenn der Abnehmer den Liefergegenstand versendet hat)}\\

 
 
 \TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
 
 
 \TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\


@@ -55,7 +55,7 @@ in / nach \textsuperscript{1)}\\
 
 
 \uline{<%country%>\hspace*{\fill}}\\
 
 
 \uline{<%country%>\hspace*{\fill}}\\

-{\color{gray}(Mitgliedstaat und Ort, wohin der Liefergegenstand im Rahmen einer Beförderung oder Versendung gelangt ist)}\\
+  {\color{gray}(Mitgliedstaat und Ort, wohin der Liefergegenstand im Rahmen einer Beförderung oder Versendung gelangt ist)}\\

 
 erhalten habe / gelangt ist.
 
 
 erhalten habe / gelangt ist.
 

diff --git a/templates/print/marei/ic_supply_EN.tex b/templates/print/marei/ic_supply_EN.tex
index 6bda09020f29d22cefd5260b6a1a017ac5d0544c..5f9516c6886c8a176e0cc9d16bd4271f2187fbff 100644 (file)
--- a/templates/print/marei/ic_supply_EN.tex
+++ b/templates/print/marei/ic_supply_EN.tex
@@ -23,7 +23,7 @@ Certification of the entry of the object of an intra-Community supply into anoth
 \vspace{0.4cm}
 
 {\color{purple} Please sign below and send back to fax-number/mail-address:
 \vspace{0.4cm}
 
 {\color{purple} Please sign below and send back to fax-number/mail-address:

-  \begin{center} <%employee_fax%> / <%employee_email%> \end{center}}
+\begin{center} <%employee_fax%> / <%employee_email%> \end{center}}

 
 \normalsize
 \vspace{0.4cm}
 
 \normalsize
 \vspace{0.4cm}


@@ -44,7 +44,7 @@ I as the customer hereby certify my receipt / the entry \textsuperscript{1)} of
 in\\
 
 \uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\
 in\\
 
 \uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\

-{\color{gray}(Month and year the object of the supply was received in the Member State of entry if the supplying trader transported or dispatched the object of the supply or if the customer dispatched the object of the supply)}\\
+  {\color{gray}(Month and year the object of the supply was received in the Member State of entry if the supplying trader transported or dispatched the object of the supply or if the customer dispatched the object of the supply)}\\

 
 \TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
 {\color{gray}(Month and year the transportation ended if the customer transported the object of the supply himself or herself)}\\
 
 \TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
 {\color{gray}(Month and year the transportation ended if the customer transported the object of the supply himself or herself)}\\


@@ -52,7 +52,7 @@ in\\
 in / at \textsuperscript{1)}\\
 
 \uline{<%country%>\hspace*{\fill}}\\
 in / at \textsuperscript{1)}\\
 
 \uline{<%country%>\hspace*{\fill}}\\

-{\color{gray}(Member State and place of entry as part of the transport or dispatch of the object)}\\
+  {\color{gray}(Member State and place of entry as part of the transport or dispatch of the object)}\\

 
 
 % X\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
 
 
 % X\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\

diff --git a/templates/print/marei/insettings.tex b/templates/print/marei/insettings.tex
index 5cfc860ffdea46a64bc43fc320242f1b1240061c..6cc8add0e6819af941a4927c75cee289e3580d4b 100644 (file)
--- a/templates/print/marei/insettings.tex
+++ b/templates/print/marei/insettings.tex
@@ -6,11 +6,11 @@
 
 \makeatletter
 \Ifstr{\lxlangcode}{EN}{
 
 \makeatletter
 \Ifstr{\lxlangcode}{EN}{

-       \main@language{english}
-       \input{english.tex}}{
-       \Ifstr{\lxlangcode}{DE}{
-               \main@language{ngerman}
-               \input{deutsch.tex}}{\input{deutsch.tex}}
+  \main@language{english}
+  \input{english.tex}}{
+  \Ifstr{\lxlangcode}{DE}{
+    \main@language{ngerman}
+    \input{deutsch.tex}}{\input{deutsch.tex}}

 } % Ende EN
 
 % Mandanten-/Firmenabhängigkeiten
 } % Ende EN
 
 % Mandanten-/Firmenabhängigkeiten


@@ -37,15 +37,15 @@
 % \identpath/<euro/chf/usd/default>_account.tex
 
 \@ifundefined{lxcurrency}{}{
 % \identpath/<euro/chf/usd/default>_account.tex
 
 \@ifundefined{lxcurrency}{}{

-       \setupCurrencyConfig{\identpath}{\lxcurrency}
+  \setupCurrencyConfig{\identpath}{\lxcurrency}

 }
 
 
 % Befehl f. normale Schriftart und -größe
 
 \KOMAoptions{
 }
 
 
 % Befehl f. normale Schriftart und -größe
 
 \KOMAoptions{

-       fontsize=10pt,
-       parskip=half-,% Absatzkennzeichnung durch Abstand statt Einzug
+  fontsize=10pt,
+  parskip=half-,% Absatzkennzeichnung durch Abstand statt Einzug

 }
 % Hier ist es auch möglich zusätzliche Schriftarten zu laden.
 % 
 }
 % Hier ist es auch möglich zusätzliche Schriftarten zu laden.
 % 


@@ -76,15 +76,15 @@
 % % \ifoot{<inhalt innen/links>}\cfoot{<inhalt zentriert>}\ofoot{<inhalt außen/rechts>}
 % dann sollte jedoch darauf geachtet werden, dass das Makro in den einzelnen Vorlagen aufgerufen wird und daher definiert sein sollte. 
 \newcommand{\ourhead}[5] {
 % % \ifoot{<inhalt innen/links>}\cfoot{<inhalt zentriert>}\ofoot{<inhalt außen/rechts>}
 % dann sollte jedoch darauf geachtet werden, dass das Makro in den einzelnen Vorlagen aufgerufen wird und daher definiert sein sollte. 
 \newcommand{\ourhead}[5] {

-       \chead{
-         \makebox[\textwidth]{
-         \Ifstr{#1}{}{}{#1: #2 \hspace{0.7cm}}
-         #3
-         \Ifstr{#4}{}{}{~\nr: #4}
-         \Ifstr{#5}{}{}{\vom ~ #5}
-         \hspace{0.7cm} - \seite ~ \thepage/\letterlastpage  ~-%
-         }
-       }
+  \chead{
+    \makebox[\textwidth]{
+      \Ifstr{#1}{}{}{#1: #2 \hspace{0.7cm}}
+      #3
+      \Ifstr{#4}{}{}{~\nr: #4}
+      \Ifstr{#5}{}{}{\vom ~ #5}
+      \hspace{0.7cm} - \seite ~ \thepage/\letterlastpage  ~-%
+    }
+  }

 }
 
 %Ende Anpassungen der Kopfzeile
 }
 
 %Ende Anpassungen der Kopfzeile


@@ -100,32 +100,32 @@
 %Box generieren, um die Höhe des Fußes zu kennen, damit ist eine automatische Anpassung des unteren Randes möglich
 \if@kivi@footer
 
 %Box generieren, um die Höhe des Fußes zu kennen, damit ist eine automatische Anpassung des unteren Randes möglich
 \if@kivi@footer
 

-\newsavebox\footerbox
-\begin{lrbox}\footerbox
-       \usekomafont{pagefoot}%
-       % Anfang des eigentlichen Inhaltes der Fußzeile
-     \begin{tabular*}{\textwidth}[t]{@{\extracolsep{\fill}}p{.25\linewidth}p{.25\linewidth}r@{\extracolsep{0pt}\hspace{2\tabcolsep}}l@{}}%
-       \firma                 & \email              & \textKontonummer                  & \kontonummer \\
-       \strasse               & \homepage           & \textBank                         & \bank \\
-       \ort                   & \textUstid\ \ustid  & \textIban                         & \iban \\
-       \textTelefon~\telefon  & \finanzamt          & \textBic                          & \bic \\
-       \Ifstr{\fax}{}{}{\textFax~\fax} &                        &\textBankleitzahl                      & \bankleitzahl
-       \end{tabular*}
-       % Ende des Fußzeileninhaltes.
-\end{lrbox}
-
-%Box in den Fuß eintragen, durch die zusätzliche Angabe in der eckigen Klammer, wird die Fußzeile auch auf der ersten Seite verwendet, falls für die erste Seite eine unterschiedliche Fußzeile verwendet werden soll, ist es möglich den obigen Mechanismus mit einem anderen Makronamen als footerbox zu kopieren
-\cfoot[\usebox\footerbox]{\usebox\footerbox}
-
-%Fußhöhe auf Höhe der Box
-%Automatische Anpassung des unteren Randes
-\setlength{\footheight}{\dimexpr\ht\footerbox+\dp\footerbox}
-\setlength{\footskip}{\dimexpr\footheight+\baselineskip}
-\geometry{
-       includefoot,
-%      bottom=1cm,% Falls der untere Rand kleiner sein soll, als die Seitenränder.
-%      Weitere Anpassungen der Ränder sind hier ebenfalls möglich
-}
+  \newsavebox\footerbox
+  \begin{lrbox}\footerbox
+    \usekomafont{pagefoot}%
+    % Anfang des eigentlichen Inhaltes der Fußzeile
+    \begin{tabular*}{\textwidth}[t]{@{\extracolsep{\fill}}p{.25\linewidth}p{.25\linewidth}r@{\extracolsep{0pt}\hspace{2\tabcolsep}}l@{}}%
+      \firma                 & \email              & \textKontonummer                   & \kontonummer \\
+      \strasse               & \homepage           & \textBank                  & \bank \\
+      \ort                   & \textUstid\ \ustid  & \textIban                  & \iban \\
+      \textTelefon~\telefon  & \finanzamt          & \textBic                   & \bic \\
+      \Ifstr{\fax}{}{}{\textFax~\fax} &                         &\textBankleitzahl                      & \bankleitzahl
+    \end{tabular*}
+    % Ende des Fußzeileninhaltes.
+  \end{lrbox}
+
+  %Box in den Fuß eintragen, durch die zusätzliche Angabe in der eckigen Klammer, wird die Fußzeile auch auf der ersten Seite verwendet, falls für die erste Seite eine unterschiedliche Fußzeile verwendet werden soll, ist es möglich den obigen Mechanismus mit einem anderen Makronamen als footerbox zu kopieren
+  \cfoot[\usebox\footerbox]{\usebox\footerbox}
+
+  %Fußhöhe auf Höhe der Box
+  %Automatische Anpassung des unteren Randes
+  \setlength{\footheight}{\dimexpr\ht\footerbox+\dp\footerbox}
+  \setlength{\footskip}{\dimexpr\footheight+\baselineskip}
+  \geometry{
+    includefoot,
+    %  bottom=1cm,% Falls der untere Rand kleiner sein soll, als die Seitenränder.
+    %  Weitere Anpassungen der Ränder sind hier ebenfalls möglich
+  }

 
 \fi
 % Ende Anpassungen der Fußzeile
 
 \fi
 % Ende Anpassungen der Fußzeile

diff --git a/templates/print/marei/invoice.tex b/templates/print/marei/invoice.tex
index 3e36ab1b5cd104ada6a7340075ab6a7b8a7b65e7..b434e0b9400a7407da874f50b2b184ccf9744d6f 100644 (file)
--- a/templates/print/marei/invoice.tex
+++ b/templates/print/marei/invoice.tex
@@ -65,32 +65,32 @@
 \begin{document}
 
 \begin{letter}{
 \begin{document}
 
 \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{
 
 % 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}
 
 <%if notes%>%
 \thispagestyle{kivitendo.letter.first}
 
 <%if notes%>%

-        <%notes%>%
-        \vspace{0.5cm}
+<%notes%>%
+\vspace{0.5cm}

 <%end if%>%
 
 
 <%end if%>%
 
 


@@ -108,57 +108,57 @@
 % amount = 1cm, % Setzt die Breite der Mengenspalte auf 1cm
 % desc/header = Artikelbeschreibung, %Ändert die Überschrift der Bezeichnunsspalte in „Artikelbeschreibung”
 \begin{PricingTabular*}%
 % amount = 1cm, % Setzt die Breite der Mengenspalte auf 1cm
 % desc/header = Artikelbeschreibung, %Ändert die Überschrift der Bezeichnunsspalte in „Artikelbeschreibung”
 \begin{PricingTabular*}%

-       % eigentliche Tabelle
-       \FakeTable{%
-       <%foreach number%>%
-               <%runningnumber%> &%
-               <%number%> &%
-               \textbf{<%description%>}%
-               <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-               <%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}%
+  % eigentliche Tabelle
+  \FakeTable{%
+  <%foreach number%>%
+  <%runningnumber%> &%
+  <%number%> &%
+  \textbf{<%description%>}%
+  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+  <%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*}
 
 \vspace{0.2cm}
 
 \Ifstr{<%deliverydate%>}{}{}{%
 \end{PricingTabular*}
 
 \vspace{0.2cm}
 
 \Ifstr{<%deliverydate%>}{}{}{%

-       \leistungsdatumGleichRechnungsdatum%
+  \leistungsdatumGleichRechnungsdatum%

 }{
 }{

-       \lieferungErfolgtAm ~<%deliverydate%>.
+  \lieferungErfolgtAm ~<%deliverydate%>.

 }\\
 
 <%if payment_terms%>%
 }\\
 
 <%if payment_terms%>%

-  \zahlung ~<%payment_terms%>\\
+\zahlung ~<%payment_terms%>\\

 <%end payment_terms%>%
 
 <%if delivery_term%>%
 <%end payment_terms%>%
 
 <%if delivery_term%>%

-  \lieferung ~<%delivery_term.description_long%>\\
+\lieferung ~<%delivery_term.description_long%>\\

 <%end delivery_term%>%
 
 <%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>%
 
 \ifnum<%taxzone_id%>=1
 <%end delivery_term%>%
 
 <%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>%
 
 \ifnum<%taxzone_id%>=1

-    \steuerfreiEU\\  % EU mit USt-ID Nummer
+\steuerfreiEU\\  % EU mit USt-ID Nummer

 \else
 \else

-       \ifnum<%taxzone_id%>=3
-    \steuerfreiAUS\\  % Außerhalb EU
-    \fi
+\ifnum<%taxzone_id%>=3
+\steuerfreiAUS\\  % Außerhalb EU
+\fi

 \fi
 
 \closing{\gruesse}
 \fi
 
 \closing{\gruesse}

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index a66bb64763740de7a48104c60431b210bdbbc539..053e639b2e22788ab61e0991dee8a77ef41804ab 100644 (file)
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -21,14 +21,14 @@
 \KOMAoptions{fontsize=12pt}
 % Schriftart, Eingabelayout der Tastatur
 \ifPDFTeX
 \KOMAoptions{fontsize=12pt}
 % Schriftart, Eingabelayout der Tastatur
 \ifPDFTeX

-       \RequirePackage[utf8]{inputenc}% Nur notwendig, wenn Basis älter als TL2018
-       \RequirePackage[T1]{fontenc}
-       \RequirePackage{lmodern}
+  \RequirePackage[utf8]{inputenc}% Nur notwendig, wenn Basis älter als TL2018
+  \RequirePackage[T1]{fontenc}
+  \RequirePackage{lmodern}

 
 

-       \RequirePackage{eurosym}
-       \DeclareUnicodeCharacter{20AC}{\euro}
+  \RequirePackage{eurosym}
+  \DeclareUnicodeCharacter{20AC}{\euro}

 \else
 \else

-       \RequirePackage{fontspec}
+  \RequirePackage{fontspec}

 \fi
 
 \RequirePackage{xltabular}
 \fi
 
 \RequirePackage{xltabular}


@@ -40,7 +40,7 @@
 \RequirePackage[fromlogo,fromalign=right,
   firstfoot=false,%Für einheitliche Randeinstellungen
   refline=nodate,
 \RequirePackage[fromlogo,fromalign=right,
   firstfoot=false,%Für einheitliche Randeinstellungen
   refline=nodate,

-       ]{scrletter}
+]{scrletter}

 \LoadLetterOption{DIN}
 
 \newkomavar{transaction}
 \LoadLetterOption{DIN}
 
 \newkomavar{transaction}


@@ -71,10 +71,10 @@
 
 
 \DeclareNewLayer[
 
 
 \DeclareNewLayer[

-foreground,
-hoffset=\useplength{toaddrhpos},
-voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+4\baselineskip,%sep to shippingaddressbox
-contents={\usebox\shippingAddressBox}
+  foreground,
+  hoffset=\useplength{toaddrhpos},
+  voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+4\baselineskip,%sep to shippingaddressbox
+  contents={\usebox\shippingAddressBox}

 ]{kivitendo.shippingaddress}
 
 \newpairofpagestyles{kivitendo.letter}{}
 ]{kivitendo.shippingaddress}
 
 \newpairofpagestyles{kivitendo.letter}{}


@@ -82,17 +82,17 @@ contents={\usebox\shippingAddressBox}
 \renewcommand*{\letterpagestyle}{kivitendo.letter}
 
 \DeclareNewPageStyleByLayers{kivitendo.letter.first}{
 \renewcommand*{\letterpagestyle}{kivitendo.letter}
 
 \DeclareNewPageStyleByLayers{kivitendo.letter.first}{

-       kivitendo.shippingaddress,
-       plain.kivitendo.letter.head.odd,plain.kivitendo.letter.head.even,plain.kivitendo.letter.head.oneside,%
-       plain.kivitendo.letter.foot.odd,plain.kivitendo.letter.foot.even,plain.kivitendo.letter.foot.oneside,%
+  kivitendo.shippingaddress,
+  plain.kivitendo.letter.head.odd,plain.kivitendo.letter.head.even,plain.kivitendo.letter.head.oneside,%
+  plain.kivitendo.letter.foot.odd,plain.kivitendo.letter.foot.even,plain.kivitendo.letter.foot.oneside,%

 }
 
 \setkomavar{backaddress}{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}
 
 \setkomavar{firsthead}{
 }
 
 \setkomavar{backaddress}{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}
 
 \setkomavar{firsthead}{

-       \if@logo
-       \rlap{\usekomavar{fromlogo}}%
-       \fi
+  \if@logo
+    \rlap{\usekomavar{fromlogo}}%
+  \fi

 }
 
 \@setplength{locwidth}{6cm}
 }
 
 \@setplength{locwidth}{6cm}


@@ -103,59 +103,59 @@ contents={\usebox\shippingAddressBox}
 
 
 \cs_new:Nn \__kivi_set_colwidth:nn  {
 
 
 \cs_new:Nn \__kivi_set_colwidth:nn  {

-       \dim_set:cn {l_kivi_tab_#1_dim} {#2}
+  \dim_set:cn {l_kivi_tab_#1_dim} {#2}

 }
 
 
 \cs_new:Nn \__kivi_initialize_columns: {
 }
 
 
 \cs_new:Nn \__kivi_initialize_columns: {

-       \clist_map_inline:Nn \g_kivi_pricingtable_col_clist {
-               \bool_if_exist:cF {l_kivi_col_##1_bool} 
-               {
-                       \bool_new:c {l_kivi_col_##1_bool}
-                       \dim_new:c {l_kivi_tab_##1_dim}
-                       \keys_define:nn {kivi/PricingTable} {
-                               ##1 .choice:,
-                               ##1 / true .code:n = \bool_set_true:c {l_kivi_col_##1_bool},
-                               ##1 / false .code:n = \bool_set_false:c {l_kivi_col_##1_bool},
-                               ##1 / unknown .code:n = {
-                                       \bool_set_true:c {l_kivi_col_##1_bool}
-                                       \dim_set:cn {l_kivi_tab_##1_dim} {####1}
-                               },
-                               ##1 .default:n = true,
-                               ##1 .initial:n = true,
-                               ##1 / header .prop_put:c = {l_kivi_col_##1_prop},
-                               ##1 / colspec .prop_put:c = {l_kivi_col_##1_prop},
-                       }
-               }
-       }
+  \clist_map_inline:Nn \g_kivi_pricingtable_col_clist {
+    \bool_if_exist:cF {l_kivi_col_##1_bool}
+    {
+      \bool_new:c {l_kivi_col_##1_bool}
+      \dim_new:c {l_kivi_tab_##1_dim}
+      \keys_define:nn {kivi/PricingTable} {
+        ##1 .choice:,
+        ##1 / true .code:n = \bool_set_true:c {l_kivi_col_##1_bool},
+        ##1 / false .code:n = \bool_set_false:c {l_kivi_col_##1_bool},
+        ##1 / unknown .code:n = {
+            \bool_set_true:c {l_kivi_col_##1_bool}
+            \dim_set:cn {l_kivi_tab_##1_dim} {####1}
+          },
+        ##1 .default:n = true,
+        ##1 .initial:n = true,
+        ##1 / header .prop_put:c = {l_kivi_col_##1_prop},
+        ##1 / colspec .prop_put:c = {l_kivi_col_##1_prop},
+      }
+    }
+  }

 }
 
 \clist_new:N \g_kivi_pricingtable_col_clist
 
 \keys_define:nn {kivi/PricingTable} {
 }
 
 \clist_new:N \g_kivi_pricingtable_col_clist
 
 \keys_define:nn {kivi/PricingTable} {

-       columns .code:n = 
-       \clist_gset:Nn \g_kivi_pricingtable_col_clist {#1}
-       \__kivi_initialize_columns:,
-       columns .initial:n = {pos, id, desc, amount, price, pricetotal},
-       unknown .code:n = \keys_set:no {kivi/Tabular} {\l_keys_key_str=#1}
+  columns .code:n =
+  \clist_gset:Nn \g_kivi_pricingtable_col_clist {#1}
+  \__kivi_initialize_columns:,
+  columns .initial:n = {pos, id, desc, amount, price, pricetotal},
+  unknown .code:n = \keys_set:no {kivi/Tabular} {\l_keys_key_str=#1}

 }
 
 % set default values for colwidth
 \keys_set:nn {kivi/PricingTable} {
 }
 
 % set default values for colwidth
 \keys_set:nn {kivi/PricingTable} {

-       pos=5ex,
-       id=4em,
-       amount=5em,
-       price=7em,
-       pricetotal=7em,
-%      desc=auto,
-       pos/header=\position,
-       id/header=\artikelnummer,
-       desc/header=\bezeichnung,
-       amount/header=\menge,
-       price/header=\einzelpreis,
-       pricetotal/header=\gesamtpreis,
-       price / colspec = Price,
-       pricetotal / colspec = Price ,
+  pos=5ex,
+  id=4em,
+  amount=5em,
+  price=7em,
+  pricetotal=7em,
+  %    desc=auto,
+  pos/header=\position,
+  id/header=\artikelnummer,
+  desc/header=\bezeichnung,
+  amount/header=\menge,
+  price/header=\einzelpreis,
+  pricetotal/header=\gesamtpreis,
+  price / colspec = Price,
+  pricetotal / colspec = Price ,

 }
 
 \dim_new:N \g_kivi_tabcolsep_dim
 }
 
 \dim_new:N \g_kivi_tabcolsep_dim


@@ -163,47 +163,47 @@ contents={\usebox\shippingAddressBox}
 \setlength\tabcolsep{.5\tabcolsep}
 
 \prg_new_conditional:Nnn \kivi_if_Price_col:n {T} {
 \setlength\tabcolsep{.5\tabcolsep}
 
 \prg_new_conditional:Nnn \kivi_if_Price_col:n {T} {

-       \prop_get:cnN {l_kivi_col_#1_prop} {colspec} \l_tmpa_tl
-       \exp_args:NV \tl_if_eq:nnTF \l_tmpa_tl {Price}
-               {\prg_return_true:}
-               {\prg_return_false:}
+  \prop_get:cnN {l_kivi_col_#1_prop} {colspec} \l_tmpa_tl
+  \exp_args:NV \tl_if_eq:nnTF \l_tmpa_tl {Price}
+  {\prg_return_true:}
+  {\prg_return_false:}

 }
 
 
 \cs_new:Nn \__kivi_calc_desc_column: {
 }
 
 
 \cs_new:Nn \__kivi_calc_desc_column: {

-       \bool_if:NTF \g__kivi_Tabular_rowcolor_bool
-               {\dim_set:Nn \l_kivi_tab_desc_leftskip_dim {2\g_kivi_tabcolsep_dim}}
-               {\dim_zero:N \l_kivi_tab_desc_leftskip_dim}
-       \dim_zero:N \l_kivi_tab_desc_dim
-       \bool_set_false:N \l_tmpa_bool
-       \tl_gclear:N \g_kivi_Pricing_colspec_tl
-       \clist_map_inline:Nn \g_kivi_pricingtable_col_clist {
-               \tl_if_eq:nnTF {##1} {desc}  {
-                       \dim_set:Nn \l_kivi_tab_desc_dim {
-                               \textwidth-\l_kivi_tab_desc_leftskip_dim
-                       }
-                       \bool_set_true:N \l_tmpa_bool
-                       \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {p{\l_kivi_tab_desc_dim}}
-               }{
-                       \bool_if:cT {l_kivi_col_##1_bool} {
-                               \bool_if:NTF \l_tmpa_bool {
-                                       \dim_sub:Nn \l_kivi_tab_desc_dim {
-                                               \dim_use:c {l_kivi_tab_##1_dim}+2\g_kivi_tabcolsep_dim
-                                       }
-                               }{
-                                       \dim_add:Nn \l_kivi_tab_desc_leftskip_dim {
-                                               \dim_use:c {l_kivi_tab_##1_dim}+2\g_kivi_tabcolsep_dim
-                                       }
-                               }
-                               \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {K{\dim_use:c {l_kivi_tab_##1_dim}}}
-                               \kivi_if_Price_col:nT {##1} {\tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {<{\__kivi_tab_column_currency:}}}
-                       }
-               }
-       }
-       \bool_if:NF \g__kivi_Tabular_rowcolor_bool {
-               \tl_gput_left:Nn \g_kivi_Pricing_colspec_tl {@{}}
-               \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {@{}}
-       }
+  \bool_if:NTF \g__kivi_Tabular_rowcolor_bool
+  {\dim_set:Nn \l_kivi_tab_desc_leftskip_dim {2\g_kivi_tabcolsep_dim}}
+  {\dim_zero:N \l_kivi_tab_desc_leftskip_dim}
+  \dim_zero:N \l_kivi_tab_desc_dim
+  \bool_set_false:N \l_tmpa_bool
+  \tl_gclear:N \g_kivi_Pricing_colspec_tl
+  \clist_map_inline:Nn \g_kivi_pricingtable_col_clist {
+    \tl_if_eq:nnTF {##1} {desc}  {
+      \dim_set:Nn \l_kivi_tab_desc_dim {
+        \textwidth-\l_kivi_tab_desc_leftskip_dim
+      }
+      \bool_set_true:N \l_tmpa_bool
+      \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {p{\l_kivi_tab_desc_dim}}
+    }{
+      \bool_if:cT {l_kivi_col_##1_bool} {
+        \bool_if:NTF \l_tmpa_bool {
+          \dim_sub:Nn \l_kivi_tab_desc_dim {
+            \dim_use:c {l_kivi_tab_##1_dim}+2\g_kivi_tabcolsep_dim
+          }
+        }{
+          \dim_add:Nn \l_kivi_tab_desc_leftskip_dim {
+            \dim_use:c {l_kivi_tab_##1_dim}+2\g_kivi_tabcolsep_dim
+          }
+        }
+        \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {K{\dim_use:c {l_kivi_tab_##1_dim}}}
+        \kivi_if_Price_col:nT {##1} {\tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {<{\__kivi_tab_column_currency:}}}
+      }
+    }
+  }
+  \bool_if:NF \g__kivi_Tabular_rowcolor_bool {
+    \tl_gput_left:Nn \g_kivi_Pricing_colspec_tl {@{}}
+    \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {@{}}
+  }

 }
 
 \newcolumntype{K}[1]{>{\raggedleft\arraybackslash}p{#1}}
 }
 
 \newcolumntype{K}[1]{>{\raggedleft\arraybackslash}p{#1}}


@@ -213,38 +213,38 @@ contents={\usebox\shippingAddressBox}
 \tcbuselibrary{breakable, skins}
 
 \tcb@new@skin{kivi@LT}{base@unbroken,%
 \tcbuselibrary{breakable, skins}
 
 \tcb@new@skin{kivi@LT}{base@unbroken,%

-       frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
-       skin~first=kivi@LT@first,skin~middle=kivi@LT@middle,skin~last=kivi@LT@last,
-       underlay~first~and~middle={
-               \node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
-               \node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@foot_box}};
-       },
-       underlay~unbroken~and~last={
-       \node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
-       \node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@lastfoot_box}};
-       },
-       boxsep=0pt,
-       boxrule=0pt,
-       left=0pt,
-       right=0pt,
-       bottom=\box_ht:N  \g_kivi_LT@foot_box+\box_dp:N  \g_kivi_LT@foot_box + \aboverulesep,
-       top=\box_ht:N  \g_kivi_LT@head_box+\box_dp:N  \g_kivi_LT@head_box +\belowrulesep,
-       parbox=false,
+frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
+skin~first=kivi@LT@first,skin~middle=kivi@LT@middle,skin~last=kivi@LT@last,
+underlay~first~and~middle={
+\node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
+\node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@foot_box}};
+},
+underlay~unbroken~and~last={
+\node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
+\node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@lastfoot_box}};
+},
+boxsep=0pt,
+boxrule=0pt,
+left=0pt,
+right=0pt,
+bottom=\box_ht:N  \g_kivi_LT@foot_box+\box_dp:N  \g_kivi_LT@foot_box + \aboverulesep,
+top=\box_ht:N  \g_kivi_LT@head_box+\box_dp:N  \g_kivi_LT@head_box +\belowrulesep,
+parbox=false,

 }
 
 \tcb@new@skin{kivi@LT@first}{base@first,%
 }
 
 \tcb@new@skin{kivi@LT@first}{base@first,%

-       frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
-       skin~first=kivi@LT@first,skin~middle=kivi@LT@middle,skin~last=kivi@LT@middle,
+  frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
+  skin~first=kivi@LT@first,skin~middle=kivi@LT@middle,skin~last=kivi@LT@middle,

 }
 
 \tcb@new@skin{kivi@LT@middle}{base@middle,%
 }
 
 \tcb@new@skin{kivi@LT@middle}{base@middle,%

-       frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
-       skin~first=kivi@LT@middle,skin~middle=kivi@LT@middle,skin~last=kivi@LT@middle,
+  frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
+  skin~first=kivi@LT@middle,skin~middle=kivi@LT@middle,skin~last=kivi@LT@middle,

 }
 
 \tcb@new@skin{kivi@LT@last}{base@last,%
 }
 
 \tcb@new@skin{kivi@LT@last}{base@last,%

-       frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
-       skin~first=kivi@LT@middle,skin~middle=kivi@LT@middle,skin~last=kivi@LT@last,
+  frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
+  skin~first=kivi@LT@middle,skin~middle=kivi@LT@middle,skin~last=kivi@LT@last,

 }
 
 \tcbset{kivi@LT/.style={skin=kivi@LT}}%
 }
 
 \tcbset{kivi@LT/.style={skin=kivi@LT}}%


@@ -256,7 +256,7 @@ contents={\usebox\shippingAddressBox}
 \seq_new:N \g_kivi_extraDescription_seq
 
 \int_new:N \l__kivi_PricingTable_rowcolor_int
 \seq_new:N \g_kivi_extraDescription_seq
 
 \int_new:N \l__kivi_PricingTable_rowcolor_int

-\dim_new:N \l__kivi_fboxsep_dim 
+\dim_new:N \l__kivi_fboxsep_dim

 \dim_set:Nn \l__kivi_fboxsep_dim {\g_kivi_tabcolsep_dim}
 
 %colorbox variant to only add vertical spacing
 \dim_set:Nn \l__kivi_fboxsep_dim {\g_kivi_tabcolsep_dim}
 
 %colorbox variant to only add vertical spacing


@@ -268,90 +268,90 @@ contents={\usebox\shippingAddressBox}
 \def\kivi@tabcolorbox#1#{\protect\kivi@tabcolor@box{#1}}
 
 \def\kivi@tabcolor@box#1#2{
 \def\kivi@tabcolorbox#1#{\protect\kivi@tabcolor@box{#1}}
 
 \def\kivi@tabcolor@box#1#2{

-       \tl_if_empty:oTF {#2} 
-               \kivi@nocolor@b@x
-               \kivi@color@b@x
-       \relax{\color#1{#2}}
+  \tl_if_empty:oTF {#2}
+  \kivi@nocolor@b@x
+  \kivi@color@b@x
+  \relax{\color#1{#2}}

 }
 \long\def\kivi@color@b@x#1#2#3%
 {\leavevmode
 }
 \long\def\kivi@color@b@x#1#2#3%
 {\leavevmode

-       \setbox\z@\hbox{{\set@color#3}}%
-       \dimen@\ht\z@\advance\dimen@\l__kivi_fboxsep_dim\ht\z@\dimen@
-       \dimen@\dp\z@\advance\dimen@\l__kivi_fboxsep_dim\dp\z@\dimen@
-       {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}}
+  \setbox\z@\hbox{{\set@color#3}}%
+  \dimen@\ht\z@\advance\dimen@\l__kivi_fboxsep_dim\ht\z@\dimen@
+  \dimen@\dp\z@\advance\dimen@\l__kivi_fboxsep_dim\dp\z@\dimen@
+  {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}}

 
 \long\def\kivi@nocolor@b@x#1#2#3%
 {\leavevmode
 
 \long\def\kivi@nocolor@b@x#1#2#3%
 {\leavevmode

-       \setbox\z@\hbox{#3}%
-       \dimen@\ht\z@\advance\dimen@\l__kivi_fboxsep_dim\ht\z@\dimen@
-       \dimen@\dp\z@\advance\dimen@\l__kivi_fboxsep_dim\dp\z@\dimen@
-       {\box\z@}}
+  \setbox\z@\hbox{#3}%
+  \dimen@\ht\z@\advance\dimen@\l__kivi_fboxsep_dim\ht\z@\dimen@
+  \dimen@\dp\z@\advance\dimen@\l__kivi_fboxsep_dim\dp\z@\dimen@
+  {\box\z@}}

 
 %%%
 
 
 \newcommand{\FakeTable}[1]{
 
 %%%
 
 
 \newcommand{\FakeTable}[1]{

-       \par
-       \seq_set_split:Nnn \l_kivi_PricingTable_seq {\tabularnewline} {#1}
-       \seq_remove_all:Nn \l_kivi_PricingTable_seq {}
-       \begingroup
-       \setlength{\parskip}{\c_zero_dim}
-       \let\ExtraDescription\__kivi_addExtraDescription:n
-       \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
-       \seq_map_inline:Nn \l_kivi_PricingTable_seq {
-               \bool_if:NT \g__kivi_Tabular_rowcolor_bool {
-                       \int_gincr:N \g__kivi_PricingTable_rowcolor_int 
-                       \int_if_odd:nTF {\g__kivi_PricingTable_rowcolor_int}
-                       {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_odd_tl}}
-                       {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_even_tl}}
-               }
-               {\parbox{\linewidth}{
-               \seq_set_split:Nnn  \l_kivi_columns_seq {&} {##1}
-       \seq_gclear:N \g_kivi_extraDescription_seq
-       \exp_args:Nnx \use:n {\tabular[t]}\g_kivi_Pricing_colspec_tl
-               \seq_pop_left:NN \__l_FakeTable_columns_seq \l_tmpa_tl
-               \seq_item:Nn \l_kivi_columns_seq {\l_tmpa_tl}
-               \seq_map_inline:Nn \__l_FakeTable_columns_seq {
-                       &\seq_item:Nn \l_kivi_columns_seq {####1}
-               }
-       \endtabular
-       \seq_if_empty:NTF \g_kivi_extraDescription_seq
-       {\par}
-       {\par\nopagebreak
-       \begingroup
-       \setlength{\leftskip}{\dim_eval:n {\bool_if:NT \g__kivi_Tabular_rowcolor_bool {-\tabcolsep} +\l_kivi_tab_desc_leftskip_dim}}
-       \setlength{\hsize}{\dim_eval:n {\l_kivi_tab_desc_dim+\leftskip}}
-       \usekomafont{extraDescription}
-       \seq_use:Nn \g_kivi_extraDescription_seq {\\}
-       \par
-       \endgroup
-       }
-       }}
-       }
-       \endgroup\par
+  \par
+  \seq_set_split:Nnn \l_kivi_PricingTable_seq {\tabularnewline} {#1}
+  \seq_remove_all:Nn \l_kivi_PricingTable_seq {}
+  \begingroup
+  \setlength{\parskip}{\c_zero_dim}
+  \let\ExtraDescription\__kivi_addExtraDescription:n
+  \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
+  \seq_map_inline:Nn \l_kivi_PricingTable_seq {
+    \bool_if:NT \g__kivi_Tabular_rowcolor_bool {
+      \int_gincr:N \g__kivi_PricingTable_rowcolor_int
+      \int_if_odd:nTF {\g__kivi_PricingTable_rowcolor_int}
+      {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_odd_tl}}
+      {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_even_tl}}
+    }
+    {\parbox{\linewidth}{
+        \seq_set_split:Nnn  \l_kivi_columns_seq {&} {##1}
+        \seq_gclear:N \g_kivi_extraDescription_seq
+        \exp_args:Nnx \use:n {\tabular[t]}\g_kivi_Pricing_colspec_tl
+        \seq_pop_left:NN \__l_FakeTable_columns_seq \l_tmpa_tl
+        \seq_item:Nn \l_kivi_columns_seq {\l_tmpa_tl}
+        \seq_map_inline:Nn \__l_FakeTable_columns_seq {
+          &\seq_item:Nn \l_kivi_columns_seq {####1}
+        }
+        \endtabular
+        \seq_if_empty:NTF \g_kivi_extraDescription_seq
+        {\par}
+        {\par\nopagebreak
+          \begingroup
+          \setlength{\leftskip}{\dim_eval:n {\bool_if:NT \g__kivi_Tabular_rowcolor_bool {-\tabcolsep} +\l_kivi_tab_desc_leftskip_dim}}
+          \setlength{\hsize}{\dim_eval:n {\l_kivi_tab_desc_dim+\leftskip}}
+          \usekomafont{extraDescription}
+          \seq_use:Nn \g_kivi_extraDescription_seq {\\}
+          \par
+          \endgroup
+        }
+      }}
+  }
+  \endgroup\par

 }
 
 
 \seq_new:N  \__l_FakeTable_columns_seq
 \cs_new:Nn \__kivi_setup_FakeTable: {
 }
 
 
 \seq_new:N  \__l_FakeTable_columns_seq
 \cs_new:Nn \__kivi_setup_FakeTable: {

-       \seq_clear:N \__l_FakeTable_columns_seq
-       \int_zero:N \l_tmpa_int
-       \clist_map_inline:Nn \g_kivi_pricingtable_col_clist {
-               \int_incr:N \l_tmpa_int
-               \bool_if:cT {l_kivi_col_##1_bool} {\seq_put_right:Nx \__l_FakeTable_columns_seq {\int_use:N \l_tmpa_int}}
-       }
+  \seq_clear:N \__l_FakeTable_columns_seq
+  \int_zero:N \l_tmpa_int
+  \clist_map_inline:Nn \g_kivi_pricingtable_col_clist {
+    \int_incr:N \l_tmpa_int
+    \bool_if:cT {l_kivi_col_##1_bool} {\seq_put_right:Nx \__l_FakeTable_columns_seq {\int_use:N \l_tmpa_int}}
+  }

 }
 
 \tl_new:N \g_kivi_Pricing_colspec_tl
 \tl_gset:Nn \g_kivi_Pricing_colspec_tl {
 }
 
 \tl_new:N \g_kivi_Pricing_colspec_tl
 \tl_gset:Nn \g_kivi_Pricing_colspec_tl {

-       \bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
-       \bool_if:NT \l_kivi_col_pos_bool {p{\l_kivi_tab_pos_dim}}
-       \bool_if:NT \l_kivi_col_id_bool {p{\l_kivi_tab_id_dim}}
-       p{\l_kivi_tab_desc_dim}
-       \bool_if:NT \l_kivi_col_amount_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_amount_dim}}}
-       \bool_if:NT \l_kivi_col_price_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_price_dim}<{\__kivi_tab_column_currency:}}}
-       \bool_if:NT \l_kivi_col_pricetotal_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_pricetotal_dim}<{\__kivi_tab_column_currency:}}}
-       \bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
+\bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
+\bool_if:NT \l_kivi_col_pos_bool {p{\l_kivi_tab_pos_dim}}
+\bool_if:NT \l_kivi_col_id_bool {p{\l_kivi_tab_id_dim}}
+p{\l_kivi_tab_desc_dim}
+\bool_if:NT \l_kivi_col_amount_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_amount_dim}}}
+\bool_if:NT \l_kivi_col_price_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_price_dim}<{\__kivi_tab_column_currency:}}}
+\bool_if:NT \l_kivi_col_pricetotal_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_pricetotal_dim}<{\__kivi_tab_column_currency:}}}
+\bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}

 }
 
 \cs_new_protected:Nn \__kivi_tab_column_currency: {\,\currency}
 }
 
 \cs_new_protected:Nn \__kivi_tab_column_currency: {\,\currency}


@@ -360,60 +360,60 @@ contents={\usebox\shippingAddressBox}
 \cs_set_eq:NN \__kivi_tab_column_body_currency:  \__kivi_tab_column_currency:
 
 \clist_map_inline:nn {head, foot, firsthead, lastfoot} {%TODO reduce
 \cs_set_eq:NN \__kivi_tab_column_body_currency:  \__kivi_tab_column_currency:
 
 \clist_map_inline:nn {head, foot, firsthead, lastfoot} {%TODO reduce

-       \box_new:c {g_kivi_LT@#1_box}
+  \box_new:c {g_kivi_LT@#1_box}

 }
 
 \newkomafont{PricingTableHeader}{\bfseries}
 
 \cs_new:Nn \__kivi_setup_LT_boxes: {
 }
 
 \newkomafont{PricingTableHeader}{\bfseries}
 
 \cs_new:Nn \__kivi_setup_LT_boxes: {

-%      \bool_show:N  \g__kivi_Tabular_rowcolor_bool
-       \__kivi_calc_desc_column:
-       \hbox_gset:Nn \g_kivi_LT@head_box {
-               \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
-               \bool_if:NT \g__kivi_Tabular_rowcolor_bool {\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_header_tl}}%
-               {
-               \exp_args:Nnx \use:n {\tabular[b]}\g_kivi_Pricing_colspec_tl
-               \__kivi_PricingTabular_header:
-               \endtabular
-               }
-       }
-       \hbox_gset:Nn \g_kivi_LT@foot_box {
-%              \parbox{\linewidth}{
-%              \leavevmode\color{red}\rule{\linewidth}{1pt}\par\nointerlineskip
-%              \leavevmode\color{blue}\rule{\linewidth}{1cm}
-%              }
-%              \raisebox{\depth}{
-                       \begin{tabular*}{\textwidth}[t]{@{\extracolsep{\fill}}r@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}}
-                               \bool_if:NTF \g__kivi_Tabular_rowcolor_bool
-                               {\hline\noalign{\vskip1pt}}%\noalign{\nointerlineskip\vskip\z@}\noalign{\nointerlineskip\rule{\linewidth}{\arrayrulewidth}}}%\leavevmode\rule{\linewidth}{\arrayrulewidth}}} 
-                               \midrule
-                               \strut\weiteraufnaechsterseite
-                       \end{tabular*}
-%              }
-       }
-       \hbox_gset:Nn \g_kivi_LT@lastfoot_box {
-               \raisebox{\dimexpr\depth+\baselineskip}[0pt][0pt]{
-                       \begin{tabular*}{\textwidth}{@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}\extracolsep{\fill}}r@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}}
-                       \bool_if:NF \g__kivi_Tabular_rowcolor_bool \bottomrule
-                       \end{tabular*}
-               }
-       }
+  %    \bool_show:N  \g__kivi_Tabular_rowcolor_bool
+  \__kivi_calc_desc_column:
+  \hbox_gset:Nn \g_kivi_LT@head_box {
+    \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
+    \bool_if:NT \g__kivi_Tabular_rowcolor_bool {\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_header_tl}}%
+    {
+      \exp_args:Nnx \use:n {\tabular[b]}\g_kivi_Pricing_colspec_tl
+      \__kivi_PricingTabular_header:
+      \endtabular
+    }
+  }
+  \hbox_gset:Nn \g_kivi_LT@foot_box {
+    %          \parbox{\linewidth}{
+    %          \leavevmode\color{red}\rule{\linewidth}{1pt}\par\nointerlineskip
+    %          \leavevmode\color{blue}\rule{\linewidth}{1cm}
+    %          }
+    %          \raisebox{\depth}{
+    \begin{tabular*}{\textwidth}[t]{@{\extracolsep{\fill}}r@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}}
+      \bool_if:NTF \g__kivi_Tabular_rowcolor_bool
+      {\hline\noalign{\vskip1pt}}%\noalign{\nointerlineskip\vskip\z@}\noalign{\nointerlineskip\rule{\linewidth}{\arrayrulewidth}}}%\leavevmode\rule{\linewidth}{\arrayrulewidth}}} 
+      \midrule
+      \strut\weiteraufnaechsterseite
+    \end{tabular*}
+    %          }
+  }
+  \hbox_gset:Nn \g_kivi_LT@lastfoot_box {
+    \raisebox{\dimexpr\depth+\baselineskip}[0pt][0pt]{
+      \begin{tabular*}{\textwidth}{@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}\extracolsep{\fill}}r@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}}
+        \bool_if:NF \g__kivi_Tabular_rowcolor_bool \bottomrule
+      \end{tabular*}
+    }
+  }

 }
 
 
 %Macht es sinn hier eine Variante zu machen, in der alle Spalten Belegbar sind?
 \NewDocumentEnvironment{PricingTotal}{+b}{
 }
 
 
 %Macht es sinn hier eine Variante zu machen, in der alle Spalten Belegbar sind?
 \NewDocumentEnvironment{PricingTotal}{+b}{

-       \par\nointerlineskip
+\par\nointerlineskip

 %      \unskip
 }{
 %      \unskip
 }{

-       \bool_if:NT \g__kivi_Tabular_rowcolor_bool      {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_PricingTotal_tl}}
-       {       
-       \tabular[t]{@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}
-       p{\dim_eval:n {\linewidth-\l_kivi_tab_pricetotal_dim-\bool_if:NTF \g__kivi_Tabular_rowcolor_bool {4}{2}\tabcolsep}}P{\l_kivi_tab_pricetotal_dim}@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}}
-       \l__kivi_Tabular_PricingTotal_topsep_tl
-       #1
-       \endtabular
-       }
+\bool_if:NT \g__kivi_Tabular_rowcolor_bool     {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_PricingTotal_tl}}
+{
+\tabular[t]{@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}
+p{\dim_eval:n {\linewidth-\l_kivi_tab_pricetotal_dim-\bool_if:NTF \g__kivi_Tabular_rowcolor_bool {4}{2}\tabcolsep}}P{\l_kivi_tab_pricetotal_dim}@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}}
+\l__kivi_Tabular_PricingTotal_topsep_tl
+#1
+\endtabular
+}

 }
 
 \tl_new:N \l__kivi_Tabular_PricingTotal_topsep_tl
 }
 
 \tl_new:N \l__kivi_Tabular_PricingTotal_topsep_tl


@@ -421,72 +421,72 @@ contents={\usebox\shippingAddressBox}
 \tl_set:Nn \l__kivi_Tabular_PricingTotal_topsep_tl {\bool_if:NF \g__kivi_Tabular_rowcolor_bool \midrule}
 
 \newcommand*\ExtraDescription{
 \tl_set:Nn \l__kivi_Tabular_PricingTotal_topsep_tl {\bool_if:NF \g__kivi_Tabular_rowcolor_bool \midrule}
 
 \newcommand*\ExtraDescription{

-       \PackageError{kiviletter}{The~command~\string\ExtraDescription\space~may~be~only~used~inside~the~\string\FakeTable\space~environment.}{See~documentation~for~details}
+  \PackageError{kiviletter}{The~command~\string\ExtraDescription\space~may~be~only~used~inside~the~\string\FakeTable\space~environment.}{See~documentation~for~details}

 }
 
 
 \cs_new:Nn \__kivi_addExtraDescription:n {\seq_gput_right:Nn \g_kivi_extraDescription_seq {#1}}
 
 \newenvironment{PricingTabular}[1][]{
 }
 
 
 \cs_new:Nn \__kivi_addExtraDescription:n {\seq_gput_right:Nn \g_kivi_extraDescription_seq {#1}}
 
 \newenvironment{PricingTabular}[1][]{

-       \begingroup
-       \dim_set:Nn \parskip {\c_zero_dim}
-       \tl_if_empty:nF {#1} {\keys_set:nn {kivi/PricingTable} {#1}}
-       \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
-       \__kivi_calc_desc_column:
-       \exp_args:Nx \longtable \g_kivi_Pricing_colspec_tl
-       % Tabellenkopf
-       \__kivi_PricingTabular_header:
-       \endhead
-       \midrule
-       \rlap{\makebox[\textwidth][r]{\weiteraufnaechsterseite}}\\
-       \endfoot
-       \bool_if:NF \g__kivi_Tabular_rowcolor_bool \bottomrule
-       \endlastfoot
+  \begingroup
+  \dim_set:Nn \parskip {\c_zero_dim}
+  \tl_if_empty:nF {#1} {\keys_set:nn {kivi/PricingTable} {#1}}
+  \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
+  \__kivi_calc_desc_column:
+  \exp_args:Nx \longtable \g_kivi_Pricing_colspec_tl
+  % Tabellenkopf
+  \__kivi_PricingTabular_header:
+  \endhead
+  \midrule
+  \rlap{\makebox[\textwidth][r]{\weiteraufnaechsterseite}}\\
+  \endfoot
+  \bool_if:NF \g__kivi_Tabular_rowcolor_bool \bottomrule
+  \endlastfoot

 }{
 }{

-       \endlongtable
-       \endgroup
+  \endlongtable
+  \endgroup

 }
 
 \cs_set:Nn \__kivi_PricingTabular_header: {
 }
 
 \cs_set:Nn \__kivi_PricingTabular_header: {

-       \bool_if:NTF \g__kivi_Tabular_rowcolor_bool {\noalign{\skip_vertical:n {\dp\strutbox}}}\toprule
-       \cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_header_currency:
-       \bool_set_false:N \l_tmpa_bool
-       \clist_map_inline:Nn \g_kivi_pricingtable_col_clist     {
-               \bool_if:cT {l_kivi_col_##1_bool} {
-                       \bool_if:NT \l_tmpa_bool {&}
-                       \bool_set_true:N \l_tmpa_bool
-                       \usekomafont{PricingTableHeader}
-                       \prop_item:cn {l_kivi_col_##1_prop} {header}
-               }
-       }
-       \cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_body_currency:
-       \\
-       \bool_if:NF \g__kivi_Tabular_rowcolor_bool \midrule
+  \bool_if:NTF \g__kivi_Tabular_rowcolor_bool {\noalign{\skip_vertical:n {\dp\strutbox}}}\toprule
+  \cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_header_currency:
+  \bool_set_false:N \l_tmpa_bool
+  \clist_map_inline:Nn \g_kivi_pricingtable_col_clist  {
+    \bool_if:cT {l_kivi_col_##1_bool} {
+      \bool_if:NT \l_tmpa_bool {&}
+      \bool_set_true:N \l_tmpa_bool
+      \usekomafont{PricingTableHeader}
+      \prop_item:cn {l_kivi_col_##1_prop} {header}
+    }
+  }
+  \cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_body_currency:
+  \\
+  \bool_if:NF \g__kivi_Tabular_rowcolor_bool \midrule

 }
 
 \newkomafont{tablehead}{\bfseries}
 
 \keys_define:nn {kivi/SimpleTabular} {
 }
 
 \newkomafont{tablehead}{\bfseries}
 
 \keys_define:nn {kivi/SimpleTabular} {

-       colspec .tl_set:N =\l_kivi_SimpleTabular_colspec_tl,
-       colspec .initial:n = {rrX},
-       headline .tl_set:N = \l_kivi_SimpleTabular_headline_tl,
-       headline .initial:n = {\usekomafont{tablehead}\position & \usekomafont{tablehead}\menge & \usekomafont{tablehead}\bezeichnung},
+  colspec .tl_set:N =\l_kivi_SimpleTabular_colspec_tl,
+  colspec .initial:n = {rrX},
+  headline .tl_set:N = \l_kivi_SimpleTabular_headline_tl,
+  headline .initial:n = {\usekomafont{tablehead}\position & \usekomafont{tablehead}\menge & \usekomafont{tablehead}\bezeichnung},

 }
 
 \keys_define:nn {kivi/Tabular} {
 }
 
 \keys_define:nn {kivi/Tabular} {

-       color-rows .bool_gset:N =  \g__kivi_Tabular_rowcolor_bool ,
-       color-rows .initial:n = false,
-       color-rows .default:n = true,
-       rowcolor-odd .tl_gset:N = \g__kivi_Tabular_rowcolor_odd_tl,
-       rowcolor-odd .initial:n = black!10,
-       rowcolor-even .tl_gset:N = \g__kivi_Tabular_rowcolor_even_tl,
-       rowcolor-even .initial:n =,
-       rowcolor-header .tl_gset:N = \g__kivi_Tabular_rowcolor_header_tl,
-       rowcolor-header .initial:n = black!35,
-       rowcolor-total .tl_gset:N = \g__kivi_Tabular_rowcolor_PricingTotal_tl,
-       rowcolor-total .initial:n = black!35,
-       rowsep .tl_set:N =\g__kivi_Tabular_rowsep_tl,
-       hrule .meta:n = {rowsep=\midrule}
+  color-rows .bool_gset:N =  \g__kivi_Tabular_rowcolor_bool ,
+  color-rows .initial:n = false,
+  color-rows .default:n = true,
+  rowcolor-odd .tl_gset:N = \g__kivi_Tabular_rowcolor_odd_tl,
+  rowcolor-odd .initial:n = black!10,
+  rowcolor-even .tl_gset:N = \g__kivi_Tabular_rowcolor_even_tl,
+  rowcolor-even .initial:n =,
+  rowcolor-header .tl_gset:N = \g__kivi_Tabular_rowcolor_header_tl,
+  rowcolor-header .initial:n = black!35,
+  rowcolor-total .tl_gset:N = \g__kivi_Tabular_rowcolor_PricingTotal_tl,
+  rowcolor-total .initial:n = black!35,
+  rowsep .tl_set:N =\g__kivi_Tabular_rowsep_tl,
+  hrule .meta:n = {rowsep=\midrule}

 }
 
 \newcommand*{\SetupSimpleTabular}[1]{\keys_set:nn {kivi/SimpleTabular} {#1}}
 }
 
 \newcommand*{\SetupSimpleTabular}[1]{\keys_set:nn {kivi/SimpleTabular} {#1}}


@@ -494,30 +494,30 @@ contents={\usebox\shippingAddressBox}
 
 \newenvironment{SimpleTabular}[1][]
 {
 
 \newenvironment{SimpleTabular}[1][]
 {

-       \tl_if_in:nnTF {#1} {=} {\keys_set:nn {kivi/SimpleTabular} {#1}} {\tl_if_empty:nF {#1} {\tl_set:Nn \l_kivi_SimpleTabular_headline_tl {#1}}}
-       \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
-       \dim_set:Nn \parskip {\c_zero_dim}
-       \bool_if:NF     \g__kivi_Tabular_rowcolor_bool {
-               \tl_put_right:Nn \l_kivi_SimpleTabular_colspec_tl {@{}}
-               \tl_put_left:Nn \l_kivi_SimpleTabular_colspec_tl {@{}}
-       }
-       \exp_args:NnV \xltabular{\linewidth}\l_kivi_SimpleTabular_colspec_tl
-               \toprule
-               \cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_header_currency:
-               \l_kivi_SimpleTabular_headline_tl
-               \\
-               \noalign{\cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_body_currency:}
-               \midrule
-       \endhead
-               \midrule
-               \rlap{\makebox[\textwidth][r]{\weiteraufnaechsterseite}}\\
-       \endfoot
-       \bool_if:NF \g__kivi_Tabular_rowcolor_bool \bottomrule
-       \endlastfoot
-       \ignorespaces
+  \tl_if_in:nnTF {#1} {=} {\keys_set:nn {kivi/SimpleTabular} {#1}} {\tl_if_empty:nF {#1} {\tl_set:Nn \l_kivi_SimpleTabular_headline_tl {#1}}}
+  \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
+  \dim_set:Nn \parskip {\c_zero_dim}
+  \bool_if:NF  \g__kivi_Tabular_rowcolor_bool {
+    \tl_put_right:Nn \l_kivi_SimpleTabular_colspec_tl {@{}}
+    \tl_put_left:Nn \l_kivi_SimpleTabular_colspec_tl {@{}}
+  }
+  \exp_args:NnV \xltabular{\linewidth}\l_kivi_SimpleTabular_colspec_tl
+  \toprule
+  \cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_header_currency:
+  \l_kivi_SimpleTabular_headline_tl
+  \\
+  \noalign{\cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_body_currency:}
+  \midrule
+  \endhead
+  \midrule
+  \rlap{\makebox[\textwidth][r]{\weiteraufnaechsterseite}}\\
+  \endfoot
+  \bool_if:NF \g__kivi_Tabular_rowcolor_bool \bottomrule
+  \endlastfoot
+  \ignorespaces

 }{
 }{

-       \def\@currenvir{tabularx}
-       \endxltabular
+  \def\@currenvir{tabularx}
+  \endxltabular

 }
 
 %PricingTabular* kann automatisch spalten ignorieren
 }
 
 %PricingTabular* kann automatisch spalten ignorieren


@@ -526,84 +526,84 @@ contents={\usebox\shippingAddressBox}
 % analog ist dies für pos, amount, price, pricetotal möglich.
 % Die Spalte der Bezeichnung ist nicht deaktivierbar
 \newenvironment{PricingTabular*}[1][]{
 % analog ist dies für pos, amount, price, pricetotal möglich.
 % Die Spalte der Bezeichnung ist nicht deaktivierbar
 \newenvironment{PricingTabular*}[1][]{

-       \int_gzero:N \g__kivi_PricingTable_rowcolor_int
-       \tl_if_empty:nF {#1} {\keys_set:nn {kivi/PricingTable} {#1}}
-       \__kivi_setup_LT_boxes:
-       \__kivi_setup_FakeTable:
-       \dim_set:Nn \parskip {\c_zero_dim}
-       \PricingTabularBox\ignorespaces
+  \int_gzero:N \g__kivi_PricingTable_rowcolor_int
+  \tl_if_empty:nF {#1} {\keys_set:nn {kivi/PricingTable} {#1}}
+  \__kivi_setup_LT_boxes:
+  \__kivi_setup_FakeTable:
+  \dim_set:Nn \parskip {\c_zero_dim}
+  \PricingTabularBox\ignorespaces

 }{\endPricingTabularBox
 }{\endPricingTabularBox

-       %compensate footer spacing
-       \skip_vertical:n {-\box_ht:N  \g_kivi_LT@foot_box-\box_dp:N  \g_kivi_LT@foot_box}
+  %compensate footer spacing
+  \skip_vertical:n {-\box_ht:N  \g_kivi_LT@foot_box-\box_dp:N  \g_kivi_LT@foot_box}

 }
 
 \newtcolorbox{PricingTabularBox}{breakable,skin=kivi@LT}
 
 \if@kivi@infobox
 
 }
 
 \newtcolorbox{PricingTabularBox}{breakable,skin=kivi@LT}
 
 \if@kivi@infobox
 

-       \def\locationsep{:}
-
-       \NewDocumentCommand{\locationentry}{som}{
-               \Ifkomavarempty{#3}{}{
-               \IfBooleanTF {#1} {
-                       \strut
-                       \IfNoValueTF {#2}
-                               {\usekomavar*{#3}}
-                               {#2}
-                       \locationsep
-                       \hfill\strut\space
-                       \hbox_set:Nn \l_tmpa_box {\usekomavar{#3}}
-                       \dim_compare:nTF {\box_wd:N \l_tmpa_box>\linewidth}
-                               {\newline\hspace*{\fill}\llap}
-                               {\hspace*{\fill}}
-                               {\box_use:N \l_tmpa_box\strut}
-               }{
-                       \@hangfrom{\strut
-                               \IfNoValueTF {#2}
-                                       {\usekomavar*{#3}}
-                                       {#2}\locationsep~
-                       }{
-                               \parbox[t]{\dimexpr\linewidth-\hangindent}{
-                                       \raggedleft
-                                       \usekomavar{#3}\strut
-                               }
-                       }
-               }
-               }
-               \par
-       }
-
-\newkomafont{transaction}{\bfseries}
-
-\setkomavar{location}{
-       \Ifkomavarempty{transaction}{}{{
-       \usekomafont{transaction}
-       \usekomavar{transaction}
-       }
-       }
-       \par
-       \medskip
-       \parbox{\useplength{locwidth}}{
-               \locationentry{date}
-               \locationentry{myref}
-               \locationentry{customer}
-               \locationentry{yourref}
-               \locationentry{delivery}
-               \locationentry{quote}
-               \locationentry{orderID}
-               \locationentry{projectID}
-               \locationentry[\ansprechpartner]{fromname}
-               \locationentry{fromphone}
-               \locationentry*{fromemail}
-       }
-}
-\removereffields
-\AtBeginLetter{
-       \ifdim\ht\shippingAddressBox>\z@
-       \@addtoplength{refvpos}{\dimexpr\ht\shippingAddressBox+\dp\shippingAddressBox}
-       \@addtoplength{refvpos}{4\baselineskip}%sep between address boxes
-       \fi
-}
+  \def\locationsep{:}
+
+  \NewDocumentCommand{\locationentry}{som}{
+    \Ifkomavarempty{#3}{}{
+      \IfBooleanTF {#1} {
+        \strut
+        \IfNoValueTF {#2}
+        {\usekomavar*{#3}}
+        {#2}
+        \locationsep
+        \hfill\strut\space
+        \hbox_set:Nn \l_tmpa_box {\usekomavar{#3}}
+        \dim_compare:nTF {\box_wd:N \l_tmpa_box>\linewidth}
+        {\newline\hspace*{\fill}\llap}
+        {\hspace*{\fill}}
+        {\box_use:N \l_tmpa_box\strut}
+      }{
+        \@hangfrom{\strut
+          \IfNoValueTF {#2}
+          {\usekomavar*{#3}}
+          {#2}\locationsep~
+        }{
+          \parbox[t]{\dimexpr\linewidth-\hangindent}{
+            \raggedleft
+            \usekomavar{#3}\strut
+          }
+        }
+      }
+    }
+    \par
+  }
+
+  \newkomafont{transaction}{\bfseries}
+
+  \setkomavar{location}{
+    \Ifkomavarempty{transaction}{}{{
+          \usekomafont{transaction}
+          \usekomavar{transaction}
+        }
+    }
+    \par
+    \medskip
+    \parbox{\useplength{locwidth}}{
+      \locationentry{date}
+      \locationentry{myref}
+      \locationentry{customer}
+      \locationentry{yourref}
+      \locationentry{delivery}
+      \locationentry{quote}
+      \locationentry{orderID}
+      \locationentry{projectID}
+      \locationentry[\ansprechpartner]{fromname}
+      \locationentry{fromphone}
+      \locationentry*{fromemail}
+    }
+  }
+  \removereffields
+  \AtBeginLetter{
+    \ifdim\ht\shippingAddressBox>\z@
+      \@addtoplength{refvpos}{\dimexpr\ht\shippingAddressBox+\dp\shippingAddressBox}
+      \@addtoplength{refvpos}{4\baselineskip}%sep between address boxes
+    \fi
+  }

 
 \fi
 
 
 \fi
 


@@ -614,35 +614,35 @@ contents={\usebox\shippingAddressBox}
 %Definitionen für die insettings.tex
 
 \newcommand*{\setupIdentpath}[1]{
 %Definitionen für die insettings.tex
 
 \newcommand*{\setupIdentpath}[1]{

-       \int_set:Nn \l_kivi_tmp_int {1}
-       \bool_set_true:N \l_kivi_tmp_bool
-       \bool_while_do:Nn \l_kivi_tmp_bool {
-               \file_if_exist:nTF {firma\int_use:N \l_kivi_tmp_int/ident.tex}
-               {
-                       \exp_args:Nf \str_if_in:nnTF {#1} {Firma\int_use:N \l_kivi_tmp_int}
-                       {
-                               \newcommand*{\identpath}{firma\int_use:N \l_kivi_tmpa_int}
-                               \bool_set_false:N \l_kivi_tmp_bool
-                       }
-                       {\int_incr:N \l_kivi_tmp_int}
-               }
-               {
-                       \bool_set_false:N \l_kivi_tmp_bool
-                       \newcommand*{\identpath}{firma}
-               }
-       }
+  \int_set:Nn \l_kivi_tmp_int {1}
+  \bool_set_true:N \l_kivi_tmp_bool
+  \bool_while_do:Nn \l_kivi_tmp_bool {
+    \file_if_exist:nTF {firma\int_use:N \l_kivi_tmp_int/ident.tex}
+    {
+      \exp_args:Nf \str_if_in:nnTF {#1} {Firma\int_use:N \l_kivi_tmp_int}
+      {
+        \newcommand*{\identpath}{firma\int_use:N \l_kivi_tmpa_int}
+        \bool_set_false:N \l_kivi_tmp_bool
+      }
+      {\int_incr:N \l_kivi_tmp_int}
+    }
+    {
+      \bool_set_false:N \l_kivi_tmp_bool
+      \newcommand*{\identpath}{firma}
+    }
+  }

 }
 
 \newcommand*{\setupCurrencyConfig}[2]{
 }
 
 \newcommand*{\setupCurrencyConfig}[2]{

-       \tl_new:N \g_kivi_currency_tl
-       \exp_args:Nf \str_if_in:nnT {#2} {USD} {\tl_gset:Nn \g_kivi_currency_tl {usd}}
-       \exp_args:Nf \str_if_in:nnT {#2} {CHF} {\tl_gset:Nn \g_kivi_currency_tl {chf}}
-       \exp_args:Nf \str_if_in:nnT {#2} {EUR} {\tl_gset:Nn \g_kivi_currency_tl {euro}}
-       \tl_if_empty:NT  \g_kivi_currency_tl {
-               \tl_gset:Nn \g_kivi_currency_tl {default}
-               \edef \currency {\tl_to_str:N \lxcurrency}
-       }
-       \input{#1/\g_kivi_currency_tl _account.tex}
+  \tl_new:N \g_kivi_currency_tl
+  \exp_args:Nf \str_if_in:nnT {#2} {USD} {\tl_gset:Nn \g_kivi_currency_tl {usd}}
+  \exp_args:Nf \str_if_in:nnT {#2} {CHF} {\tl_gset:Nn \g_kivi_currency_tl {chf}}
+  \exp_args:Nf \str_if_in:nnT {#2} {EUR} {\tl_gset:Nn \g_kivi_currency_tl {euro}}
+  \tl_if_empty:NT  \g_kivi_currency_tl {
+    \tl_gset:Nn \g_kivi_currency_tl {default}
+    \edef \currency {\tl_to_str:N \lxcurrency}
+  }
+  \input{#1/\g_kivi_currency_tl _account.tex}

 }
 
 \ExplSyntaxOff
 }
 
 \ExplSyntaxOff

diff --git a/templates/print/marei/kivitendo.sty b/templates/print/marei/kivitendo.sty
index 6e91e74fb0eb70319071935ccb277878011e67c1..4e6ed0b1a4782065855bc0d193ba65da7577b616 100644 (file)
--- a/templates/print/marei/kivitendo.sty
+++ b/templates/print/marei/kivitendo.sty
@@ -7,8 +7,8 @@
 \usepackage{iftex}
 %Compilerunabhängigkeit
 \ifPDFTeX
 \usepackage{iftex}
 %Compilerunabhängigkeit
 \ifPDFTeX

-       \usepackage[utf8]{inputenc}
-       \usepackage[T1]{fontenc}
+  \usepackage[utf8]{inputenc}
+  \usepackage[T1]{fontenc}

 \fi
 \usepackage{latexsym}
 \usepackage{longtable}
 \fi
 \usepackage{latexsym}
 \usepackage{longtable}


@@ -52,7 +52,7 @@
 \renewcommand*{\familydefault}{\sfdefault}
 \ifPDFTeX
 \else
 \renewcommand*{\familydefault}{\sfdefault}
 \ifPDFTeX
 \else

-\usepackage{fontspec}
+  \usepackage{fontspec}

 \fi
 
 %% Checkboxen
 \fi
 
 %% Checkboxen


@@ -143,17 +143,17 @@
 % Abschnitte mit Kasten hinterlegt
 
 \newcommand{\reqspecsectionstyle}{%
 % Abschnitte mit Kasten hinterlegt
 
 \newcommand{\reqspecsectionstyle}{%

-\renewcommand{\thesection}{\alph{section}}
-\makeatletter
-\def\section{\@ifstar\unnumberedsection\numberedsection}
-\makeatother
+  \renewcommand{\thesection}{\alph{section}}
+  \makeatletter
+  \def\section{\@ifstar\unnumberedsection\numberedsection}
+  \makeatother

 }
 
 \makeatletter
 \def\numberedsection{\@ifnextchar[%]
 }
 
 \makeatletter
 \def\numberedsection{\@ifnextchar[%]

-  \numberedsectionwithtwoarguments\numberedsectionwithoneargument}
+\numberedsectionwithtwoarguments\numberedsectionwithoneargument}

 \def\unnumberedsection{\@ifnextchar[%]
 \def\unnumberedsection{\@ifnextchar[%]

-  \unnumberedsectionwithtwoarguments\unnumberedsectionwithoneargument}
+\unnumberedsectionwithtwoarguments\unnumberedsectionwithoneargument}

 \def\numberedsectionwithoneargument#1{\numberedsectionwithtwoarguments[#1]{#1}}
 \def\unnumberedsectionwithoneargument#1{\unnumberedsectionwithtwoarguments[#1]{#1}}
 \def\numberedsectionwithtwoarguments[#1]#2{%
 \def\numberedsectionwithoneargument#1{\numberedsectionwithtwoarguments[#1]{#1}}
 \def\unnumberedsectionwithoneargument#1{\unnumberedsectionwithtwoarguments[#1]{#1}}
 \def\numberedsectionwithtwoarguments[#1]#2{%


@@ -174,7 +174,7 @@
   \endgroup
   \vskip 2ex\nobreak
   \addcontentsline{toc}{section}{\protect\numberline{\thesection{}.}#1}%
   \endgroup
   \vskip 2ex\nobreak
   \addcontentsline{toc}{section}{\protect\numberline{\thesection{}.}#1}%

-  }
+}

 \def\unnumberedsectionwithtwoarguments[#1]#2{%
   \ifhmode\par\fi
   \removelastskip
 \def\unnumberedsectionwithtwoarguments[#1]#2{%
   \ifhmode\par\fi
   \removelastskip

diff --git a/templates/print/marei/letter.tex b/templates/print/marei/letter.tex
index 1ea7a2d5b270038072bb2add3118f42d33646221..7ec5ef2a3eaf96bacba84c1cccd7b59eda9bf03f 100644 (file)
--- a/templates/print/marei/letter.tex
+++ b/templates/print/marei/letter.tex
@@ -34,12 +34,12 @@ $( IF letter.subject )$
 $( END )$
 
 \begin{letter}{
 $( END )$
 
 \begin{letter}{

-               $( KiviLatex.filter(customer.name) )$\strut\\
-               $( KiviLatex.filter(letter.contact.formal_greeting) )$\strut\\
-               $( KiviLatex.filter(customer.street) )$\strut\\
-               $( KiviLatex.filter(customer.zipcode) )$ $( KiviLatex.filter(customer.city) )$\strut\\
-               $( KiviLatex.filter(customer.country) )$%
-       }
+$( KiviLatex.filter(customer.name) )$\strut\\
+$( KiviLatex.filter(letter.contact.formal_greeting) )$\strut\\
+$( KiviLatex.filter(customer.street) )$\strut\\
+$( KiviLatex.filter(customer.zipcode) )$ $( KiviLatex.filter(customer.city) )$\strut\\
+$( KiviLatex.filter(customer.country) )$%
+}

 
 \opening{$( KiviLatex.filter(letter.greeting) )$}
 
 
 \opening{$( KiviLatex.filter(letter.greeting) )$}
 

diff --git a/templates/print/marei/pick_list.tex b/templates/print/marei/pick_list.tex
index 612fa0c82a3533caa03dde1e4fabf9597e0fb687..23736b55bb11435bd29d29c60b6eb44c0dbf4b44 100644 (file)
--- a/templates/print/marei/pick_list.tex
+++ b/templates/print/marei/pick_list.tex
@@ -13,59 +13,59 @@
 \setkomavar{title}{\sammelliste}
 
 \setkomavar{firsthead}{
 \setkomavar{title}{\sammelliste}
 
 \setkomavar{firsthead}{

-       \normalsize
-       \noindent\begin{tabular}[t]{@{}l@{}}
-               <%company%>\strut\\
-               <%address%>
-       \end{tabular}
-       \hfill
- \begin{tabular}[t]{rr@{}}
-               Tel & <%tel%>\\
-               Fax & <%fax%>%
-       \end{tabular}
-       \rule{\linewidth}{\heavyrulewidth}
+  \normalsize
+  \noindent\begin{tabular}[t]{@{}l@{}}
+    <%company%>\strut\\
+    <%address%>
+  \end{tabular}
+  \hfill
+  \begin{tabular}[t]{rr@{}}
+    Tel & < %tel%>\\
+    Fax & < %fax%>%
+  \end{tabular}
+  \rule{\linewidth}{\heavyrulewidth}

 }
 
 \makeatletter
 \setkomavar{location}{
 }
 
 \makeatletter
 \setkomavar{location}{

-       \normalsize
-       <%shiptocontact%>%
-       <%if shiptophone%>%
-       \\\textTelefon : <%shiptophone%>
-       <%end shiptophone%>%
-       <%if shiptofax%>%
-       \\\textFax : <%shiptofax%>
-       <%end shiptofax%>%
-       \\%
-       <%shiptoemail%>%
-       }
+  \normalsize
+  <%shiptocontact%>%
+  <%if shiptophone%>%
+  \\\textTelefon : <%shiptophone%>
+  <%end shiptophone%>%
+  <%if shiptofax%>%
+  \\\textFax : <%shiptofax%>
+  <%end shiptofax%>%
+  \\%
+  <%shiptoemail%>%
+}

 \makeatother
 
 \setkomavar{backaddress}{\lieferanschrift}
 
 \begin{letter}{\strut%
 \makeatother
 
 \setkomavar{backaddress}{\lieferanschrift}
 
 \begin{letter}{\strut%

-       <%shiptoname%>\ifhmode\\\fi
-       <%shiptostreet%>\ifhmode\\\fi
-       <%shiptozipcode%>\ifhmode\\\fi
-       <%shiptocity%>\ifhmode\\\fi
-       <%shiptocountry%>%
+<%shiptoname%>\ifhmode\\\fi
+<%shiptostreet%>\ifhmode\\\fi
+<%shiptozipcode%>\ifhmode\\\fi
+<%shiptocity%>\ifhmode\\\fi
+<%shiptocountry%>%

 }
 
 \opening{}
 
 
 \begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
 }
 
 \opening{}
 
 
 \begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt

-  <%if warehouse%>%
-  &\bfseries\lager%
-  <%end warehouse%>%
-  &\bfseries\lagerplatz&\bfseries\lieferungMit}]
+        <%if warehouse%>%
+        &\bfseries\lager%
+        <%end warehouse%>%
+        &\bfseries\lagerplatz&\bfseries\lieferungMit}]

   <%ordnumber%>%
   &%
   <%if shippingdate%>%
   <%ordnumber%>%
   &%
   <%if shippingdate%>%

-       <%shippingdate%>%
+  <%shippingdate%>%

   <%end shippingdate%>%
   <%if not shippingdate%>%
   <%end shippingdate%>%
   <%if not shippingdate%>%

-       <%orddate%>%
+  <%orddate%>%

   <%end shippingdate%>%
   & <%employee%>%
   <%if warehouse%>%
   <%end shippingdate%>%
   & <%employee%>%
   <%if warehouse%>%


@@ -77,10 +77,10 @@
 \bigskip
 
 \begin{SimpleTabular}[colspec=rlXrcll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\menge&\bfseries\lagerausgang&&\bfseries\lagerplatz}]%
 \bigskip
 
 \begin{SimpleTabular}[colspec=rlXrcll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\menge&\bfseries\lagerausgang&&\bfseries\lagerplatz}]%

-<%foreach number%>%
-<%runningnumber%> & <%number%> & <%description%> &%
-<%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\%
-<%end number%>%
+  <%foreach number%>%
+  <%runningnumber%> & <%number%> & <%description%> &%
+  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\%
+  <%end number%>%

 \end{SimpleTabular}
 
 \end{letter}
 \end{SimpleTabular}
 
 \end{letter}

diff --git a/templates/print/marei/proforma.tex b/templates/print/marei/proforma.tex
index b5396cd8f65e41776fdcb48e6de4dcbd03f2edba..6730a7ea1697697c77599cef0c33eff7cd46867b 100644 (file)
--- a/templates/print/marei/proforma.tex
+++ b/templates/print/marei/proforma.tex
@@ -17,100 +17,100 @@
 
 
 \begin{document}
 
 
 \begin{document}

-       
+

 \setkomavar{title}{
 \setkomavar{title}{

-       \proformarechnung~
-       \nr ~<%ordnumber%>%
+  \proformarechnung~
+  \nr ~<%ordnumber%>%

 }
 \setkomavar*{date}{\datum}
 
 \setkomavar{date}{<%orddate%>}
 \setkomavar{customer}{<%customernumber%>}
 <%if cusordnumber%>%
 }
 \setkomavar*{date}{\datum}
 
 \setkomavar{date}{<%orddate%>}
 \setkomavar{customer}{<%customernumber%>}
 <%if cusordnumber%>%

-       \setkomavar*{yourref}{\ihreBestellnummer}
-       \setkomavar{yourref}{<%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%>}
 <%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%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
 <%if shiptoname%>%
 \makeatletter
 \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%>%
-       }
+  \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%>%
 
 \begin{letter}{
 \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{
 
 % 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%>,
-                       }
-               }
-               \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
 
 \auftragsformel

- 
+

 \begin{PricingTabular*}%
 \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}%
+  % 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%>%
 \end{PricingTabular*}
 
 <%if notes%>%

diff --git a/templates/print/marei/purchase_delivery_order.tex b/templates/print/marei/purchase_delivery_order.tex
index 07488775b209f36f43b55838796c74587498d91d..e84430e9ae613a1f4c2e393070ddc4222b8d87a2 100644 (file)
--- a/templates/print/marei/purchase_delivery_order.tex
+++ b/templates/print/marei/purchase_delivery_order.tex
@@ -67,13 +67,13 @@
 
 
 \begin{letter}{
 
 
 \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

 }
 
 
 }
 
 


@@ -81,23 +81,23 @@
 \thispagestyle{kivitendo.letter.first}
 
 \begin{PricingTabular*}[columns={pos,amount,desc}]
 \thispagestyle{kivitendo.letter.first}
 
 \begin{PricingTabular*}[columns={pos,amount,desc}]

-% eigentliche Tabelle
-\FakeTable{
-<%foreach number%>%
-       <%runningnumber%> &
-       <%qty%> <%unit%> &
-       \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%>%
-               <%foreach si_number%>%
-                       <%if si_chargenumber%>\ExtraDescription{\charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%><%si_qty%>~<%si_unit%><%end si_chargenumber%>}%
-               <%end si_number%>%
-       \tabularnewline
-<%end number%>%
-}
+  % eigentliche Tabelle
+  \FakeTable{
+  <%foreach number%>%
+  <%runningnumber%> &
+  <%qty%> <%unit%> &
+  \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%>%
+    <%foreach si_number%>%
+    <%if si_chargenumber%>\ExtraDescription{\charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%><%si_qty%>~<%si_unit%><%end si_chargenumber%>}%
+    <%end si_number%>%
+    \tabularnewline
+    <%end number%>%
+  }

 \end{PricingTabular*}
 
 \medskip
 \end{PricingTabular*}
 
 \medskip


@@ -108,7 +108,7 @@
 <%end if%>%
 
 <%if delivery_term%>%
 <%end if%>%
 
 <%if delivery_term%>%

-  \lieferung ~<%delivery_term.description_long%>\\
+\lieferung ~<%delivery_term.description_long%>\\

 <%end delivery_term%>%
 
 \end{letter}
 <%end delivery_term%>%
 
 \end{letter}

diff --git a/templates/print/marei/purchase_order.tex b/templates/print/marei/purchase_order.tex
index 677e2abd6c7018e7e27f8f4bc68292db938bfb26..36eda4fb0cd4117e0b5b9a5bf1719d15aa5743b0 100644 (file)
--- a/templates/print/marei/purchase_order.tex
+++ b/templates/print/marei/purchase_order.tex
@@ -62,58 +62,58 @@
 \begin{document}
 
 \begin{letter}{
 \begin{document}
 
 \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{
 
 % 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}
 
 \bestellformel
 
 \begin{PricingTabular*}
 \thispagestyle{kivitendo.letter.first}
 
 \bestellformel
 
 \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%>%
 \end{PricingTabular*}
 
 <%if notes%>%


@@ -122,7 +122,7 @@
 <%end if%>%
 
 <%if delivery_term%>%
 <%end if%>%
 
 <%if delivery_term%>%

-  \lieferung ~<%delivery_term.description_long%>\\
+\lieferung ~<%delivery_term.description_long%>\\

 <%end delivery_term%>%
 
 \closing{\gruesse}
 <%end delivery_term%>%
 
 \closing{\gruesse}

diff --git a/templates/print/marei/receipt.tex b/templates/print/marei/receipt.tex
index 2725140977c785aa00638e5c7a499b16dd2a761b..2d55cbde0167a51a90dd16a0e8c6c60ad9607e05 100644 (file)
--- a/templates/print/marei/receipt.tex
+++ b/templates/print/marei/receipt.tex
@@ -31,11 +31,11 @@
 \begin{document}
 
 \begin{letter}{
 \begin{document}
 
 \begin{letter}{

-               <%name%>\ifhmode\\\fi
-               <%street%>\ifhmode\\\fi
-               <%zipcode%> <%city%>\ifhmode\\\fi
-               <%country%>%
-       }
+<%name%>\ifhmode\\\fi
+<%street%>\ifhmode\\\fi
+<%zipcode%> <%city%>\ifhmode\\\fi
+<%country%>%
+}

 
 \opening{<%company%>}
 \pagestyle{empty}
 
 \opening{<%company%>}
 \pagestyle{empty}


@@ -43,9 +43,9 @@
 <%name%> \hfill <%datepaid%> \hfill <%source%>%
 
 \begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]
 <%name%> \hfill <%datepaid%> \hfill <%source%>%
 
 \begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]

-<%foreach invnumber%>%
-<%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
-<%end invnumber%>%
+  <%foreach invnumber%>%
+  <%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
+  <%end invnumber%>%

 \end{SimpleTabular}
 
 \end{letter}
 \end{SimpleTabular}
 
 \end{letter}

diff --git a/templates/print/marei/request_quotation.tex b/templates/print/marei/request_quotation.tex
index 963173598ac6129065ebd48bf58dd7a92d0e23c3..38478845d71b2c65ca206f536fc66da09eb2169a 100644 (file)
--- a/templates/print/marei/request_quotation.tex
+++ b/templates/print/marei/request_quotation.tex
@@ -35,48 +35,48 @@
 \begin{document}
 
 \begin{letter}{
 \begin{document}
 
 \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{
 
 % 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}
 
 \anfrageformel
 
 \begin{PricingTabular*}[columns={pos,amount,desc}]
 \thispagestyle{kivitendo.letter.first}
 
 \anfrageformel
 
 \begin{PricingTabular*}[columns={pos,amount,desc}]

-% eigentliche Tabelle
-\FakeTable{
-<%foreach number%>%
-       <%runningnumber%> &
-       <%qty%> <%unit%> &
-       \textbf{<%description%>}
-       <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-       <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-       <%if make%>%
-               <%foreach make%>%
-                       \Ifstr{<%make%>}{<%name%>}{\ExtraDescription{\artikelnummer: <%model%>}}{}
-               <%end foreach%>%
-       <%end if%>%
-       \tabularnewline
-<%end number%>%
-}%
+  % eigentliche Tabelle
+  \FakeTable{
+  <%foreach number%>%
+  <%runningnumber%> &
+  <%qty%> <%unit%> &
+  \textbf{<%description%>}
+  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+  <%if make%>%
+  <%foreach make%>%
+  \Ifstr{<%make%>}{<%name%>}{\ExtraDescription{\artikelnummer: <%model%>}}{}
+    <%end foreach%>%
+    <%end if%>%
+    \tabularnewline
+    <%end number%>%
+  }%

 \end{PricingTabular*}
 
 
 \end{PricingTabular*}
 
 


@@ -87,7 +87,7 @@
 
 
 <%if delivery_term%>%
 
 
 <%if delivery_term%>%

-  \lieferung ~<%delivery_term.description_long%>\\
+\lieferung ~<%delivery_term.description_long%>\\

 <%end delivery_term%>%
 
 <%if reqdate%>%
 <%end delivery_term%>%
 
 <%if reqdate%>%

diff --git a/templates/print/marei/requirement_spec.tex b/templates/print/marei/requirement_spec.tex
index 1d22e9cbc8a0b2e14b6fcfcc4167b87267976993..d8fb2e5dce8ec8264b208a71f6324a480912e73b 100644 (file)
--- a/templates/print/marei/requirement_spec.tex
+++ b/templates/print/marei/requirement_spec.tex
@@ -45,10 +45,10 @@ $( KiviLatex.required_packages_for_html )$
       \Large
       $( KiviLatex.filter(rspec.title) )$
       \normalsize
       \Large
       $( KiviLatex.filter(rspec.title) )$
       \normalsize

-%$( IF rspec.version )$
+      %$( IF rspec.version )$

 
 

-    Version $( KiviLatex.filter(rspec.version.version_number) )$
-%$( END )$
+      Version $( KiviLatex.filter(rspec.version.version_number) )$
+      %$( END )$

     \end{minipage}%
   }
 \end{picture}
     \end{minipage}%
   }
 \end{picture}


@@ -69,19 +69,19 @@ $( KiviLatex.required_packages_for_html )$
 %$( SET working_copy     = rspec.working_copy_id ? rspec.working_copy : rspec )$
 %$( SET versioned_copies = rspec.version ? working_copy.versioned_copies_sorted(max_version_number = rspec.version.version_number) : working_copy.versioned_copies_sorted )$
 %$( IF !versioned_copies.size )$
 %$( SET working_copy     = rspec.working_copy_id ? rspec.working_copy : rspec )$
 %$( SET versioned_copies = rspec.version ? working_copy.versioned_copies_sorted(max_version_number = rspec.version.version_number) : working_copy.versioned_copies_sorted )$
 %$( IF !versioned_copies.size )$

-  Bisher wurden noch keine Versionen angelegt.
+Bisher wurden noch keine Versionen angelegt.

 %$( ELSE )$
 \begin{longtable}{|p{2cm}|p{2cm}|p{12cm}|}
   \hline
 %$( ELSE )$
 \begin{longtable}{|p{2cm}|p{2cm}|p{12cm}|}
   \hline

-  \multicolumn{1}{|r}{\small Version} &
-  \multicolumn{1}{|r|}{\small Datum} &
-  \small Beschreibung\\
+  \multicolumn{1}{|r}{\small Version}                                                                                &
+  \multicolumn{1}{|r|}{\small Datum}                                                                                 &
+  \small Beschreibung                                                                                                  \\

   \hline
   \hline

-%$( FOREACH versioned_copy = versioned_copies )$
-   \multicolumn{1}{|r}{\small $( KiviLatex.filter(versioned_copy.version.version_number) )$} &
-   \multicolumn{1}{|r|}{\small $( KiviLatex.filter(versioned_copy.version.itime.to_kivitendo(precision='minute')) )$} &
-   \small $( KiviLatex.filter(versioned_copy.version.description) )$\\
-%$( END )$
+  %$( FOREACH versioned_copy = versioned_copies )$
+  \multicolumn{1}{|r}{\small $( KiviLatex.filter(versioned_copy.version.version_number) )$}                          &
+  \multicolumn{1}{|r|}{\small $( KiviLatex.filter(versioned_copy.version.itime.to_kivitendo(precision='minute')) )$} &
+  \small $( KiviLatex.filter(versioned_copy.version.description) )$                                                    \\
+  %$( END )$

   \hline
 \end{longtable}
 %$( END )$
   \hline
 \end{longtable}
 %$( END )$


@@ -93,7 +93,7 @@ $( KiviLatex.required_packages_for_html )$
   \centering
   \includegraphics[width=$( width_cm )$cm,keepaspectratio]{$( picture.print_file_name )$}
 
   \centering
   \includegraphics[width=$( width_cm )$cm,keepaspectratio]{$( picture.print_file_name )$}
 

-\mbox{Abbildung $( picture.number )$: $( KiviLatex.filter(picture.description ? picture.description : picture.picture_file_name) )$}
+  \mbox{Abbildung $( picture.number )$: $( KiviLatex.filter(picture.description ? picture.description : picture.picture_file_name) )$}

 \end{figure}
 %$( END )$
 
 \end{figure}
 %$( END )$
 


@@ -101,13 +101,13 @@ $( KiviLatex.required_packages_for_html )$
 %  $( SET text_blocks = rspec.text_blocks_sorted(output_position=output_position) )$
 %  $( IF text_blocks.size )$
 
 %  $( SET text_blocks = rspec.text_blocks_sorted(output_position=output_position) )$
 %  $( IF text_blocks.size )$
 

-  \newpage
+\newpage

 
 

-  \section{$( heading )$}
+\section{$( heading )$}

 
 %    $( FOREACH text_block = text_blocks )$
 
 
 %    $( FOREACH text_block = text_blocks )$
 

-    \subsection{$( KiviLatex.filter(text_block.title) )$}
+\subsection{$( KiviLatex.filter(text_block.title) )$}

 
 $( KiviLatex.filter_html(text_block.text_as_restricted_html) )$
 
 
 $( KiviLatex.filter_html(text_block.text_as_restricted_html) )$
 


@@ -132,31 +132,31 @@ $( PROCESS text_block_outputter output_position=0 heading='Allgemeines' )$
 
 %$( FOREACH top_item = rspec.sections_sorted )$
 
 
 %$( FOREACH top_item = rspec.sections_sorted )$
 

-  \subsection{Abschnitt $( KiviLatex.filter(top_item.fb_number) )$: $( KiviLatex.filter(top_item.title) )$}
+\subsection{Abschnitt $( KiviLatex.filter(top_item.fb_number) )$: $( KiviLatex.filter(top_item.title) )$}

 
 %  $( IF top_item.description )$
 
 %  $( IF top_item.description )$

-    $( KiviLatex.filter_html(top_item.description_as_restricted_html.replace('\r', '').replace('\n+\Z', '')) )$
+$( KiviLatex.filter_html(top_item.description_as_restricted_html.replace('\r', '').replace('\n+\Z', '')) )$

 
 

-    \vspace{0.5cm}
+\vspace{0.5cm}

 %  $( END )$
 %  $( FOREACH item = top_item.children_sorted )$
 \parbox[t]{1.0cm}{\textcolor{kivitendodarkred}{$>>>$}}%
 \parbox[t]{15.0cm}{%
 %  $( END )$
 %  $( FOREACH item = top_item.children_sorted )$
 \parbox[t]{1.0cm}{\textcolor{kivitendodarkred}{$>>>$}}%
 \parbox[t]{15.0cm}{%

-\begin{longtable}{p{2.8cm}p{11.7cm}}
-  Funktionsblock & $( KiviLatex.filter(item.fb_number) )$\\
-  Beschreibung & $( KiviLatex.filter_html(item.description_as_restricted_html) )$\\
-  Abhängigkeiten & $( KiviLatex.filter(item.presenter.requirement_spec_item_dependency_list) )$
-\end{longtable}}
+  \begin{longtable}{p{2.8cm}p{11.7cm}}
+    Funktionsblock & $( KiviLatex.filter(item.fb_number) )$                                       \\
+    Beschreibung   & $( KiviLatex.filter_html(item.description_as_restricted_html) )$             \\
+    Abhängigkeiten & $( KiviLatex.filter(item.presenter.requirement_spec_item_dependency_list) )$
+  \end{longtable}}

 
 %    $( FOREACH sub_item = item.children_sorted )$
 \hspace*{1.15cm}\rule{15.2cm}{0.2pt}\\
 \hspace*{1.0cm}%
 \parbox[t]{15.0cm}{%
 
 %    $( FOREACH sub_item = item.children_sorted )$
 \hspace*{1.15cm}\rule{15.2cm}{0.2pt}\\
 \hspace*{1.0cm}%
 \parbox[t]{15.0cm}{%

-\begin{longtable}{p{2.8cm}p{11.7cm}}
-  Unterfunktionsblock & $( KiviLatex.filter(sub_item.fb_number) )$\\
-  Beschreibung & $( KiviLatex.filter_html(sub_item.description_as_restricted_html) )$\\
-  Abhängigkeiten & $( KiviLatex.filter(sub_item.presenter.requirement_spec_item_dependency_list) )$
-\end{longtable}}
+  \begin{longtable}{p{2.8cm}p{11.7cm}}
+    Unterfunktionsblock & $( KiviLatex.filter(sub_item.fb_number) )$                                       \\
+    Beschreibung        & $( KiviLatex.filter_html(sub_item.description_as_restricted_html) )$             \\
+    Abhängigkeiten      & $( KiviLatex.filter(sub_item.presenter.requirement_spec_item_dependency_list) )$
+  \end{longtable}}

 
 %    $( END )$
 
 
 %    $( END )$
 

diff --git a/templates/print/marei/sales_delivery_order.tex b/templates/print/marei/sales_delivery_order.tex
index 657abd973e749d4271c09fc98f146122b98f3f38..69916eae0e53ee14988597bc4590a5b25ee87b9d 100644 (file)
--- a/templates/print/marei/sales_delivery_order.tex
+++ b/templates/print/marei/sales_delivery_order.tex
@@ -43,47 +43,47 @@
 \begin{document}
 
 \begin{letter}{
 \begin{document}
 
 \begin{letter}{

-  \Ifstr{<%shiptoname%>}{}{ % KEINE ABWEICHENDE LIEFERADRESSE
-       <%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
-  }{ % ABWEICHENDE LIEFERADRESSE (Aus Stammdaten oder Beleg)
-       <%shiptoname%>\strut\\
-       <%if shiptocontact%> <%shiptocontact%><%end if%>\strut\\
-       <%shiptodepartment_1%>\strut\\
-       <%shiptodepartment_2%>\strut\\
-       <%shiptostreet%>\strut\\
-       <%shiptozipcode%> <%shiptocity%>\strut
-       } % ende ifthenelse LIEFERADRESSE
+\Ifstr{<%shiptoname%>}{}{ % KEINE ABWEICHENDE LIEFERADRESSE
+  <%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
+}{ % ABWEICHENDE LIEFERADRESSE (Aus Stammdaten oder Beleg)
+  <%shiptoname%>\strut\\
+  <%if shiptocontact%> <%shiptocontact%><%end if%>\strut\\
+  <%shiptodepartment_1%>\strut\\
+  <%shiptodepartment_2%>\strut\\
+  <%shiptostreet%>\strut\\
+  <%shiptozipcode%> <%shiptocity%>\strut
+} % ende ifthenelse LIEFERADRESSE

 }
 
 \opening{}
 \thispagestyle{kivitendo.letter.first}
 
 \begin{PricingTabular*}[columns={pos, id, desc, amount}]
 }
 
 \opening{}
 \thispagestyle{kivitendo.letter.first}
 
 \begin{PricingTabular*}[columns={pos, id, desc, amount}]

-% 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%>%
-               <%foreach si_number%>%
-                       <%if si_chargenumber%>\ExtraDescription{\charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%><%si_qty%>~<%si_unit%><%end si_chargenumber%>}%
-               <%end si_number%>%
-       &
-               <%qty%> <%unit%>%
-       \tabularnewline
-<%end number%>%
-}
+  % 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%>%
+    <%foreach si_number%>%
+    <%if si_chargenumber%>\ExtraDescription{\charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%><%si_qty%>~<%si_unit%><%end si_chargenumber%>}%
+    <%end si_number%>%
+    &
+    <%qty%> <%unit%>%
+    \tabularnewline
+    <%end number%>%
+  }

 \end{PricingTabular*}
 
 \medskip
 \end{PricingTabular*}
 
 \medskip


@@ -94,7 +94,7 @@
 <%end if%>%
 
 <%if delivery_term%>%
 <%end if%>%
 
 <%if delivery_term%>%

-  \lieferung ~<%delivery_term.description_long%>\\
+\lieferung ~<%delivery_term.description_long%>\\

 <%end delivery_term%>%
 
 \end{letter}
 <%end delivery_term%>%
 
 \end{letter}

diff --git a/templates/print/marei/sales_order.tex b/templates/print/marei/sales_order.tex
index 6bb10c5b78b615add7ee4d095f6c140a2a746728..d809224b0c333b84918e8ae8571d2934d417e9c6 100644 (file)
--- a/templates/print/marei/sales_order.tex
+++ b/templates/print/marei/sales_order.tex
@@ -62,58 +62,58 @@
 \begin{document}
 
 \begin{letter}{
 \begin{document}
 
 \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{
 
 % 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}
 
 \auftragsformel
 
 \begin{PricingTabular*}
 \thispagestyle{kivitendo.letter.first}
 
 \auftragsformel
 
 \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%>%
 \end{PricingTabular*}
 
 <%if notes%>%


@@ -122,7 +122,7 @@
 <%end if%>%
 
 <%if delivery_term%>%
 <%end if%>%
 
 <%if delivery_term%>%

-  \lieferung ~<%delivery_term.description_long%>\\
+\lieferung ~<%delivery_term.description_long%>\\

 <%end delivery_term%>%
 
 <%if reqdate%>%
 <%end delivery_term%>%
 
 <%if reqdate%>%

diff --git a/templates/print/marei/sales_quotation.tex b/templates/print/marei/sales_quotation.tex
index 0190046d614fa85718217e18bbec3b1510e63c7d..d6e03c87950ac36eae8432357b21d4259eaa4cdd 100644 (file)
--- a/templates/print/marei/sales_quotation.tex
+++ b/templates/print/marei/sales_quotation.tex
@@ -19,9 +19,9 @@
 \begin{document}
 
 \setkomavar{signature}{%
 \begin{document}
 
 \setkomavar{signature}{%

-<%employee_company%>%
-\ifhmode\\\fi
-<%salesman_name%>%
+  <%employee_company%>%
+  \ifhmode\\\fi
+  <%salesman_name%>%

 }
 
 \setkomavar*{date}{\datum}
 }
 
 \setkomavar*{date}{\datum}


@@ -32,98 +32,98 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{

-       \angebot~
-       <%quonumber%>%
+  \angebot~
+  <%quonumber%>%

 }
 
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if shiptoname%>%
 \makeatletter
 }
 
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if shiptoname%>%
 \makeatletter

-  \begin{lrbox}\shippingAddressBox
+\begin{lrbox}\shippingAddressBox

   \parbox{\useplength{toaddrwidth}}{
   \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}{
 \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{
 }
 
 % 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*}
 \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%>%
 \end{PricingTabular*}
 
 <%if notes%>%

-  <%notes%>%
-  \medskip
+<%notes%>%
+\medskip

 <%end if%>%
 
 <%if delivery_term%>%
 <%end if%>%
 
 <%if delivery_term%>%

-  \lieferung ~<%delivery_term.description_long%>\\
+\lieferung ~<%delivery_term.description_long%>\\

 <%end delivery_term%>%
 
 \angebotdanke\\
 <%end delivery_term%>%
 
 \angebotdanke\\


@@ -138,11 +138,11 @@
 \closing{\gruesse}
 
 \begin{minipage}{\textwidth}
 \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}
 
 
 \end{minipage}
 
 

diff --git a/templates/print/marei/statement.tex b/templates/print/marei/statement.tex
index bfde48e389a6294a957cc7e57bf01ca8dbf1f572..8f6064d6926956663c7259d2378b5dbc5b1b3597 100644 (file)
--- a/templates/print/marei/statement.tex
+++ b/templates/print/marei/statement.tex
@@ -29,46 +29,46 @@
 \begin{document}
 
 \begin{letter}{
 \begin{document}
 
 \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{
 
 % 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}
 
 \sammelrechnungsformel
 
 \begin{SimpleTabular}[
 \thispagestyle{kivitendo.letter.first}
 
 \sammelrechnungsformel
 
 \begin{SimpleTabular}[

-       colspec=l*6X,
-       headline={\bfseries\rechnung~\nr & \bfseries\datum & \bfseries\faellig &
-       \bfseries\aktuell & \bfseries\asDreissig & \bfseries\asSechzig & \bfseries\asNeunzig}
-]
-% eigentliche Tabelle
-<%foreach invnumber%>%
-       <%invnumber%> & <%invdate%> & <%duedate%> &
-       <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
-<%end invnumber%>%
-% Tabellenende letzte Seite
-\midrule[\heavyrulewidth]
-\multicolumn{3}{@{}l}{\bfseries\zwischensumme} & \bfseries<%c0total%> & \bfseries<%c30total%> & \bfseries<%c60total%> & \bfseries<%c90total%>\\*
-\midrule
-\multicolumn{3}{@{}l}{\bfseries\schlussbetrag} & &&&\bfseries<%total%> \\
+    colspec=l*6X,
+    headline={\bfseries\rechnung~\nr & \bfseries\datum & \bfseries\faellig &
+        \bfseries\aktuell & \bfseries\asDreissig & \bfseries\asSechzig & \bfseries\asNeunzig}
+  ]
+  % eigentliche Tabelle
+  <%foreach invnumber%>%
+  <%invnumber%> & <%invdate%> & <%duedate%> &
+  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
+  <%end invnumber%>%
+  % Tabellenende letzte Seite
+  \midrule[\heavyrulewidth]
+  \multicolumn{3}{@{}l}{\bfseries\zwischensumme} & \bfseries<%c0total%> & \bfseries<%c30total%> & \bfseries<%c60total%> & \bfseries<%c90total%>\\*
+  \midrule
+  \multicolumn{3}{@{}l}{\bfseries\schlussbetrag} & &&&\bfseries<%total%> \\

 \end{SimpleTabular}
 
 \closing{\gruesse}
 \end{SimpleTabular}
 
 \closing{\gruesse}

diff --git a/templates/print/marei/zahlungserinnerung.tex b/templates/print/marei/zahlungserinnerung.tex
index 09293ee7752f910295bef55562eeddfb8f4dcb99..749e1f3e03ddef4af7201abb002391df6eebc3c4 100644 (file)
--- a/templates/print/marei/zahlungserinnerung.tex
+++ b/templates/print/marei/zahlungserinnerung.tex
@@ -30,36 +30,36 @@
 \begin{document}
 
 \begin{letter}{
 \begin{document}
 
 \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{
 
 % 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}
 
 \mahnungsformel
 
 \begin{SimpleTabular}[headline=\bfseries\rechnung~\nr&\bfseries\datum&\bfseries\betrag,colspec=rXr<{\tabcurrency}]
 \thispagestyle{kivitendo.letter.first}
 
 \mahnungsformel
 
 \begin{SimpleTabular}[headline=\bfseries\rechnung~\nr&\bfseries\datum&\bfseries\betrag,colspec=rXr<{\tabcurrency}]

-% eigentliche Tabelle
-<%foreach dn_invnumber%>%
-    <%dn_invnumber%> & <%dn_transdate%> & <%dn_amount%> \\[0.1cm]
-<%end dn_invnumber%>%
+  % eigentliche Tabelle
+  <%foreach dn_invnumber%>%
+  <%dn_invnumber%> & <%dn_transdate%> & <%dn_amount%> \\[0.1cm]
+  <%end dn_invnumber%>%

 \end{SimpleTabular}
 
 
 \end{SimpleTabular}
 
 

diff --git a/templates/print/marei/zahlungserinnerung_invoice.tex b/templates/print/marei/zahlungserinnerung_invoice.tex
index da7de4bd1f432a26b26219d25a84ef00aabf7267..1f330be3ef293f80f856efbdb6e55df4ffb670cf 100644 (file)
--- a/templates/print/marei/zahlungserinnerung_invoice.tex
+++ b/templates/print/marei/zahlungserinnerung_invoice.tex
@@ -36,36 +36,36 @@
 
 
 \begin{letter}{
 
 
 \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{
 
 % 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}
 
 \mahnungsrechnungsformel
 
 \begin{SimpleTabular}[colspec=Xr<{\tabcurrency},headline={\bfseries\posten& \bfseries\betrag}]
 \thispagestyle{kivitendo.letter.first}
 
 \mahnungsrechnungsformel
 
 \begin{SimpleTabular}[colspec=Xr<{\tabcurrency},headline={\bfseries\posten& \bfseries\betrag}]

-       Mahngebühren & <%fee%> \\
-       Zinsen & <%interest%> \\
-       \midrule[\heavyrulewidth]
-       \multicolumn{1}{@{}l}{\schlussbetrag}& <%invamount%>\\
+  Mahngebühren & <%fee%> \\
+  Zinsen & <%interest%> \\
+  \midrule[\heavyrulewidth]
+  \multicolumn{1}{@{}l}{\schlussbetrag}& <%invamount%>\\

 \end{SimpleTabular}
 
 \smallskip
 \end{SimpleTabular}
 
 \smallskip