marei: switch to dtx generated files
authorMarei (peiTeX) <marei@peitex.de>
Fri, 25 Sep 2020 19:06:44 +0000 (21:06 +0200)
committerJan Büren <jan@kivitendo.de>
Wed, 21 Oct 2020 11:42:04 +0000 (13:42 +0200)
12 files changed:
templates/print/marei/credit_note.tex
templates/print/marei/invoice.tex
templates/print/marei/kiviletter.sty
templates/print/marei/proforma.tex
templates/print/marei/purchase_delivery_order.tex
templates/print/marei/purchase_order.tex
templates/print/marei/request_quotation.tex
templates/print/marei/sales_delivery_order.tex
templates/print/marei/sales_order.tex
templates/print/marei/statement.tex
templates/print/marei/zahlungserinnerung.tex
templates/print/marei/zahlungserinnerung_invoice.tex

index a9f6719..63b2f77 100644 (file)
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\gutschrift}{<%invnumber%>}{<%invdate%>}
 
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%transdate%>}       
+\setkomavar{customer}{<%customernumber%>}
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+       \gutschrift~
+       \nr ~<%invnumber%>%
+}
+
+<%if invnumber_for_credit_note%>%
+       \setkomavar*{myref}{\fuerRechnung}
+       \setkomavar{myref}{<%invnumber_for_credit_note%>}
+<%end if%>%
+
 
-\begin{document}
-       
 
 <%if shiptoname%>%
 \makeatletter
 \makeatother
 <%end if%>%
 
-       
-\setkomavar{title}{
-       \gutschrift~
-       \nr ~<%invnumber%>%
-}
-
-<%if invnumber_for_credit_note%>%
-\setkomavar*{myref}{\fuerRechnung}
-\setkomavar{myref}{<%invnumber_for_credit_note%>}
-<%end if%>%
-
-\setkomavar*{date}{\datum}
+\begin{document}
 
-\setkomavar{date}{<%transdate%>}
-\setkomavar{customer}{<%customernumber%>}
-\setkomavar{fromname}{<%employee_name%>}
-\setkomavar{fromphone}{<%employee_tel%>}
-\setkomavar{fromemail}{<%employee_email%>}
-       
 \begin{letter}{
                <%name%>\strut\\
                <%if department_1%><%department_1%>\\<%end if%>%
@@ -80,8 +77,8 @@
                                {\anredefrau}
                                {\anredeherr}
                                <%cp_title%> <%cp_name%>,
-                       }
                }
+       }
 \thispagestyle{kivitendo.letter.first}
 
 
@@ -91,9 +88,9 @@
 % eigentliche Tabelle%
 \FakeTable{%
        <%foreach number%>%
-       <%runningnumber%> &%
-       <%number%> &%
-       \textbf{<%description%>}%
+               <%runningnumber%> &%
+               <%number%> &%
+               \textbf{<%description%>}%
                <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
                <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
                <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
                <%qty%> <%unit%> &%
                <%sellprice%>&%
                \ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
-                       <%linetotal%>\tabularnewline
-                       <%end number%>%
+               <%linetotal%>\tabularnewline%
+       <%end number%>%
        }%
        \begin{PricingTotal}%
                % Tabellenende letzte Seite
index 3c88f8b..44a03f6 100644 (file)
@@ -15,9 +15,7 @@
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\rechnung}{<%invnumber%>}{<%invdate%>}
 
-
 \setkomavar*{date}{\rechnungsdatum}
-
 \setkomavar{date}{<%invdate%>}
 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
        \rechnung~ \nr ~<%invnumber%>%
 }
 <%if ordnumber%>%
-\setkomavar*{myref}{\auftragsnummer}
-\setkomavar{myref}{<%ordnumber%>}
+       \setkomavar*{myref}{\auftragsnummer}
+       \setkomavar{myref}{<%ordnumber%>}
 <%end if%>%
 <%if cusordnumber%>%
-\setkomavar*{yourref}{\ihreBestellnummer}
-\setkomavar{yourref}{<%cusordnumber%>}
+       \setkomavar*{yourref}{\ihreBestellnummer}
+       \setkomavar{yourref}{<%cusordnumber%>}
 <%end if%>%
 <%if donumber%>%
-  \setkomavar{delivery}{<%donumber%>}
+       \setkomavar{delivery}{<%donumber%>}
 <%end if%>%
+
 <%if quonumber%>%
 \setkomavar{quote}{<%quonumber%>}
 <%end if%>%
@@ -85,8 +84,8 @@
                                {\anredefrau}
                                {\anredeherr}
                                <%cp_title%> <%cp_name%>,
-                       }
                }
+       }
 \thispagestyle{kivitendo.letter.first}
 
 <%if notes%>%
 % id = false, % deaktiviert die Spalte der Artikelnummer
 % 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}
+\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}%
 \end{PricingTabular*}
 
 \vspace{0.2cm}
 
 \closing{\gruesse}
 
-
 \end{letter}
 
 \end{document}
index adcdddb..7ed1d09 100644 (file)
@@ -193,6 +193,7 @@ contents={\usebox\shippingAddressBox}
 
 \newcolumntype{P}[1]{>{\raggedleft\arraybackslash}p{#1}<{\__kivi_tab_column_currency:}}
 
+
 \RequirePackage{tcolorbox}
 \tcbuselibrary{breakable, skins}
 
index 4151dc6..e7dc8b9 100644 (file)
 
 \auftragsformel
  
-\begin{PricingTabular*}
-\FakeTable{
+\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 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
+       <%linetotal%>\tabularnewline%
        <%end number%>%
-}
-% Tabellenende letzte Seite
-       \begin{PricingTotal}
-       % Tabellenende letzte Seite
-       \nettobetrag & <%subtotal%>\\
+}%
+\begin{PricingTotal}%
+       % Tabellenende letzte Seite%
+       \nettobetrag & <%subtotal%>\\%
        <%foreach tax%>%
-       <%taxdescription%> & <%tax%>\\
+       <%taxdescription%> & <%tax%>\\%
        <%end tax%>%
-       \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
-\end{PricingTotal}
+       \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
+\end{PricingTotal}%
 \end{PricingTabular*}
 
 <%if notes%>%
index 4d370da..9d236b7 100644 (file)
 % laufende Kopfzeile:
 \ourhead{}{}{\einkaufslieferschein}{<%donumber%>}{<%dodate%>}
 
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%dodate%>}
+
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+       \einkaufslieferschein~\nr ~<%donumber%>%
+}
+<%if ordnumber%>
+       \setkomavar{orderID}{<%ordnumber%>}
+<%end if%>%
+<%if cusordnumber%>%
+       \setkomavar*{yourref}{\unsereBestellnummer}
+       \setkomavar{yourref}{<%cusordnumber%>}
+<%end if%>%
+\setkomavar{transaction}{<%transaction_description%>}
 
-\begin{document}
-
-\begin{minipage}[t]{8cm}
-  \scriptsize
-
-  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
-  \normalsize
-
-  \vspace*{0.3cm}
-
-  <%name%>%
-
-  <%if department_1%><%department_1%><%end if%>%
-
-  <%if department_2%><%department_2%><%end if%>%
-
-  <%cp_givenname%> <%cp_name%>%
-
-  <%street%>%
-
-  ~
-
-  <%zipcode%> <%city%>%
-
-  <%country%>%
-\end{minipage}
-\hfill
-\begin{minipage}{6cm}
-  \rightline{\LARGE\textbf{\textit{\einkaufslieferschein}}} \vspace*{0.2cm}
-  \rightline{\large\textbf{\textit{\nr ~<%donumber%>%
-  }}} \vspace*{0.2cm}
-
-  \datum:\hfill <%dodate%>%
-
-  <%if cusordnumber%>\unsereBestellnummer:\hfill <%cusordnumber%><%end if%>%
+<%if globalprojectnumber%>%
+       \setkomavar{projectID}{<%globalprojectnumber%>}
+<%end globalprojectnumber%>%
 
-  <%if ordnumber%>\auftragsnummer:\hfill <%ordnumber%><%end if%>%
+\setkomavar{transaction}{<%transaction_description%>}
+\setkomafont{extraDescription}{\scriptsize}
 
-  \ansprechpartner:\hfill <%employee_name%>%
+<%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%>%
+       }
+\end{lrbox}
+\makeatother
+<%end if%>%
 
-  <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>%
-\end{minipage}
 
-<%if shiptoname%>%
-  \vspace{0.8cm}
-  \scriptsize \underline{\abweichendeLieferadresse:}\\
-  \normalsize    <%shiptoname%>%
+\begin{document}
 
-                 <%if shiptocontact%> <%shiptocontact%><%end if%>%
 
-                 <%shiptodepartment_1%>%
+\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
+}
 
-                  <%shiptodepartment_2%>%
 
-                  <%shiptostreet%>%
+\opening{}
+\thispagestyle{kivitendo.letter.first}
 
-                  <%shiptozipcode%> <%shiptocity%>%
-<%end if%>%
-\vspace*{1.5cm}
-
-
-%
-% - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
-%   Übertrag machen
-% - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
-%   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
-%   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
-%
-\begin{SimpleTabular}
+\begin{PricingTabular*}[columns={pos,amount,desc}]
 % eigentliche Tabelle
+\FakeTable{
 <%foreach number%>%
-          <%runningnumber%> &
-          <%qty%> <%unit%> &
-          \textbf{<%description%>} \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
-
-          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>%
-          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>%
-          <%if reqdate%> && \scriptsize \lieferdatum: <%reqdate%>\\<%end reqdate%>%
-          <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>%
-          <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>%
-          <%foreach si_number%><%if si_chargenumber%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>%
-
-          \\[-0.8em]
+       <%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{SimpleTabular}
+}
+\end{PricingTabular*}
 
-\vspace{0.2cm}
+\medskip
 
 <%if notes%>%
-        \vspace{5mm}
-        <%notes%>%
-        \vspace{5mm}
+<%notes%>%
+\medskip
 <%end if%>%
 
 <%if delivery_term%>%
   \lieferung ~<%delivery_term.description_long%>\\
 <%end delivery_term%>%
 
+\end{letter}
+
 \end{document}
index d04ff31..b250e8b 100644 (file)
 \ourhead{}{}{\bestellung}{<%ordnumber%>}{<%orddate%>}
 
 
-\begin{document}
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%orddate%>}
 
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
        \bestellung~
        \nr~<%ordnumber%>%
 }
-\setkomavar*{date}{\datum}
-\setkomavar{date}{<%orddate%>}
+
 <%if cusordnumber%>%
-\setkomavar*{yourref}{\unsereBestellnummer}
-\setkomavar{yourref}{<%cusordnumber%>}
+       \setkomavar*{yourref}{\unsereBestellnummer}
+       \setkomavar{yourref}{<%cusordnumber%>}
 <%end if%>%
-<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
-\setkomavar{fromname}{<%employee_name%>}
-\setkomavar{fromphone}{<%employee_tel%>}
-\setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{transaction}{<%transaction_description%>}
 
+<%if quonumber%>
+       \setkomavar{quote}{<%quonumber%>}
+<%end if%>%
+
 <%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
@@ -56,6 +59,7 @@
 \makeatother
 <%end if%>%
 
+\begin{document}
 
 \begin{letter}{
                <%name%>\strut\\
 % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
 \opening{
        \ifstr{<%cp_name%>}{}
-               {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-               {
+       {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+       {
                \ifstr{<%cp_gender%>}{f}
                        {\anredefrau}
                        {\anredeherr}
                        <%cp_title%> <%cp_name%>,
-               }
+       }
 }
 \thispagestyle{kivitendo.letter.first}
 
@@ -86,7 +90,7 @@
 \begin{PricingTabular*}
        % eigentliche Tabelle
        \FakeTable{
-               <%foreach number%>%
+       <%foreach number%>%
                <%runningnumber%> &%
                <%number%> &%
                \textbf{<%description%>}%
                <%sellprice%>&%
                \ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
                <%linetotal%>\tabularnewline
-               <%end number%>%
-       }
-       \begin{PricingTotal}
+       <%end number%>%
+       }%
+       \begin{PricingTotal}%
                % Tabellenende letzte Seite
-               \nettobetrag & <%subtotal%>\\
+               \nettobetrag & <%subtotal%>\\%
                <%foreach tax%>%
-               <%taxdescription%> & <%tax%>\\
+               <%taxdescription%> & <%tax%>\\%
                <%end tax%>%
-               \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
+               \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
        \end{PricingTotal}
 \end{PricingTabular*}
 
index 82e9779..a5dda1a 100644 (file)
@@ -16,9 +16,7 @@
 \ourhead{}{}{\anfrage}{<%quonumber%>}{<%transdate%>}
 
 
-\begin{document}
 \setkomavar*{date}{\datum}
-
 \setkomavar{date}{<%transdate%>}
 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
 <%if globalprojectnumber%>%
        \setkomavar{projectID}{<%globalprojectnumber%>}
 <%end globalprojectnumber%>%
+
 \setkomavar{transaction}{<%transaction_description%>}
 
+\begin{document}
+
 \begin{letter}{
                <%name%>\strut\\
                <%if department_1%><%department_1%>\\<%end if%>%
 
 \anfrageformel
 
-
-%
-% - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
-%   Übertrag machen
-% - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
-%   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
-%   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
-%
-\setlength\LTleft\parindent     % Tabelle beginnt am linken Textrand
-\setlength\LTright{0pt}         % Tabelle endet am rechten Textrand
-\begin{longtable}{@{}rrp{14cm}@{\extracolsep{\fill}}@{}}
-% Tabellenkopf
-\hline
-\textbf{\position} & \textbf{\menge} & \textbf{\bezeichnung} \\
-\hline\\
-\endhead
-
-% Tabellenkopf erste Seite
-\hline
-\textbf{\position} & \textbf{\menge} & \textbf{\bezeichnung} \\
-\hline\\[-0.5em]
-\endfirsthead
-
-% Tabellenende
-\\
-\multicolumn{3}{@{}r@{}}{\weiteraufnaechsterseite}
-\endfoot
-
-% Tabellenende letzte Seite
-\hline\\
-\endlastfoot
-
+\begin{PricingTabular*}[columns={pos,amount,desc}]
 % eigentliche Tabelle
+\FakeTable{
 <%foreach number%>%
-          <%runningnumber%> &
-          <%qty%> <%unit%> &
-          \textbf{<%description%>} \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
-
-          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>%
-%          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>%
-          <%if make%>%
-            <%foreach make%>%
-              \ifstr{<%make%>}{<%name%>}{&& \artikelnummer: <%model%>\\}{}
-            <%end foreach%>%
-          <%end if%>%
-
-          \\[-0.8em]
+       <%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{longtable}
 
 <%if notes%>%
 <%notes%>%
index 5e9684e..0f90f14 100644 (file)
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\lieferschein}{<%donumber%>}{<%dodate%>}
 
-
-\begin{document}
-
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%dodate%>}
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
        \lieferschein~
        \nr~<%donumber%>%
 }
-\setkomavar*{date}{\datum}
-\setkomavar{date}{<%dodate%>}
+<%if ordnumber%>
+       \setkomavar{orderID}{<%ordnumber%>}
+<%end if%>%
 <%if cusordnumber%>%
        \setkomavar*{yourref}{\unsereBestellnummer}
        \setkomavar{yourref}{<%cusordnumber%>}
 <%end if%>%
-<%if ordnumber%>\setkomavar{orderID}{<%ordnumber%>}<%end if%>%
-\setkomavar{fromname}{<%employee_name%>}
-\setkomavar{fromphone}{<%employee_tel%>}
-\setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{transaction}{<%transaction_description%>}
+
 <%if globalprojectnumber%>%
-  \setkomavar{projectID}{<%globalprojectnumber%>}
+       \setkomavar{projectID}{<%globalprojectnumber%>}
 <%end globalprojectnumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}
-
 \setkomafont{extraDescription}{\scriptsize}
 
+\begin{document}
+
 \begin{letter}{
   \ifstr{<%shiptoname%>}{}{ % KEINE ABWEICHENDE LIEFERADRESSE
        <%name%>\strut\\
        } % ende ifthenelse LIEFERADRESSE
 }
 
-\opening{}%muss existieren, damit seitenstil erzeugt wird.
+\opening{}
+\thispagestyle{kivitendo.letter.first}
 
 \begin{PricingTabular*}[columns={pos, id, desc, amount}]
 % eigentliche Tabelle
 \FakeTable{
 <%foreach number%>%
-          <%runningnumber%> &
-          <%number%> &
-          \textbf{<%description%>}&
-          <%qty%> <%unit%>%
-          <%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
+       <%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*}
 
-
-
-
-
-\vspace{0.2cm}
+\medskip
 
 <%if notes%>%
 <%notes%>%
 \medskip
 <%end if%>%
 
-
 <%if delivery_term%>%
   \lieferung ~<%delivery_term.description_long%>\\
 <%end delivery_term%>%
index 7eac6ae..12df080 100644 (file)
 \ourhead{\kundennummer}{<%customernumber%>}{\auftragsbestaetigung}{<%ordnumber%>}{<%orddate%>}
 
 
-\begin{document}
-\setkomavar{title}{
-       \auftragsbestaetigung~
-       \nr~<%ordnumber%>%
-}
+
 \setkomavar*{date}{\datum}
 \setkomavar{date}{<%orddate%>}
-<%if cusordnumber%>%
-\setkomavar*{yourref}{\ihreBestellnummer}
-\setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>%
-<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+       \auftragsbestaetigung~
+       \nr~<%ordnumber%>%
+}
+<%if cusordnumber%>%
+       \setkomavar*{yourref}{\ihreBestellnummer}
+       \setkomavar{yourref}{<%cusordnumber%>}
+<%end if%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
-
+<%if quonumber%>
+       \setkomavar{quote}{<%quonumber%>}
+<%end if%>%
 
 <%if shiptoname%>%
 \makeatletter
@@ -58,6 +59,8 @@
 \makeatother
 <%end if%>%
 
+\begin{document}
+
 \begin{letter}{
                <%name%>\strut\\
                <%if department_1%><%department_1%>\\<%end if%>%
@@ -87,7 +90,7 @@
 \begin{PricingTabular*}
        % eigentliche Tabelle
        \FakeTable{
-               <%foreach number%>%
+       <%foreach number%>%
                <%runningnumber%> &%
                <%number%> &%
                \textbf{<%description%>}%
                <%sellprice%>&%
                \ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
                <%linetotal%>\tabularnewline
-               <%end number%>%
-       }
-       \begin{PricingTotal}
+       <%end number%>%
+       }%
+       \begin{PricingTotal}%
                % Tabellenende letzte Seite
-               \nettobetrag & <%subtotal%>\\
+               \nettobetrag & <%subtotal%>\\%
                <%foreach tax%>%
-               <%taxdescription%> & <%tax%>\\
+               <%taxdescription%> & <%tax%>\\%
                <%end tax%>%
-               \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
+               \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
        \end{PricingTotal}
 \end{PricingTabular*}
 
 \end{letter}
 
 \end{document}
-
index 76c1944..c5bcc6d 100644 (file)
@@ -16,8 +16,6 @@
 \ourhead{}{}{\sammelrechnung}{}{}
 
 
-\begin{document}
-
 \setkomavar{title}{
        \sammelrechnung~
        \nr~<%quonumber%>%
@@ -28,6 +26,7 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 
+\begin{document}
 
 \begin{letter}{
                <%name%>\strut\\
 
 \sammelrechnungsformel
 
-%
-% - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
-%   Übertrag machen
-%
-\setlength\LTleft\parindent     % Tabelle beginnt am linken Textrand
-\setlength\LTright{0pt}         % Tabelle endet am rechten Textrand
-\begin{longtable}{@{\extracolsep{\fill}}rrrrrrr@{}}
-% Tabellenkopf
-\hline
-\textbf{\rechnung~\nr} & \textbf{\datum} & \textbf{\faellig} &
-\textbf{\aktuell} & \textbf{\asDreissig} & \textbf{\asSechzig} & \textbf{\asNeunzig}\\
-\hline\\
-\endhead
-
-% Tabellenkopf erste Seite
-\hline
-\textbf{\rechnung~\nr} & \textbf{\datum} & \textbf{\faellig} &
-\textbf{\aktuell} & \textbf{\asDreissig} & \textbf{\asSechzig} & \textbf{\asNeunzig}\\
-\hline\\[-0.5em]
-\endfirsthead
-
-% Tabellenende
-\\
-\multicolumn{7}{@{}r@{}}{\weiteraufnaechsterseite}
-\endfoot
-
-% Tabellenende letzte Seite
-\hline\\
-\multicolumn{3}{@{}l}{\textbf{\zwischensumme}} & \textbf{<%c0total%>} & \textbf{<%c30total%>} & \textbf{<%c60total%>} & \textbf{<%c90total%>}\\
-\hline\\
-\multicolumn{6}{@{}l}{\textbf{\schlussbetrag}} & \textbf{<%total%>} \\
-\hline\hline\\
-\endlastfoot
-
+\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%> \\
+       <%invnumber%> & <%invdate%> & <%duedate%> &
+       <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
 <%end invnumber%>%
-
-\end{longtable}
-
+% 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}
 
index 63674ef..942e96a 100644 (file)
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\mahnung}{<%dunning_id%>}{<%dunning%>}
 
-
-\begin{document}
-
 \setkomavar*{date}{\datum}
-
 \setkomavar{date}{<%dunning_date%>}
 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
@@ -31,6 +27,8 @@
 }
 \setkomavar{transaction}{<%transaction_description%>}
 
+\begin{document}
+
 \begin{letter}{
                <%name%>\strut\\
                <%if department_1%><%department_1%>\\<%end if%>%
@@ -65,7 +63,7 @@
 \end{SimpleTabular}
 
 
-\vspace{0.2cm}
+\smallskip
 
 \bitteZahlenBis~<%dunning_duedate%>.
 
index 1552148..62df538 100644 (file)
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\rechnung}{<%invnumber%>}{<%invdate%>}
 
-
-\begin{document}
-
-\setkomavar{title}{
-       \rechnung~
-       \nr ~<%invnumber%>%
-}
 \setkomavar*{date}{\rechnungsdatum}
 \setkomavar{date}{<%invdate%>}
-\setkomavar*{myref}{\mahnung~\nr}
-\setkomavar{myref}{<%dunning_id%>}
 \setkomavar{customer}{<%customernumber%>}
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+       \rechnung~
+       \nr ~<%invnumber%>%
+}
+\setkomavar*{myref}{\mahnung~\nr}
+\setkomavar{myref}{<%dunning_id%>}
 <%if globalprojectnumber%>%
        \setkomavar{projectID}{<%globalprojectnumber%>}
 <%end globalprojectnumber%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
+\begin{document}
+
+
 \begin{letter}{
                <%name%>\strut\\
                <%if department_1%><%department_1%>\\<%end if%>%
@@ -68,7 +68,7 @@
        \multicolumn{1}{@{}l}{\schlussbetrag}& <%invamount%>\\
 \end{SimpleTabular}
 
-\vspace{0.2cm}
+\smallskip
 
 \bitteZahlenBis~<%duedate%>.