X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fkiviletter.sty;h=abbc1a101898e11f62d5ce7ba81b5207a134f2bd;hb=f24cf1f5ab8428ced545a382d0f0179ae6f40a81;hp=58b450a44cd59919ce60cb5985b3c77b017dffce;hpb=e12489db9aeb60a052eea7d634d4fa97b71fc4a2;p=kivitendo-erp.git diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty index 58b450a44..abbc1a101 100644 --- a/templates/print/marei/kiviletter.sty +++ b/templates/print/marei/kiviletter.sty @@ -2,38 +2,40 @@ \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 \RequirePackage{expl3} +\RequirePackage{xparse} \RequirePackage{iftex} \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} \else -\RequirePackage{fontspec} + \RequirePackage{fontspec} \fi -%\RequirePackage{xltabular} -\RequirePackage{tabularx} -\RequirePackage{longtable} +\RequirePackage{xltabular} \RequirePackage{booktabs} -\PassOptionsToPackage{table}{xcolor} - -\RequirePackage{xcolor} \RequirePackage{graphicx} -\ifPDFTeX -\RequirePackage{eurosym} -\DeclareUnicodeCharacter{20AC}{\euro} -\fi + \RequirePackage[fromlogo,fromalign=right, firstfoot=false,%Für einheitliche Randeinstellungen @@ -44,8 +46,13 @@ \newkomavar{transaction} \newkomavar[\lieferschein{}~\nr]{delivery} \newkomavar[\angebot{}~\nr]{quote} -\newkomavar{orderID} -\newkomavar{projectID} +\newkomavar[\auftragsnummer]{orderID} +\newkomavar[\projektnummer]{projectID} +\setkomavar*{fromphone}{\textTelefon} +\setkomavar*{fromemail}{\textEmail} +\setkomavar*{fromfax}{\textFax} +\setkomavar*{customer}{\kundennummer} + \usepackage{geometry} @@ -53,7 +60,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 @@ -71,25 +77,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} @@ -165,33 +160,44 @@ contents={\usebox\shippingAddressBox} \dim_new:N \g_kivi_tabcolsep_dim \dim_gset:Nn \g_kivi_tabcolsep_dim {.5\tabcolsep} +\prg_new_conditional:Nnn \kivi_if_Price_col:n {T} { + \prop_get:cnN {l_kivi_col_#1_prop} {colspec} \l_tmpa_tl + \tl_if_eq:NnTF \l_tmpa_tl {Price} + {\prg_return_true:} + {\prg_return_false:} +} + + \cs_new:Nn \__kivi_calc_desc_column: { \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:NTF \l_tmpa_bool { - \bool_if:cT {l_kivi_col_##1_bool} { + \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 } - } - }{ - \bool_if:cT {l_kivi_col_##1_bool} { + }{ \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 {>{\raggedleft\arraybackslash}p{\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:}}} } } } + \tl_gput_left:Nn \g_kivi_Pricing_colspec_tl {@{}} + \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {@{}} } \newcolumntype{P}[1]{>{\raggedleft\arraybackslash}p{#1}<{\__kivi_tab_column_currency:}} @@ -208,6 +214,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, @@ -245,6 +252,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} @@ -258,12 +267,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 } } @@ -293,7 +303,8 @@ contents={\usebox\shippingAddressBox} @{} } -\cs_new:Nn \__kivi_tab_column_currency: {\,\currency} +\cs_new_protected: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: @@ -319,24 +330,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}[1]{\seq_gput_right:Nn \g_kivi_extraDescription_seq {#1}} + +\newcommand*\ExtraDescription{ + \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][]{ \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 @@ -344,8 +369,10 @@ contents={\usebox\shippingAddressBox} \__kivi_PricingTabular_header: \endhead \midrule - \multicolumn{6}{@{}r@{}}{\weiteraufnaechsterseite}\\ + \rlap{\makebox[\textwidth][r]{\weiteraufnaechsterseite}}\\ \endfoot + \bottomrule + \endlastfoot }{ \endlongtable \endgroup @@ -368,20 +395,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 }{ @@ -395,46 +438,70 @@ 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} \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 + } -\if@kivi@infobox \setkomavar{location}{ - \ifkomavarempty{transaction}{}{ + \Ifkomavarempty{transaction}{}{ \bfseries \usekomavar{transaction} } \par \medskip - \begin{tabularx}{\useplength{locwidth}}{@{}l<{:}>{\raggedleft\arraybackslash}X@{}} - \usekomavar*{date}&\usekomavar{date}\\ - \ifkomavarempty{myref}{}{ - \usekomavar*{myref}&\usekomavar{myref}\\ - } - \kundennummer&\usekomavar{customer}\\ - \ifkomavarempty{yourref}{}{ - \usekomavar*{yourref}&\usekomavar{yourref}\\ - } - \ifkomavarempty{delivery}{}{ - \usekomavar*{delivery}&\usekomavar{delivery}\\ - } - \ifkomavarempty{quote}{}{ - \usekomavar*{quote}&\usekomavar{quote}\\ - } - \ifkomavarempty{orderID}{}{\auftragsnummer&\usekomavar{orderID}\\} - \ifkomavarempty{projectID}{}{\projektnummer&\usekomavar{projectID}\\} - \ansprechpartner&\usekomavar{fromname} - \ifkomavarempty{fromphone}{}{\\\textTelefon&\usekomavar{fromphone}} - \ifkomavarempty{fromemail}{}{\\\textEmail&\usekomavar{fromemail}} - \end{tabularx} + \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{ @@ -443,11 +510,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