From: Marei Peischl Date: Sun, 22 Dec 2019 17:02:32 +0000 (+0100) Subject: adjust title and transaction_descripntion X-Git-Tag: release-3.5.6.1~300 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=da130c6d686dcdda864e8835e790aa62da10ea93;p=kivitendo-erp.git adjust title and transaction_descripntion --- diff --git a/kiviletter.sty b/kiviletter.sty index afe8f32e3..98d0e6440 100644 --- a/kiviletter.sty +++ b/kiviletter.sty @@ -41,6 +41,8 @@ ]{scrletter} \LoadLetterOption{DIN} +\newkomavar{transaction} + \usepackage{geometry} \ExplSyntaxOn @@ -62,7 +64,7 @@ \DeclareNewLayer[ foreground, hoffset=\useplength{toaddrhpos}, -voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+2\baselineskip, +voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+4\baselineskip, contents={\usebox\shippingAddressBox} ]{kivitendo.shippingaddress} @@ -280,16 +282,15 @@ align=bl, } \bool_gset_false:N \g_kivi_restore_geometry_bool } -%\ExplSyntaxOff + + \if@kivi@infobox -\newkomavar{locationtitle} \setkomavar{location}{ - \begin{flushright} - \bfseries - \LARGE - \usekomavar{locationtitle} - \end{flushright} + \ifkomavarempty{transaction}{}{ + \bfseries + \usekomavar{transaction} + } \par \medskip \begin{tabularx}{\linewidth}{@{}l<{:}>{\raggedright\arraybackslash}X@{}} @@ -301,16 +302,10 @@ align=bl, \end{tabularx} } \removereffields - -%\ExplSyntaxOn \AtBeginLetter{ - \ifkomavarempty{title}{}{ - \exp_args:Nno\setkomavar{locationtitle}{\scr@title@var} - \setkomavar{title}{} - } \ifdim\ht\shippingAddressBox>\z@ \addtoplength{refvpos}{\ht\shippingAddressBox} - \addtoplength{refvpos}{2\baselineskip} + \addtoplength{refvpos}{4\baselineskip} \fi } \ExplSyntaxOff diff --git a/sales_quotation.tex b/sales_quotation.tex index 308a03c27..1e94e5e0a 100644 --- a/sales_quotation.tex +++ b/sales_quotation.tex @@ -30,11 +30,10 @@ \setkomavar{fromphone}{<%employee_tel%>} \setkomavar{fromemail}{<%employee_email%>} \setkomavar{title}{ - \angebot - \par - \medskip - \large\nr ~<%quonumber%> + \angebot~ + \nr ~<%quonumber%> } +\setkomavar{transaction}{<%transaction_description%>} %\begin{minipage}[t]{8cm} % \scriptsize