marei: Währungsvoreinstellung Euro + option zur Anpassung in insettings

diff --git a/templates/print/marei/insettings.tex b/templates/print/marei/insettings.tex
index d617bb0d4f6222d4d2e83a3ba038fc010a479c33..4174909c416d001b6291127461dc8113191ce6bd 100644 (file)
--- a/templates/print/marei/insettings.tex
+++ b/templates/print/marei/insettings.tex
@@ -1,6 +1,6 @@
 %% insettings.tex
 %% insettings.tex

-%% Copyright 2019 Marei Peischl
-\ProvidesFile{insettings.tex}[2019/12/22 Konfigurationsdatei kivitendo ERP]
+%% Copyright 2019–2022 Marei Peischl
+\ProvidesFile{insettings.tex}[2022/02/23 Konfigurationsdatei kivitendo ERP]

 % Sprachüberprüfung
 \RequirePackage[english, ngerman]{babel}
 
 % Sprachüberprüfung
 \RequirePackage[english, ngerman]{babel}
 


@@ -34,11 +34,10 @@
 
 % Währungen/Konten
 % Die Konfiguration bedindet sich in der Datei 
 
 % Währungen/Konten
 % Die Konfiguration bedindet sich in der Datei 

-% \identpath/<euro/chf/usd/default>_account.tex
+% \identpath/<euro/chf/usd>_account.tex
+% das optionale Argument ist als euro vorbelegt und gibt die Einstellung an, falls \lxcurrency nicht von kivitendo übergeben wird.

 
 

-\@ifundefined{lxcurrency}{}{
-  \setupCurrencyConfig{\identpath}{\lxcurrency}
-}
+\setupCurrencyConfig[euro]{\identpath}{\lxcurrency}

 
 
 % Befehl f. normale Schriftart und -größe
 
 
 % Befehl f. normale Schriftart und -größe

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index 8b671301b80b932cdc6103a657aa07db81c470be..983ffa2cb62384291ae571463f74d3450577103d 100644 (file)
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
 \NeedsTeXFormat{LaTeX2e}

-\ProvidesPackage{kiviletter}[2020/04/24 Letter Layouts for Kivitendo]
+\ProvidesPackage{kiviletter}[2022/04/23 Letter Layouts for Kivitendo]

 
 \RequirePackage{l3keys2e}
 
 
 \RequirePackage{l3keys2e}
 


@@ -642,17 +642,30 @@
   }
 }
 
   }
 }
 

-\newcommand*{\setupCurrencyConfig}[2]{
+\newcommand*{\setupCurrencyConfig}[3][euro]{

   \tl_new:N \g_kivi_currency_tl
   \tl_new:N \g_kivi_currency_tl

-  \exp_args:Nf \str_if_in:nnT {#2} {USD} {\tl_gset:Nn \g_kivi_currency_tl {usd}}
-  \exp_args:Nf \str_if_in:nnT {#2} {CHF} {\tl_gset:Nn \g_kivi_currency_tl {chf}}
-  \exp_args:Nf \str_if_in:nnT {#2} {EUR} {\tl_gset:Nn \g_kivi_currency_tl {euro}}
+  \exp_args:Nf \str_if_in:nnT {#3} {USD} {\tl_gset:Nn \g_kivi_currency_tl {usd}}
+  \exp_args:Nf \str_if_in:nnT {#3} {CHF} {\tl_gset:Nn \g_kivi_currency_tl {chf}}
+  \exp_args:Nf \str_if_in:nnT {#3} {EUR} {\tl_gset:Nn \g_kivi_currency_tl {euro}}

   \tl_if_empty:NT  \g_kivi_currency_tl {
   \tl_if_empty:NT  \g_kivi_currency_tl {

-    \tl_gset:Nn \g_kivi_currency_tl {euro} % euro ist standard, chf oder usd alternativ
+    \tl_if_empty:nTF {#3} {
+      \tl_gset:Nn \g_kivi_currency_tl {#1}
+    } {
+      \tl_gset:Nn \g_kivi_currency_tl {#3}
+    }

   }
   }

-  \input{#1/\g_kivi_currency_tl _account.tex}
+  \input{#2/\g_kivi_currency_tl _account.tex}
+  \let\setupCurrencyConfig\_kivi_currency_already_configured:w
+}
+
+\newcommand*{\_kivi_currency_already_configured:w}[3][euro]{
+  \msg_error:nnx {kiviletter} {currency-already-configured} {\g_kivi_currency_tl}

 }
 
 }
 

+\msg_new:nnn {kiviletter} {currency-already-configured} {
+  The~currency~configuration~is~a~global~setting~for~each~document.\\
+  It's~already~set~to~#1,~please~remove~the~second~call~of~\string\setupCurrencyConfig.
+}

 \ExplSyntaxOff
 
 
 \ExplSyntaxOff