adjust title and transaction_descripntion

diff --git a/kiviletter.sty b/kiviletter.sty
index afe8f32e3dd1cd3d02ee50f7cb5592004c08479c..98d0e64400e438d9de4eefaeaa4cb241cffddeb1 100644 (file)
--- a/kiviletter.sty
+++ b/kiviletter.sty
@@ -41,6 +41,8 @@
        ]{scrletter}
 \LoadLetterOption{DIN}
 
        ]{scrletter}
 \LoadLetterOption{DIN}
 

+\newkomavar{transaction}
+

 \usepackage{geometry}
 
 \ExplSyntaxOn
 \usepackage{geometry}
 
 \ExplSyntaxOn


@@ -62,7 +64,7 @@
 \DeclareNewLayer[
 foreground,
 hoffset=\useplength{toaddrhpos},
 \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}
 
 contents={\usebox\shippingAddressBox}
 ]{kivitendo.shippingaddress}
 


@@ -280,16 +282,15 @@ align=bl,
        }
        \bool_gset_false:N \g_kivi_restore_geometry_bool
 }
        }
        \bool_gset_false:N \g_kivi_restore_geometry_bool
 }

-%\ExplSyntaxOff
+
+

 
 \if@kivi@infobox
 
 \if@kivi@infobox

-\newkomavar{locationtitle}

 \setkomavar{location}{
 \setkomavar{location}{

-       \begin{flushright}
-               \bfseries
-               \LARGE
-               \usekomavar{locationtitle}
-       \end{flushright}
+       \ifkomavarempty{transaction}{}{
+       \bfseries
+       \usekomavar{transaction}
+       }

        \par
        \medskip
        \begin{tabularx}{\linewidth}{@{}l<{:}>{\raggedright\arraybackslash}X@{}}
        \par
        \medskip
        \begin{tabularx}{\linewidth}{@{}l<{:}>{\raggedright\arraybackslash}X@{}}


@@ -301,16 +302,10 @@ align=bl,
        \end{tabularx}
 }
 \removereffields
        \end{tabularx}
 }
 \removereffields

-
-%\ExplSyntaxOn

 \AtBeginLetter{
 \AtBeginLetter{

-       \ifkomavarempty{title}{}{
-               \exp_args:Nno\setkomavar{locationtitle}{\scr@title@var}
-               \setkomavar{title}{}
-       }

        \ifdim\ht\shippingAddressBox>\z@
        \addtoplength{refvpos}{\ht\shippingAddressBox}
        \ifdim\ht\shippingAddressBox>\z@
        \addtoplength{refvpos}{\ht\shippingAddressBox}

-       \addtoplength{refvpos}{2\baselineskip}
+       \addtoplength{refvpos}{4\baselineskip}

        \fi
 }
 \ExplSyntaxOff
        \fi
 }
 \ExplSyntaxOff

diff --git a/sales_quotation.tex b/sales_quotation.tex
index 308a03c2717018bb5283098509293a441cba55a3..1e94e5e0a29e9736651d0316e0e1b9dde82be74a 100644 (file)
--- a/sales_quotation.tex
+++ b/sales_quotation.tex
@@ -30,11 +30,10 @@
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 \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
 
 %\begin{minipage}[t]{8cm}
 %  \scriptsize