From: Marei Peischl Date: Thu, 21 Nov 2019 14:18:21 +0000 (+0100) Subject: test faketable X-Git-Tag: release-3.5.6.1~347 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=50c89498d2814dc7780eb624e83e07faec587fd3;p=kivitendo-erp.git test faketable --- diff --git a/kiviletter.sty b/kiviletter.sty index e164249bc..ecb4a16e6 100644 --- a/kiviletter.sty +++ b/kiviletter.sty @@ -6,6 +6,8 @@ \DeclareOption{infobox}{\@kivi@infoboxtrue} \@kivi@infoboxtrue +\newif\if@kivi@faketable +\DeclareOption{faketable}{\@kivi@faketabletrue} \ProcessOptions\relax @@ -78,6 +80,18 @@ contents={\usebox\shippingAddressBox} \newcolumntype{P}{>{\raggedleft\arraybackslash}p{\g_kivi_tab_price_dim}} +\if@kivi@faketable +\RequirePackage{environ} +\ExplSyntaxOn +\seq_new:N \l_kivi_PricingTable_seq +\NewEnviron{PricingTabular}{ +% \tl_set:No \l_tmpa_tl {\BODY} + \seq_set_split:NnV \l_kivi_PricingTable_seq {\tabularnewline} \BODY + \seq_show:N \l_kivi_PricingTable_seq +} +\ExplSyntaxOff + +\else \newenvironment{PricingTabular}{ \begingroup \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim} @@ -95,6 +109,7 @@ contents={\usebox\shippingAddressBox} \endlongtable \endgroup } +\fi \ExplSyntaxOff diff --git a/sales_quotation.tex b/sales_quotation.tex index 9ef5a17da..efa211028 100644 --- a/sales_quotation.tex +++ b/sales_quotation.tex @@ -1,3 +1,4 @@ +\PassOptionsToPackage{faketable}{kiviletter} \input{inheaders.tex} @@ -124,7 +125,7 @@ } \thispagestyle{kivitendo.letter.first} -\angebotsformel\\ +\angebotsformel \begin{PricingTabular} @@ -150,7 +151,7 @@ <%qty%> <%unit%> & <%sellprice%>& \ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}} - <%linetotal%>\\ + <%linetotal%>\tabularnewline <%end number%> \end{PricingTabular} @@ -175,6 +176,7 @@ \closing{\gruesse} \begin{minipage}{\textwidth} +\rule{\linewidth}{.2pt}\par \auftragerteilt\par\bigskip \nurort:\rule[-.5ex]{8cm}{.2pt}\ ,\den\ \rule[-.5ex]{5cm}{.2pt}\par\bigskip