From c1c33278b2d9487ee9dc37e43a742a35b0277a2a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@kivitendo.de>
Date: Fri, 14 Feb 2020 09:02:10 +0100
Subject: [PATCH] =?utf8?q?peitex:=20Weitere=20=C3=9Cberarbeitungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

- Syntax Fix globaleprojectnumber
- Abstand Fußzeile
- Schriftgröße
- obere Tabelle am rechten Rand ausgerichtet
---
 templates/print/marei/insettings.tex           | 13 ++++++-------
 templates/print/marei/kiviletter.sty           |  6 ++++--
 templates/print/marei/sales_delivery_order.tex |  4 +++-
 templates/print/marei/sales_quotation.tex      |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/templates/print/marei/insettings.tex b/templates/print/marei/insettings.tex
index cd7c53153..8824d62cf 100644
--- a/templates/print/marei/insettings.tex
+++ b/templates/print/marei/insettings.tex
@@ -78,9 +78,6 @@
 
 % Einstellungen f. Kopf und Fuss
 \pagestyle{kivitendo.letter}
-%\setheadwidth[20mm]{page} % Kopfzeile nach rechts verschieben
-%\setfootwidth[-39mm]{page} % Fusszeile verschieben
-
 % Befehl f. laufende Kopfzeile:
 % 1. Text f. Kunden- oder Lieferantennummer (oder leer, wenn diese nicht ausgegeben werden soll)
 % 2. Kunden- oder Lieferantennummer (oder leer)
@@ -93,27 +90,29 @@
 \chead{
   \ifnum\thepage=1
   \else
+      \makebox[\textwidth]{
       \ifstr{#1}{}{}{#1: #2 \hspace{0.7cm}}
       #3
       \ifstr{#4}{}{}{~\nr: #4}
       \ifstr{#5}{}{}{\vom ~ #5}
       \hspace{0.7cm} - \seite ~ \thepage/\letterlastpage  ~-%
+      }
   \fi
 }
 }
 
-% Firmenfuss
+%% % Firmenfuss
 \setkomafont{pagefoot}{\tiny}
 \cfoot{
   {
-     \begin{tabular}{p{5cm}p{4.5cm}lr}
+     \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}}p{5cm}p{4.5cm}lr@{}}
         \firma                 & \email              & \textKontonummer & \kontonummer \\
         \strasse               & \homepage           & \textBank        & \bank \\
         \ort                   & \textUstid\ \ustid  & \textIban        & \iban \\
         \textTelefon~\telefon  & \finanzamt          & \textBic         & \bic \\
         \ifstr{\fax}{}{}{\textFax~\fax} & &\textBankleitzahl	& \bankleitzahl \\
-     \end{tabular}
+     \end{tabular*}
   }
 }
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index d3b8fa299..5dab372f7 100644
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -11,6 +11,7 @@
 
 \RequirePackage{expl3}
 \RequirePackage{iftex}
+\KOMAoptions{fontsize=12pt}
 % Schriftart, Eingabelayout der Tastatur
 \ifPDFTeX
 \RequirePackage[utf8]{inputenc}% Nur notwendig, wenn Basis älter als TL2018
@@ -34,7 +35,8 @@
 \fi
 
 \RequirePackage[fromlogo,fromalign=right,
-	firstfoot=false,%Für einheitliche Randeinstellungen
+  firstfoot=false,%Für einheitliche Randeinstellungen
+  refline=nodate,
 	]{scrletter}
 \LoadLetterOption{DIN}
 
@@ -316,7 +318,7 @@ align=bl,
 	}
 	\par
 	\medskip
-	\begin{tabularx}{\linewidth}{@{}l<{:}>{\raggedright\arraybackslash}X@{}}
+	\begin{tabularx}{\useplength{locwidth}}{@{}l<{:}>{\raggedleft\arraybackslash}X@{}}
 		\usekomavar*{date}&\usekomavar{date}\\
 		\ifkomavarempty{myref}{}{
 			\usekomavar*{myref}&\usekomavar{myref}\\
diff --git a/templates/print/marei/sales_delivery_order.tex b/templates/print/marei/sales_delivery_order.tex
index a612f7e56..c4879fdbe 100644
--- a/templates/print/marei/sales_delivery_order.tex
+++ b/templates/print/marei/sales_delivery_order.tex
@@ -32,7 +32,9 @@
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
-<%if globalprojectnumber%>\setkomavar{projectID}{<%globalprojectnumber%}><%end globalprojectnumber%>
+<%if globalprojectnumber%>
+  \setkomavar{projectID}{<%globalprojectnumber%>}
+<%end globalprojectnumber%>
 
 \setkomavar{transaction}{<%transaction_description%>}
 
diff --git a/templates/print/marei/sales_quotation.tex b/templates/print/marei/sales_quotation.tex
index bdd8a0309..544105f69 100644
--- a/templates/print/marei/sales_quotation.tex
+++ b/templates/print/marei/sales_quotation.tex
@@ -33,7 +33,7 @@
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
 	\angebot~
-	\nr~<%quonumber%>
+	<%quonumber%>
 }
 
 \setkomavar{transaction}{<%transaction_description%>}
-- 
2.20.1