new structure to sales_delivery_order.tex

[mfinanz.git] / kiviletter.sty

diff --git a/kiviletter.sty b/kiviletter.sty
index 31fbeb9bbfb981c87e834f507901f0052394230b..e3a41da0ccef63b882c182e07c73cab6d2e15a3f 100644 (file)
--- a/kiviletter.sty
+++ b/kiviletter.sty
@@ -41,6 +41,12 @@
        ]{scrletter}
 \LoadLetterOption{DIN}
 
+\newkomavar{transaction}
+\newkomavar[\lieferschein{}~\nr]{delivery}
+\newkomavar[\angebot{}~\nr]{quote}
+\newkomavar{orderID}
+\newkomavar{projectID}
+
 \usepackage{geometry}
 
 \ExplSyntaxOn
@@ -62,7 +68,7 @@
 \DeclareNewLayer[
 foreground,
 hoffset=\useplength{toaddrhpos},
-voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+\baselineskip,
+voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+4\baselineskip,
 contents={\usebox\shippingAddressBox}
 ]{kivitendo.shippingaddress}
 
@@ -92,16 +98,30 @@ 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
+       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
+       kivitendo.TableFoot,
+       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}
+
+\setkomavar{firsthead}{
+       \if@logo
+       \rlap{\usekomavar{fromlogo}}%
+       \fi
+}
+
 \@setplength{locwidth}{6cm}
 
 \ExplSyntaxOn
@@ -266,34 +286,45 @@ align=bl,
        }
        \bool_gset_false:N \g_kivi_restore_geometry_bool
 }
-%\ExplSyntaxOff
+
+
 
 \if@kivi@infobox
-\newkomavar{locationtitle}
 \setkomavar{location}{
-       \begin{flushright}
-               \bfseries
-               \LARGE
-               \usekomavar{locationtitle}
-       \end{flushright}
+       \ifkomavarempty{transaction}{}{
+       \bfseries
+       \usekomavar{transaction}
+       }
        \par
        \medskip
        \begin{tabularx}{\linewidth}{@{}l<{:}>{\raggedright\arraybackslash}X@{}}
-               \datum&\usekomavar{date}\\
+               \usekomavar*{date}&\usekomavar{date}\\
+               \ifkomavarempty{myref}{}{
+                       \usekomavar*{myref}&\usekomavar{myref}\\
+               }
                \kundennummer&\usekomavar{customer}\\
+               \ifkomavarempty{yourref}{}{
+                       \usekomavar*{yourref}&\usekomavar{yourref}\\
+               }
+               \ifkomavarempty{delivery}{}{
+                       \usekomavar*{delivery}&\usekomavar{delivery}\\
+               }
+               \ifkomavarempty{quote}{}{
+                       \usekomavar*{quote}&\usekomavar{quote}\\
+               }
                \ansprechpartner&\usekomavar{fromname}
                \ifkomavarempty{fromphone}{}{\\\textTelefon&\usekomavar{fromphone}}
                \ifkomavarempty{fromemail}{}{\\\textEmail&\usekomavar{fromemail}}
+               \ifkomavarempty{projectID}{}{\\\projektnummer&\usekomavar{projectID}}
+               \ifkomavarempty{orderID}{}{\\\auftragsnummer&\usekomavar{orderID}}
        \end{tabularx}
 }
 \removereffields
-
-%\ExplSyntaxOn
 \AtBeginLetter{
-       \ifkomavarempty{title}{}{
-               \exp_args:Nno\setkomavar{locationtitle}{\scr@title@var}
-               \setkomavar{title}{}
-       }
+       \ifdim\ht\shippingAddressBox>\z@
+       \addtoplength{refvpos}{\ht\shippingAddressBox}
+       \addtoplength{refvpos}{4\baselineskip}
+       \fi
 }
 \ExplSyntaxOff
 \fi