marei: remove leftover tabs

diff --git a/templates/print/marei/check.tex b/templates/print/marei/check.tex
index 2d55cbde0167a51a90dd16a0e8c6c60ad9607e05..ad428f7de707a00426917bb58c6ec4959f396861 100644 (file)
--- a/templates/print/marei/check.tex
+++ b/templates/print/marei/check.tex
@@ -16,15 +16,15 @@
 \setplength{firstheadvpos}{4cm}
 
 \setkomavar{firsthead}{
 \setplength{firstheadvpos}{4cm}
 
 \setkomavar{firsthead}{

-       \noindent\begin{tabular}[t]{@{}l@{}}
-               <%company%>\strut\\
-               <%address%>
-       \end{tabular}
-       \hfill
-       <%source%>\par
-       \medskip
-       <%text\_amount%> \dotfill <%decimal%>/100 \par\smallskip
-       \hfill <%datepaid%> \hspace{2cm}\strut<%amount%>
+  \noindent\begin{tabular}[t]{@{}l@{}}
+    <%company%>\strut\\
+    <%address%>
+  \end{tabular}
+  \hfill
+  <%source%>\par
+  \medskip
+  <%text\_amount%> \dotfill <%decimal%>/100 \par\smallskip
+  \hfill <%datepaid%> \hspace{2cm}\strut<%amount%>

 }
 
 
 }
 
 

diff --git a/templates/print/marei/credit_note.tex b/templates/print/marei/credit_note.tex
index aadd3ab135aaa446568297d6f3f134810ea19427..b3b3071f0d400e5eeff055b5016b017e04b0260f 100644 (file)
--- a/templates/print/marei/credit_note.tex
+++ b/templates/print/marei/credit_note.tex
@@ -16,19 +16,19 @@
 \ourhead{\kundennummer}{<%customernumber%>}{\gutschrift}{<%invnumber%>}{<%invdate%>}
 
 \setkomavar*{date}{\datum}
 \ourhead{\kundennummer}{<%customernumber%>}{\gutschrift}{<%invnumber%>}{<%invdate%>}
 
 \setkomavar*{date}{\datum}

-\setkomavar{date}{<%transdate%>}       
+\setkomavar{date}{<%transdate%>}

 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{

-       \gutschrift~
-       \nr ~<%invnumber%>%
+  \gutschrift~
+  \nr ~<%invnumber%>%

 }
 
 <%if invnumber_for_credit_note%>%
 }
 
 <%if invnumber_for_credit_note%>%

-       \setkomavar*{myref}{\fuerRechnung}
-       \setkomavar{myref}{<%invnumber_for_credit_note%>}
+  \setkomavar*{myref}{\fuerRechnung}
+  \setkomavar{myref}{<%invnumber_for_credit_note%>}

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


@@ -36,21 +36,21 @@
 <%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%>%
 \end{lrbox}
 \makeatother
 <%end if%>%

diff --git a/templates/print/marei/deutsch.tex b/templates/print/marei/deutsch.tex
index bf24eeb134a18986f088ecb20cc8e74d215aef65..7373d70608a6ab3e522af4f327cfca400f75bd49 100644 (file)
--- a/templates/print/marei/deutsch.tex
+++ b/templates/print/marei/deutsch.tex
@@ -49,7 +49,7 @@
 \newcommand{\angebot} {Angebot}
 \newcommand{\angebotsformel} {gerne unterbreiten wir Ihnen folgendes Angebot:}
 \newcommand{\angebotdanke} {Wir danken für Ihre Anfrage und hoffen, Ihnen hiermit ein interessantes Angebot gemacht zu haben.}
 \newcommand{\angebot} {Angebot}
 \newcommand{\angebotsformel} {gerne unterbreiten wir Ihnen folgendes Angebot:}
 \newcommand{\angebotdanke} {Wir danken für Ihre Anfrage und hoffen, Ihnen hiermit ein interessantes Angebot gemacht zu haben.}

-\newcommand{\angebotgueltig} {Das Angebot ist freibleibend gültig bis zum}            %Danach wird das Datum eingefügt, falls das grammatisch nicht funktionieren sollte müssen wir eine ausnahme für die sprache definieren
+\newcommand{\angebotgueltig} {Das Angebot ist freibleibend gültig bis zum}% Danach wird das Datum eingefügt, falls das grammatisch nicht funktionieren sollte müssen wir eine ausnahme für die sprache definieren

 \newcommand{\angebotfragen} {Sollten Sie noch Fragen oder Änderungswünsche haben, können Sie uns gerne jederzeit unter den unten genannten Telefonnummern oder E-Mail-Adressen kontaktieren.}
 \newcommand{\angebotagb} {Bei der Durchführung des Auftrags gelten unsere AGB, die wir Ihnen gerne zuschicken.}
 \newcommand{\auftragerteilt}{Auftrag erteilt:}
 \newcommand{\angebotfragen} {Sollten Sie noch Fragen oder Änderungswünsche haben, können Sie uns gerne jederzeit unter den unten genannten Telefonnummern oder E-Mail-Adressen kontaktieren.}
 \newcommand{\angebotagb} {Bei der Durchführung des Auftrags gelten unsere AGB, die wir Ihnen gerne zuschicken.}
 \newcommand{\auftragerteilt}{Auftrag erteilt:}

diff --git a/templates/print/marei/english.tex b/templates/print/marei/english.tex
index 13f2a9ee4df11d78913d89b8a4975714c65a922f..c5be2c570b37f51fa25d98834bdc849ad5de301e 100644 (file)
--- a/templates/print/marei/english.tex
+++ b/templates/print/marei/english.tex
@@ -48,7 +48,7 @@
 \newcommand{\angebot} {Quotation}
 \newcommand{\angebotsformel} {we are pleased to make the following offer:}
 \newcommand{\angebotdanke} {We thank you for your request and look forward to receiving your order.}
 \newcommand{\angebot} {Quotation}
 \newcommand{\angebotsformel} {we are pleased to make the following offer:}
 \newcommand{\angebotdanke} {We thank you for your request and look forward to receiving your order.}

-\newcommand{\angebotgueltig} {This offer is valid until}               %Danach wird das Datum eingefügt, falls das grammatisch nicht funktionieren sollte müssen wir eine ausnahme für die sprache definieren
+\newcommand{\angebotgueltig} {This offer is valid until}% Danach wird das Datum eingefügt, falls das grammatisch nicht funktionieren sollte müssen wir eine Ausnahme für die Sprache definieren

 \newcommand{\angebotfragen} {If you have any questions do not hesitate to conatct us.}
 \newcommand{\angebotagb} {Our general terms and conditions (AGB) apply. We will send them to you on request.}
 \newcommand{\auftragerteilt}{Order confirmed:}
 \newcommand{\angebotfragen} {If you have any questions do not hesitate to conatct us.}
 \newcommand{\angebotagb} {Our general terms and conditions (AGB) apply. We will send them to you on request.}
 \newcommand{\auftragerteilt}{Order confirmed:}

diff --git a/templates/print/marei/insettings.tex b/templates/print/marei/insettings.tex
index 6cc8add0e6819af941a4927c75cee289e3580d4b..937255c2649df23fd4f228d52e17161291f65275 100644 (file)
--- a/templates/print/marei/insettings.tex
+++ b/templates/print/marei/insettings.tex
@@ -23,7 +23,7 @@
 
 %Ganzseitiger Briefbogen als Hintergrund:
 %\DeclareNewLayer[page,background,
 
 %Ganzseitiger Briefbogen als Hintergrund:
 %\DeclareNewLayer[page,background,

-%      contents={\includegraphics{Briefbogen}} %Hier muss der Dateinamen und ggf. die Bildgröße angepasst werden, falls es abweichende Maße vom Papierformat hat.
+%  contents={\includegraphics{Briefbogen}} %Hier muss der Dateinamen und ggf. die Bildgröße angepasst werden, falls es abweichende Maße vom Papierformat hat.

 %]{background}
 %\AddLayersToPageStyle{kivitendo.letter.first}{background}%Hintergrund für die erste Seite aktivieren
 %\AddLayersToPageStyle{kivitendo.letter}{background}% Hintergrund für die übrigen Briefseiten aktivieren.
 %]{background}
 %\AddLayersToPageStyle{kivitendo.letter.first}{background}%Hintergrund für die erste Seite aktivieren
 %\AddLayersToPageStyle{kivitendo.letter}{background}% Hintergrund für die übrigen Briefseiten aktivieren.


@@ -105,11 +105,11 @@
     \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@{}}%
     \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
+      \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}
     \end{tabular*}
     % Ende des Fußzeileninhaltes.
   \end{lrbox}


@@ -123,8 +123,8 @@
   \setlength{\footskip}{\dimexpr\footheight+\baselineskip}
   \geometry{
     includefoot,
   \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
+    %  bottom=1cm,% Falls der untere Rand kleiner sein soll, als die Seitenränder.
+    %   Weitere Anpassungen der Ränder sind hier ebenfalls möglich

   }
 
 \fi
   }
 
 \fi

diff --git a/templates/print/marei/invoice.tex b/templates/print/marei/invoice.tex
index b434e0b9400a7407da874f50b2b184ccf9744d6f..9a7aa65af9677c48ff9052cf3be62642bb9210f2 100644 (file)
--- a/templates/print/marei/invoice.tex
+++ b/templates/print/marei/invoice.tex
@@ -22,18 +22,18 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{

-       \rechnung~ \nr ~<%invnumber%>%
+  \rechnung~ \nr ~<%invnumber%>%

 }
 <%if ordnumber%>%
 }
 <%if ordnumber%>%

-       \setkomavar*{myref}{\auftragsnummer}
-       \setkomavar{myref}{<%ordnumber%>}
+  \setkomavar*{myref}{\auftragsnummer}
+  \setkomavar{myref}{<%ordnumber%>}

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

-       \setkomavar*{yourref}{\ihreBestellnummer}
-       \setkomavar{yourref}{<%cusordnumber%>}
+  \setkomavar*{yourref}{\ihreBestellnummer}
+  \setkomavar{yourref}{<%cusordnumber%>}

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

-       \setkomavar{delivery}{<%donumber%>}
+  \setkomavar{delivery}{<%donumber%>}

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


@@ -43,21 +43,21 @@
 <%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%>%
 \end{lrbox}
 \makeatother
 <%end if%>%

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index 0705c0db1038969c0559f40a1e25a9d594954e03..0ea2005326f45b83e4f7202ceb26348f30b678a8 100644 (file)
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -212,23 +212,23 @@
 \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}};
+  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}};

 },
 },

-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,
+  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,%


@@ -341,14 +341,14 @@ parbox=false,
 
 \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}


@@ -393,16 +393,18 @@ p{\l_kivi_tab_desc_dim}
 
 %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

 }{
 }{

-\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

diff --git a/templates/print/marei/purchase_delivery_order.tex b/templates/print/marei/purchase_delivery_order.tex
index e84430e9ae613a1f4c2e393070ddc4222b8d87a2..123eef8c65dad46d36c4f6419b7386f20bb72c2e 100644 (file)
--- a/templates/print/marei/purchase_delivery_order.tex
+++ b/templates/print/marei/purchase_delivery_order.tex
@@ -22,19 +22,19 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{

-       \einkaufslieferschein~\nr ~<%donumber%>%
+  \einkaufslieferschein~\nr ~<%donumber%>%

 }
 <%if ordnumber%>
 }
 <%if ordnumber%>

-       \setkomavar{orderID}{<%ordnumber%>}
+  \setkomavar{orderID}{<%ordnumber%>}

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

-       \setkomavar*{yourref}{\unsereBestellnummer}
-       \setkomavar{yourref}{<%cusordnumber%>}
+  \setkomavar*{yourref}{\unsereBestellnummer}
+  \setkomavar{yourref}{<%cusordnumber%>}

 <%end if%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if globalprojectnumber%>%
 <%end if%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if globalprojectnumber%>%

-       \setkomavar{projectID}{<%globalprojectnumber%>}
+  \setkomavar{projectID}{<%globalprojectnumber%>}

 <%end globalprojectnumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}
 <%end globalprojectnumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}


@@ -43,21 +43,21 @@
 <%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%>%
 \end{lrbox}
 \makeatother
 <%end if%>%

diff --git a/templates/print/marei/purchase_order.tex b/templates/print/marei/purchase_order.tex
index 36eda4fb0cd4117e0b5b9a5bf1719d15aa5743b0..9c8d610f09819122fd2bbf3d17e1447e5c4d48a1 100644 (file)
--- a/templates/print/marei/purchase_order.tex
+++ b/templates/print/marei/purchase_order.tex
@@ -23,38 +23,38 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{

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

 }
 
 <%if cusordnumber%>%
 }
 
 <%if cusordnumber%>%

-       \setkomavar*{yourref}{\unsereBestellnummer}
-       \setkomavar{yourref}{<%cusordnumber%>}
+  \setkomavar*{yourref}{\unsereBestellnummer}
+  \setkomavar{yourref}{<%cusordnumber%>}

 <%end if%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if quonumber%>
 <%end if%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if quonumber%>

-       \setkomavar{quote}{<%quonumber%>}
+  \setkomavar{quote}{<%quonumber%>}

 <%end if%>%
 
 <%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
 <%end if%>%
 
 <%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox

-       \parbox{\useplength{toaddrwidth}}{
-               \backaddr@format{\scriptsize\usekomafont{backaddress}%
-                       \strut abweichende Lieferadresse
-               }
-               \par\smallskip
-               \setlength{\parskip}{\z@}
-               \par
-               \normalsize
-               <%shiptoname%>\par
-               <%if shiptocontact%> <%shiptocontact%><%end if%>\par
-               <%shiptodepartment_1%>\par
-               <%shiptodepartment_2%>\par
-               <%shiptostreet%>\par
-               <%shiptozipcode%> <%shiptocity%>%
-       }
+  \parbox{\useplength{toaddrwidth}}{
+    \backaddr@format{\scriptsize\usekomafont{backaddress}%
+      \strut abweichende Lieferadresse
+    }
+    \par\smallskip
+    \setlength{\parskip}{\z@}
+    \par
+    \normalsize
+    <%shiptoname%>\par
+    <%if shiptocontact%> <%shiptocontact%><%end if%>\par
+    <%shiptodepartment_1%>\par
+    <%shiptodepartment_2%>\par
+    <%shiptostreet%>\par
+    <%shiptozipcode%> <%shiptocity%>%
+  }

 \end{lrbox}
 \makeatother
 <%end if%>%
 \end{lrbox}
 \makeatother
 <%end if%>%

diff --git a/templates/print/marei/receipt.tex b/templates/print/marei/receipt.tex
index 2d55cbde0167a51a90dd16a0e8c6c60ad9607e05..ad428f7de707a00426917bb58c6ec4959f396861 100644 (file)
--- a/templates/print/marei/receipt.tex
+++ b/templates/print/marei/receipt.tex
@@ -16,15 +16,15 @@
 \setplength{firstheadvpos}{4cm}
 
 \setkomavar{firsthead}{
 \setplength{firstheadvpos}{4cm}
 
 \setkomavar{firsthead}{

-       \noindent\begin{tabular}[t]{@{}l@{}}
-               <%company%>\strut\\
-               <%address%>
-       \end{tabular}
-       \hfill
-       <%source%>\par
-       \medskip
-       <%text\_amount%> \dotfill <%decimal%>/100 \par\smallskip
-       \hfill <%datepaid%> \hspace{2cm}\strut<%amount%>
+  \noindent\begin{tabular}[t]{@{}l@{}}
+    <%company%>\strut\\
+    <%address%>
+  \end{tabular}
+  \hfill
+  <%source%>\par
+  \medskip
+  <%text\_amount%> \dotfill <%decimal%>/100 \par\smallskip
+  \hfill <%datepaid%> \hspace{2cm}\strut<%amount%>

 }
 
 
 }
 
 

diff --git a/templates/print/marei/request_quotation.tex b/templates/print/marei/request_quotation.tex
index 38478845d71b2c65ca206f536fc66da09eb2169a..0cfc11934a752e45c536eb245d76fffee968710c 100644 (file)
--- a/templates/print/marei/request_quotation.tex
+++ b/templates/print/marei/request_quotation.tex
@@ -23,11 +23,11 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{

-       \anfrage~
-       \nr ~<%quonumber%>%
+  \anfrage~
+  \nr ~<%quonumber%>%

 }
 <%if globalprojectnumber%>%
 }
 <%if globalprojectnumber%>%

-       \setkomavar{projectID}{<%globalprojectnumber%>}
+  \setkomavar{projectID}{<%globalprojectnumber%>}

 <%end globalprojectnumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}
 <%end globalprojectnumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}

diff --git a/templates/print/marei/sales_delivery_order.tex b/templates/print/marei/sales_delivery_order.tex
index 69916eae0e53ee14988597bc4590a5b25ee87b9d..2811e50c771a1aa56bfd7860b70f38fcbe75ff04 100644 (file)
--- a/templates/print/marei/sales_delivery_order.tex
+++ b/templates/print/marei/sales_delivery_order.tex
@@ -21,20 +21,20 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{

-       \lieferschein~
-       \nr~<%donumber%>%
+  \lieferschein~
+  \nr~<%donumber%>%

 }
 <%if ordnumber%>
 }
 <%if ordnumber%>

-       \setkomavar{orderID}{<%ordnumber%>}
+  \setkomavar{orderID}{<%ordnumber%>}

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

-       \setkomavar*{yourref}{\unsereBestellnummer}
-       \setkomavar{yourref}{<%cusordnumber%>}
+  \setkomavar*{yourref}{\unsereBestellnummer}
+  \setkomavar{yourref}{<%cusordnumber%>}

 <%end if%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if globalprojectnumber%>%
 <%end if%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if globalprojectnumber%>%

-       \setkomavar{projectID}{<%globalprojectnumber%>}
+  \setkomavar{projectID}{<%globalprojectnumber%>}

 <%end globalprojectnumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}
 <%end globalprojectnumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}

diff --git a/templates/print/marei/sales_order.tex b/templates/print/marei/sales_order.tex
index d809224b0c333b84918e8ae8571d2934d417e9c6..23c4a45c280464e05679947732e837fc908cc3f2 100644 (file)
--- a/templates/print/marei/sales_order.tex
+++ b/templates/print/marei/sales_order.tex
@@ -24,37 +24,37 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{

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

 }
 <%if cusordnumber%>%
 }
 <%if cusordnumber%>%

-       \setkomavar*{yourref}{\ihreBestellnummer}
-       \setkomavar{yourref}{<%cusordnumber%>}
+  \setkomavar*{yourref}{\ihreBestellnummer}
+  \setkomavar{yourref}{<%cusordnumber%>}

 <%end if%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if quonumber%>
 <%end if%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if quonumber%>

-       \setkomavar{quote}{<%quonumber%>}
+  \setkomavar{quote}{<%quonumber%>}

 <%end if%>%
 
 <%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
 <%end if%>%
 
 <%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox

-       \parbox{\useplength{toaddrwidth}}{
-               \backaddr@format{\scriptsize\usekomafont{backaddress}%
-                       \strut abweichende Lieferadresse
-               }
-               \par\smallskip
-               \setlength{\parskip}{\z@}
-               \par
-               \normalsize
-               <%shiptoname%>\par
-               <%if shiptocontact%> <%shiptocontact%><%end if%>\par
-               <%shiptodepartment_1%>\par
-               <%shiptodepartment_2%>\par
-               <%shiptostreet%>\par
-               <%shiptozipcode%> <%shiptocity%>%
-       }
+  \parbox{\useplength{toaddrwidth}}{
+    \backaddr@format{\scriptsize\usekomafont{backaddress}%
+      \strut abweichende Lieferadresse
+    }
+    \par\smallskip
+    \setlength{\parskip}{\z@}
+    \par
+    \normalsize
+    <%shiptoname%>\par
+    <%if shiptocontact%> <%shiptocontact%><%end if%>\par
+    <%shiptodepartment_1%>\par
+    <%shiptodepartment_2%>\par
+    <%shiptostreet%>\par
+    <%shiptozipcode%> <%shiptocity%>%
+  }

 \end{lrbox}
 \makeatother
 <%end if%>%
 \end{lrbox}
 \makeatother
 <%end if%>%

diff --git a/templates/print/marei/statement.tex b/templates/print/marei/statement.tex
index 8f6064d6926956663c7259d2378b5dbc5b1b3597..7cd91a020304afc4f8cb332b6e2175ec07aebbe0 100644 (file)
--- a/templates/print/marei/statement.tex
+++ b/templates/print/marei/statement.tex
@@ -17,8 +17,8 @@
 
 
 \setkomavar{title}{
 
 
 \setkomavar{title}{

-       \sammelrechnung~
-       \nr~<%quonumber%>%
+  \sammelrechnung~
+  \nr~<%quonumber%>%

 }
 \setkomavar{transaction}{<%transaction_description%>}
 \setkomavar{customer}{<%customernumber%>}
 }
 \setkomavar{transaction}{<%transaction_description%>}
 \setkomavar{customer}{<%customernumber%>}

diff --git a/templates/print/marei/zahlungserinnerung.tex b/templates/print/marei/zahlungserinnerung.tex
index 749e1f3e03ddef4af7201abb002391df6eebc3c4..abb601f78c9afb9997881cab0d1385b5baef7aa9 100644 (file)
--- a/templates/print/marei/zahlungserinnerung.tex
+++ b/templates/print/marei/zahlungserinnerung.tex
@@ -22,8 +22,8 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{

-       \mahnung
-       <%if dunning_id%>~\nr~<%dunning_id%><%end if%>%
+  \mahnung
+  <%if dunning_id%>~\nr~<%dunning_id%><%end if%>%

 }
 \setkomavar{transaction}{<%transaction_description%>}
 
 }
 \setkomavar{transaction}{<%transaction_description%>}
 

diff --git a/templates/print/marei/zahlungserinnerung_invoice.tex b/templates/print/marei/zahlungserinnerung_invoice.tex
index 1f330be3ef293f80f856efbdb6e55df4ffb670cf..9acdeab47c05722d5bf0ebaf5fc9014c0edf721b 100644 (file)
--- a/templates/print/marei/zahlungserinnerung_invoice.tex
+++ b/templates/print/marei/zahlungserinnerung_invoice.tex
@@ -22,13 +22,13 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{

-       \rechnung~
-       \nr ~<%invnumber%>%
+  \rechnung~
+  \nr ~<%invnumber%>%

 }
 \setkomavar*{myref}{\mahnung~\nr}
 \setkomavar{myref}{<%dunning_id%>}
 <%if globalprojectnumber%>%
 }
 \setkomavar*{myref}{\mahnung~\nr}
 \setkomavar{myref}{<%dunning_id%>}
 <%if globalprojectnumber%>%

-       \setkomavar{projectID}{<%globalprojectnumber%>}
+  \setkomavar{projectID}{<%globalprojectnumber%>}

 <%end globalprojectnumber%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%end globalprojectnumber%>%
 \setkomavar{transaction}{<%transaction_description%>}