\usepackage{geometry}
-\geometry{left=\useplength{toaddrhpos}, right=\useplength{toaddrhpos}}
+\geometry{a4paper,left=\useplength{toaddrhpos}, right=\useplength{toaddrhpos}}
\ExplSyntaxOn
%Scratch variables
\dim_new:N \g_kivi_tab_id_dim
\dim_gset:Nn \g_kivi_tab_id_dim {4em}
\dim_new:N \g_kivi_tab_num_dim
-\dim_gset:Nn \g_kivi_tab_num_dim {4em}
+\dim_gset:Nn \g_kivi_tab_num_dim {5em}
\dim_new:N \g_kivi_tab_price_dim
-\dim_gset:Nn \g_kivi_tab_price_dim {4em}
+\dim_gset:Nn \g_kivi_tab_price_dim {5em}
\dim_new:N \g_kivi_tab_desc_dim
\dim_new:N \g_kivi_tabcolsep_dim
\dim_gset:Nn \g_kivi_tab_desc_dim {\textwidth-\g_kivi_tab_pos_dim -\g_kivi_tab_id_dim-\g_kivi_tab_num_dim - 2\g_kivi_tab_price_dim - 10\g_kivi_tabcolsep_dim}
}
-\newcolumntype{P}{>{\arraybackslash}p{\g_kivi_tab_price_dim}}
+\newcolumntype{P}{>{\raggedleft\arraybackslash}p{\g_kivi_tab_price_dim}}
\newenvironment{PricingTabular}{
\begingroup
\longtable{@{}p{\g_kivi_tab_pos_dim}p{\g_kivi_tab_id_dim}p{\g_kivi_tab_desc_dim}>{\raggedleft\arraybackslash}p{\g_kivi_tab_num_dim}*2{P<{\,\currency}}@{}}
% Tabellenkopf
\toprule
- \bfseries\position & \bfseries\artikelnummer & \bfseries\bezeichnung & \bfseries\menge &\multicolumn{1}{P}{\bfseries\einzelpreis}&\multicolumn{1}{P}{\bfseries\gesamtpreis}\\
+ \bfseries\position & \bfseries\artikelnummer & \bfseries\bezeichnung & \bfseries\menge &\multicolumn{1}{P}{\bfseries\einzelpreis}&\multicolumn{1}{P@{}}{\bfseries\gesamtpreis}\\
\midrule
\endhead
\midrule
\ExplSyntaxOff
\if@kivi@infobox
+\newkomavar{locationtitle}
\setkomavar{location}{
\begin{flushright}
\bfseries
\LARGE
- \usekomavar{title}
+ \usekomavar{locationtitle}
\end{flushright}
\medskip
\datum&\usekomavar{date}\\
\kundennummer&\usekomavar{customer}\\
\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
+
+\ExplSyntaxOn
+\AtBeginLetter{
+ \ifkomavarempty{title}{}{
+ \exp_args:Nno\setkomavar{locationtitle}{\scr@title@var}
+ \setkomavar{title}{}
+ }
+}
+\ExplSyntaxOff
\fi
+
\renewcommand*{\raggedsignature}{\raggedright}
\endinput