X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fkiviletter.sty;h=90ccaff513416da07cb54da11d9532c44dbf6a85;hb=661febc70d58eb13923455512e8d76f1ef29ae60;hp=6aedf1bd7f215fc8a4daa2579a2181f97fb195f5;hpb=5ffa2173eb9315b476e047ccced027acb3562e31;p=kivitendo-erp.git

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index 6aedf1bd7..90ccaff51 100644
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -16,25 +16,26 @@
 
 
 \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{booktabs}
 \RequirePackage{graphicx}
 
-\ifPDFTeX
-\RequirePackage{eurosym}
-\DeclareUnicodeCharacter{20AC}{\euro}
-\fi
+
 
 \RequirePackage[fromlogo,fromalign=right,
   firstfoot=false,%Für einheitliche Randeinstellungen
@@ -45,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}
 
@@ -154,36 +160,48 @@ 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
+	\exp_args:NV \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 {K{\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:}}
+\newcolumntype{K}[1]{>{\raggedleft\arraybackslash}p{#1}}
+\newcolumntype{P}[1]{K{#1}<{\__kivi_tab_column_currency:}}
 
 \RequirePackage{tcolorbox}
 \tcbuselibrary{breakable, skins}
@@ -286,7 +304,7 @@ 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:
@@ -430,9 +448,41 @@ contents={\usebox\shippingAddressBox}
 
 \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}{}{
 	\bfseries
@@ -440,27 +490,19 @@ contents={\usebox\shippingAddressBox}
 	}
 	\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{