X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fprint%2Fmarei%2Fkiviletter.sty;h=6aedf1bd7f215fc8a4daa2579a2181f97fb195f5;hb=5ffa2173eb9315b476e047ccced027acb3562e31;hp=eba9b6fba5bdd9a1977e27423c6ed5370ff4a495;hpb=3a2482e7bc0e7f6e4c80017a5dcd049bfc75e7cb;p=kivitendo-erp.git

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index eba9b6fba..6aedf1bd7 100644
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -2,9 +2,15 @@
 \ProvidesPackage{kiviletter}[2020/04/24 Letter Layouts for Kivitendo]
 
 \newif\if@kivi@infobox
+\newif\if@kivi@footer
 \DeclareOption{reffields}{\@kivi@infoboxfalse}
 \DeclareOption{infobox}{\@kivi@infoboxtrue}
+\DeclareOption{nofooter}{\@kivi@footerfalse}
+\DeclareOption{footer}{\@kivi@footertrue}
 \@kivi@infoboxtrue
+\@kivi@footertrue
+
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{scrletter}}
 
 \ProcessOptions\relax
 
@@ -21,9 +27,7 @@
 \RequirePackage{fontspec}
 \fi
 
-%\RequirePackage{xltabular}
-\RequirePackage{tabularx}
-\RequirePackage{longtable}
+\RequirePackage{xltabular}
 \RequirePackage{booktabs}
 \RequirePackage{graphicx}
 
@@ -50,7 +54,6 @@
 \dim_new:N \g_kivi_margin_dim
 \dim_gset:Nn \g_kivi_margin_dim {\useplength{toaddrhpos}}
 \geometry{a4paper,margin=\g_kivi_margin_dim,heightrounded}
-\savegeometry{kivi.letter@default}
 %Scratch variables
 \int_new:N \l_kivi_tmp_int
 \bool_new:N \l_kivi_tmp_bool
@@ -68,25 +71,14 @@ voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+4\baselineskip
 contents={\usebox\shippingAddressBox}
 ]{kivitendo.shippingaddress}
 
-
-\ExplSyntaxOn
-\AtBeginLetter{\dim_gset:Nn \g_kivi_orig@textheight_dim {\textheight}}
-\ExplSyntaxOff
-
 \newpairofpagestyles{kivitendo.letter}{}
+
 \renewcommand*{\letterpagestyle}{kivitendo.letter}
 
-\DeclareNewPageStyleByLayers{kivitendo.letter.PricingTable}{
-	kivitendo.TableHead,
-	kivitendo.TableFoot
-	kivitendo.letter.head.odd,kivitendo.letter.head.even,kivitendo.letter.head.oneside,%
-	kivitendo.letter.foot.odd,kivitendo.letter.foot.even,kivitendo.letter.foot.oneside,%
-}
 \DeclareNewPageStyleByLayers{kivitendo.letter.first}{
 	kivitendo.shippingaddress,
-	kivitendo.TableFoot,
-	kivitendo.letter.head.odd,kivitendo.letter.head.even,kivitendo.letter.head.oneside,%
-	kivitendo.letter.foot.odd,kivitendo.letter.foot.even,kivitendo.letter.foot.oneside,%
+	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}
@@ -205,6 +197,7 @@ contents={\usebox\shippingAddressBox}
 	},
 	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,
@@ -242,6 +235,8 @@ contents={\usebox\shippingAddressBox}
 	\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 {
 		\seq_set_split:Nnn  \l_kivi_columns_seq {&} {##1}
@@ -255,12 +250,13 @@ contents={\usebox\shippingAddressBox}
 	\endtabular
 	\seq_if_empty:NTF \g_kivi_extraDescription_seq
 	{\par}
-	{\par
+	{\par\nopagebreak
 	\begingroup
 	\setlength{\hsize}{\dimexpr\l_kivi_tab_desc_dim+\l_kivi_tab_desc_leftskip_dim}
 	\setlength{\leftskip}{\l_kivi_tab_desc_leftskip_dim}
+	\usekomafont{extraDescription}
 	\seq_use:Nn \g_kivi_extraDescription_seq {\\}
-	\par\nointerlineskip
+	\par
 	\endgroup
 	}
 	}
@@ -291,6 +287,7 @@ contents={\usebox\shippingAddressBox}
 }
 
 \cs_new:Nn \__kivi_tab_column_currency: {\,\currency}
+\def\tabcurrency{\__kivi_tab_column_currency:}
 \cs_set:Nn \__kivi_tab_column_header_currency: {}
 \cs_set_eq:NN \__kivi_tab_column_body_currency:  \__kivi_tab_column_currency:
 
@@ -316,24 +313,38 @@ contents={\usebox\shippingAddressBox}
 			\end{tabular*}
 		}
 	}
+	\hbox_gset:Nn \g_kivi_LT@lastfoot_box {
+		\raisebox{\dimexpr\depth+\baselineskip}[0pt][0pt]{
+			\begin{tabular*}{\textwidth}{@{\extracolsep{\fill}}r@{}}
+				\bottomrule
+			\end{tabular*}
+		}
+	}
 }
 
 
 %Macht es sinn hier eine Variante zu machen, in der alle Spalten Belegbar sind?
 \newenvironment{PricingTotal}{
-	\par
-	\vspace{-\ht\strutbox}
+	\par\nointerlineskip
 	\unskip
 	\tabular[t]{@{}p{\dim_eval:n {\linewidth-\l_kivi_tab_pricetotal_dim-2\tabcolsep}}P{\l_kivi_tab_pricetotal_dim}@{}}
 	\midrule
 }{
-	\bottomrule\endtabular
+	\endtabular
+}
+
+
+\newcommand*\ExtraDescription{
+	\PackageError{kiviletter}{The~command~\string\ExtraDescription\space~may~be~only~used~inside~the~\string\FakeTable\space~environment.}{See~documentation~for~details}
 }
 
-\newcommand{\ExtraDescription}[1]{\seq_gput_right:Nn \g_kivi_extraDescription_seq {#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
@@ -341,8 +352,10 @@ contents={\usebox\shippingAddressBox}
 	\__kivi_PricingTabular_header:
 	\endhead
 	\midrule
-	\multicolumn{6}{@{}r@{}}{\weiteraufnaechsterseite}\\
+	\rlap{\makebox[\textwidth][r]{\weiteraufnaechsterseite}}\\
 	\endfoot
+	\bottomrule
+	\endlastfoot
 }{
 	\endlongtable
 	\endgroup
@@ -365,20 +378,36 @@ contents={\usebox\shippingAddressBox}
 	\midrule
 }
 
-\RequirePackage{xltabular}
 
+\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 = {\bfseries\position & \bfseries\menge & \bfseries\bezeichnung},
+}
+
+\newcommand*{\SetupSimpleTabular}[1]{\keys_set:nn {kivi/SimpleTabular} {#1}}
+\newcommand*{\SetupPricingTabular}[1]{\keys_set:nn {kivi/PricingTable} {#1}}
 
-\newenvironment{SimpleTabular}[1][\bfseries\position & \bfseries\menge & \bfseries\bezeichnung]
+\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}
-	\xltabular{\linewidth}{@{}rrX@{}}
-	\toprule
-	#1\\
-	\midrule\\\endhead
-	\midrule
-	\multicolumn{3}{@{}>{\raggedright}p{\linewidth}@{}}{\weiteraufnaechsterseite}\\
+	\dim_set:Nn \parskip {\c_zero_dim}
+	\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
-	\bottomrule
+		\bottomrule
 	\endlastfoot
 	\ignorespaces
 }{
@@ -392,10 +421,10 @@ contents={\usebox\shippingAddressBox}
 % analog ist dies für pos, amount, price, pricetotal möglich.
 % Die Spalte der Bezeichnung ist nicht deaktivierbar
 \newenvironment{PricingTabular*}[1][]{
-	\bool_gset_true:N \g_kivi_inTable_bool
 	\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}
 
@@ -405,7 +434,7 @@ contents={\usebox\shippingAddressBox}
 
 \if@kivi@infobox
 \setkomavar{location}{
-	\ifkomavarempty{transaction}{}{
+	\Ifkomavarempty{transaction}{}{
 	\bfseries
 	\usekomavar{transaction}
 	}
@@ -413,24 +442,24 @@ contents={\usebox\shippingAddressBox}
 	\medskip
 	\begin{tabularx}{\useplength{locwidth}}{@{}l<{:}>{\raggedleft\arraybackslash}X@{}}
 		\usekomavar*{date}&\usekomavar{date}\\
-		\ifkomavarempty{myref}{}{
+		\Ifkomavarempty{myref}{}{
 			\usekomavar*{myref}&\usekomavar{myref}\\
 		}
 		\kundennummer&\usekomavar{customer}\\
-		\ifkomavarempty{yourref}{}{
+		\Ifkomavarempty{yourref}{}{
 			\usekomavar*{yourref}&\usekomavar{yourref}\\
 		}
-		\ifkomavarempty{delivery}{}{
+		\Ifkomavarempty{delivery}{}{
 			\usekomavar*{delivery}&\usekomavar{delivery}\\
 		}
-		\ifkomavarempty{quote}{}{
+		\Ifkomavarempty{quote}{}{
 			\usekomavar*{quote}&\usekomavar{quote}\\
 		}
-		\ifkomavarempty{orderID}{}{\auftragsnummer&\usekomavar{orderID}\\}
-		\ifkomavarempty{projectID}{}{\projektnummer&\usekomavar{projectID}\\}
+		\Ifkomavarempty{orderID}{}{\auftragsnummer&\usekomavar{orderID}\\}
+		\Ifkomavarempty{projectID}{}{\projektnummer&\usekomavar{projectID}\\}
 		\ansprechpartner&\usekomavar{fromname}
-		\ifkomavarempty{fromphone}{}{\\\textTelefon&\usekomavar{fromphone}}
-		\ifkomavarempty{fromemail}{}{\\\textEmail&\usekomavar{fromemail}}
+		\Ifkomavarempty{fromphone}{}{\\\textTelefon&\usekomavar{fromphone}}
+		\Ifkomavarempty{fromemail}{}{\\\textEmail&\usekomavar{fromemail}}
 	\end{tabularx}
 }
 \removereffields
@@ -440,11 +469,52 @@ contents={\usebox\shippingAddressBox}
 	\@addtoplength{refvpos}{4\baselineskip}%sep between address boxes
 	\fi
 }
-\ExplSyntaxOff
+
 \fi
 
+%Fallback for older KOMA-Script-Versions
+\cs_if_exist:NF \Ifstr {\let\Ifstr\ifstr}
+\cs_if_exist:NF \Ifkomavarempty {\let\Ifkomavarempty\ifkomavarempty}
+
+%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}
+		}
+	}
+}
+
+\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}
+}
+
+\ExplSyntaxOff
 
 
 \renewcommand*{\raggedsignature}{\raggedright}
 
+\newkomafont{extraDescription}{}
+
 \endinput