projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unnecessary spaces
[kivitendo-erp.git]
/
kiviletter.sty
diff --git
a/kiviletter.sty
b/kiviletter.sty
index
512beff
..
e164249
100644
(file)
--- a/
kiviletter.sty
+++ b/
kiviletter.sty
@@
-37,7
+37,7
@@
\usepackage{geometry}
\usepackage{geometry}
-\geometry{left=\useplength{toaddrhpos}, right=\useplength{toaddrhpos}}
+\geometry{
a4paper,
left=\useplength{toaddrhpos}, right=\useplength{toaddrhpos}}
\ExplSyntaxOn
%Scratch variables
\ExplSyntaxOn
%Scratch variables
@@
-65,9
+65,9
@@
contents={\usebox\shippingAddressBox}
\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_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 {
4
em}
+\dim_gset:Nn \g_kivi_tab_num_dim {
5
em}
\dim_new:N \g_kivi_tab_price_dim
\dim_new:N \g_kivi_tab_price_dim
-\dim_gset:Nn \g_kivi_tab_price_dim {
4
em}
+\dim_gset:Nn \g_kivi_tab_price_dim {
5
em}
\dim_new:N \g_kivi_tab_desc_dim
\dim_new:N \g_kivi_tabcolsep_dim
\dim_new:N \g_kivi_tab_desc_dim
\dim_new:N \g_kivi_tabcolsep_dim
@@
-76,7
+76,7
@@
contents={\usebox\shippingAddressBox}
\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}
}
\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
\newenvironment{PricingTabular}{
\begingroup
@@
-85,7
+85,7
@@
contents={\usebox\shippingAddressBox}
\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
\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
\midrule
\endhead
\midrule
@@
-112,8
+112,8
@@
contents={\usebox\shippingAddressBox}
\datum&\usekomavar{date}\\
\kundennummer&\usekomavar{customer}\\
\ansprechpartner&\usekomavar{fromname}\\
\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
\end{tabularx}
}
\removereffields