X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fprint%2Fmarei%2Fkiviletter.sty;h=fbe0b1a02f6f86e2aba5f296fbf9a45e9ac803ae;hb=b36c791b78f3ca3895187db2b3f30ce5b29543e7;hp=691d475ee2ecc590c4e7278d2688017d551fefb7;hpb=8cb0bc132a57260984325f00cf56cca8e4d9badc;p=kivitendo-erp.git

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index 691d475ee..fbe0b1a02 100644
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -3,25 +3,31 @@
 
 \RequirePackage{l3keys2e}
 
+%Optionen vor den eigenen Paketoptionen hinzufügen, damit spätere diese ggf. überschreiben
+\PassOptionsToPackage{
+  fromlogo,
+  fromalign=right,
+  firstfoot=false,%Für einheitliche Randeinstellungen
+  refline=nodate,
+}{scrletter}
+
 \ExplSyntaxOn
 \newif\if@kivi@infobox
 \newif\if@kivi@footer
 \keys_define:nn {kiviletter} {
-	infobox .choices:nn = {true,false} {\use:c {@kivi@infobox\l_keys_choice_tl}},
-	infobox .default:n = true,
-	infobox .initial:n = true,
-	reffields .meta:n = {infobox=false},
-	footer .choices:nn = {true,false} {\use:c {@kivi@footer\l_keys_choice_tl}},
-	footer .default:n = true,
-	footer .initial:n = true,
-	nofooter .meta:n = {footer=false}
+  infobox .choices:nn = {true,false} {\use:c {@kivi@infobox\l_keys_choice_tl}},
+  infobox .default:n = true,
+  infobox .initial:n = true,
+  reffields .meta:n = {infobox=false},
+  footer .choices:nn = {true,false} {\use:c {@kivi@footer\l_keys_choice_tl}},
+  footer .default:n = true,
+  footer .initial:n = true,
+  nofooter .meta:n = {footer=false},
+  unknown .code:n = \PassOptionsToPackage{\l_keys_key_str=#1}{scrletter},
 }
 \ExplSyntaxOff
 
-\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{scrletter}}
-
 \ProcessKeysOptions{kiviletter}
-\ProcessOptions\relax
 
 \RequirePackage{xparse}
 \RequirePackage{iftex}
@@ -42,13 +48,10 @@
 \RequirePackage{booktabs}
 \RequirePackage{graphicx}
 
-\PassOptionsToPackage{fromlogo,fromalign=right,
-  firstfoot=false,%Für einheitliche Randeinstellungen
-  refline=nodate,
-}{scrletter}
 \RequirePackage{scrletter}
 \LoadLetterOption{DIN}
 
+\newkomavar{taxpoint}
 \newkomavar{transaction}
 \newkomavar[\lieferschein{}~\nr]{delivery}
 \newkomavar[\angebot{}~\nr]{quote}
@@ -153,7 +156,7 @@
   amount=5em,
   price=7em,
   pricetotal=7em,
-  %	desc=auto,
+  %  desc=auto,
   pos/header=\position,
   id/header=\artikelnummer,
   desc/header=\bezeichnung,
@@ -303,6 +306,7 @@
   \let\ExtraDescription\__kivi_addExtraDescription:n
   \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
   \seq_map_inline:Nn \l_kivi_PricingTable_seq {
+    \if_mode_horizontal: \par \fi
     \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}
@@ -333,6 +337,7 @@
       }}
   }
   \endgroup\par
+  \l__kivi_Tabular_rowsep_tl
 }
 
 
@@ -402,7 +407,7 @@
 \NewDocumentEnvironment{PricingTotal}{+b}{
   \par\nointerlineskip
 }{
-  \bool_if:NT \g__kivi_Tabular_rowcolor_bool 	{\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_PricingTotal_tl}}
+  \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}}
@@ -449,7 +454,7 @@
   \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	{
+  \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
@@ -483,8 +488,13 @@
   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}
+  rowsep .tl_set:N =\l__kivi_Tabular_rowsep_tl,
+  rowsep .initial:n = ,
+  hrule .meta:n = {
+    rowsep={
+      \vskip\aboverulesep
+      \leavevmode\hrule\@height\lightrulewidth
+      \vskip\belowrulesep}},
 }
 
 \newcommand*{\SetupSimpleTabular}[1]{\keys_set:nn {kivi/SimpleTabular} {#1}}
@@ -495,7 +505,7 @@
   \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 {
+  \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 {@{}}
   }
@@ -590,6 +600,7 @@
       \locationentry{quote}
       \locationentry{orderID}
       \locationentry{projectID}
+      \locationentry{taxpoint}
       \locationentry[\ansprechpartner]{fromname}
       \locationentry{fromphone}
       \locationentry*{fromemail}
@@ -649,5 +660,7 @@
 \renewcommand*{\raggedsignature}{\raggedright}
 
 \newkomafont{extraDescription}{}
+\newkomafont{subtotal}{}
+\newkomafont{total}{}
 
 \endinput