From: Marei Peischl <marei@peitex.de>
Date: Wed, 27 Nov 2019 13:36:07 +0000 (+0100)
Subject: scrlayer-scrpage compat
X-Git-Tag: release-3.5.6.1~307
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e6da9bfba9b98faf0f3f877004ae4bd899426cbd;p=kivitendo-erp.git

scrlayer-scrpage compat
---

diff --git a/insettings.tex b/insettings.tex
index c90c85a19..73e7be7ee 100644
--- a/insettings.tex
+++ b/insettings.tex
@@ -67,8 +67,7 @@
 \KOMAoptions{fontsize=10pt}
 
 % Einstellungen f. Kopf und Fuss
-\pagestyle{scrheadings}
-\clearpairofpagestyles
+\pagestyle{kivitendo.letter}
 %\setheadwidth[20mm]{page} % Kopfzeile nach rechts verschieben
 %\setfootwidth[-39mm]{page} % Fusszeile verschieben
 
diff --git a/kiviletter.sty b/kiviletter.sty
index cede0cde0..8833bc8e6 100644
--- a/kiviletter.sty
+++ b/kiviletter.sty
@@ -92,17 +92,20 @@ align=bl,
 \AtBeginLetter{\dim_gset:Nn \g_kivi_orig@textheight_dim {\textheight}}
 \ExplSyntaxOff
 
+\newpairofpagestyles{kivitendo.letter}{}
+\renewcommand*{\letterpagestyle}{kivitendo.letter}
+
 \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,%
+	kivitendo.letter.head.odd,kivitendo.letter.head.even,kivitendo.letter.head.oneside,%
+	kivitendo.letter.foot.odd,kivitendo.letter.foot.even,kivitendo.letter.foot.oneside,%
 }
 \DeclareNewPageStyleByLayers{kivitendo.letter.first}{
 	kivitendo.shippingaddress,
 	kivitendo.TableFoot,
-	scrheadings.head.odd,scrheadings.head.even,scrheadings.head.oneside,%
-	scrheadings.foot.odd,scrheadings.foot.even,scrheadings.foot.oneside,%
+	kivitendo.letter.head.odd,kivitendo.letter.head.even,kivitendo.letter.head.oneside,%
+	kivitendo.letter.foot.odd,kivitendo.letter.foot.even,kivitendo.letter.foot.oneside,%
 }
 
 \setkomavar{backaddress}{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}