Lieferschein: Serienummer ist Pflichtfeld, wenn Artikel eine Serienummer hat

[kivitendo-erp.git] / templates / print / marei / credit_note.tex

diff --git a/templates/print/marei/credit_note.tex b/templates/print/marei/credit_note.tex
index f8744bb..8c05c10 100644 (file)
--- a/templates/print/marei/credit_note.tex
+++ b/templates/print/marei/credit_note.tex
@@ -15,16 +15,30 @@
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\gutschrift}{<%invnumber%>}{<%invdate%>}
 
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%transdate%>}       
+\setkomavar{customer}{<%customernumber%>}
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+       \gutschrift~
+       \nr ~<%invnumber%>%
+}
+
+<%if invnumber_for_credit_note%>%
+       \setkomavar*{myref}{\fuerRechnung}
+       \setkomavar{myref}{<%invnumber_for_credit_note%>}
+<%end if%>%
+
 
-\begin{document}
-       
 
 <%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
        \parbox{\useplength{toaddrwidth}}{
                \backaddr@format{\scriptsize\usekomafont{backaddress}%
-                       \strut abweichende Lieferadresse
+                       \strut\abweichendeLieferadresse
                }
                \par\smallskip
                \setlength{\parskip}{\z@}
@@ -41,25 +55,8 @@
 \makeatother
 <%end if%>%
 
-       
-\setkomavar{title}{
-       \gutschrift~
-       \nr ~<%invnumber%>%
-}
-
-<%if invnumber_for_credit_note%>%
-\setkomavar*{myref}{\fuerRechnung}
-\setkomavar{myref}{<%invnumber_for_credit_note%>}
-<%end if%>%
-
-\setkomavar*{date}{\datum}
+\begin{document}
 
-\setkomavar{date}{<%transdate%>}
-\setkomavar{customer}{<%customernumber%>}
-\setkomavar{fromname}{<%employee_name%>}
-\setkomavar{fromphone}{<%employee_tel%>}
-\setkomavar{fromemail}{<%employee_email%>}
-       
 \begin{letter}{
                <%name%>\strut\\
                <%if department_1%><%department_1%>\\<%end if%>%
@@ -73,27 +70,27 @@
 % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
 % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
 \opening{
-       \ifstr{<%cp_name%>}{}
+       \Ifstr{<%cp_name%>}{}
                {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
                {
-                       \ifstr{<%cp_gender%>}{f}
+                       \Ifstr{<%cp_gender%>}{f}
                                {\anredefrau}
                                {\anredeherr}
                                <%cp_title%> <%cp_name%>,
-                       }
                }
+       }
 \thispagestyle{kivitendo.letter.first}
 
 
 \gutschriftformel
 
-\begin{PricingTabular*}
-% eigentliche Tabelle
-\FakeTable{
+\begin{PricingTabular*}%
+% eigentliche Tabelle%
+\FakeTable{%
        <%foreach number%>%
-       <%runningnumber%> &%
-       <%number%> &%
-       \textbf{<%description%>}%
+               <%runningnumber%> &%
+               <%number%> &%
+               \textbf{<%description%>}%
                <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
                <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
                <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
@@ -101,18 +98,18 @@
                &%
                <%qty%> <%unit%> &%
                <%sellprice%>&%
-               \ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
-                       <%linetotal%>\tabularnewline
-                       <%end number%>%
-       }
-       \begin{PricingTotal}
+               \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
+               <%linetotal%>\tabularnewline%
+       <%end number%>%
+       }%
+       \begin{PricingTotal}%
                % Tabellenende letzte Seite
-               \nettobetrag & <%subtotal%>\\
+               \nettobetrag & <%subtotal%>\\%
                <%foreach tax%>%
-               <%taxdescription%> & <%tax%>\\
+               <%taxdescription%> & <%tax%>\\%
                <%end tax%>%
-               \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
-       \end{PricingTotal}
+               \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
+       \end{PricingTotal}%
 \end{PricingTabular*}
 
 <%if notes%>%