From a1493f24604fbf9209d0ac3f579b373eba266018 Mon Sep 17 00:00:00 2001
From: Marei Peischl <marei@peitex.de>
Date: Wed, 27 Nov 2019 14:25:03 +0100
Subject: [PATCH] adjust pagestyle shippingaddres +head/foot
---
kiviletter.sty | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/kiviletter.sty b/kiviletter.sty
index 31fbeb9bb..cede0cde0 100644
--- a/kiviletter.sty
+++ b/kiviletter.sty
@@ -62,7 +62,7 @@
\DeclareNewLayer[
foreground,
hoffset=\useplength{toaddrhpos},
-voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+\baselineskip,
+voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+2\baselineskip,
contents={\usebox\shippingAddressBox}
]{kivitendo.shippingaddress}
@@ -95,10 +95,14 @@ align=bl,
\DeclareNewPageStyleByLayers{kivitendo.letter.PricingTable}{
kivitendo.TableHead,
kivitendo.TableFoot
+ scrheadings.head.odd,scrheadings.head.even,scrheadings.head.oneside,%
+ scrheadings.foot.odd,scrheadings.foot.even,scrheadings.foot.oneside,%
}
\DeclareNewPageStyleByLayers{kivitendo.letter.first}{
kivitendo.shippingaddress,
- kivitendo.TableFoot
+ kivitendo.TableFoot,
+ scrheadings.head.odd,scrheadings.head.even,scrheadings.head.oneside,%
+ scrheadings.foot.odd,scrheadings.foot.even,scrheadings.foot.oneside,%
}
\setkomavar{backaddress}{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}
@@ -294,6 +298,10 @@ align=bl,
\exp_args:Nno\setkomavar{locationtitle}{\scr@title@var}
\setkomavar{title}{}
}
+ \ifdim\ht\shippingAddressBox>\z@
+ \addtoplength{refvpos}{\ht\shippingAddressBox}
+ \addtoplength{refvpos}{2\baselineskip}
+ \fi
}
\ExplSyntaxOff
\fi
--
2.20.1