SL::Locale::String: ne überladen

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

diff --git a/templates/print/marei/sales_quotation.tex b/templates/print/marei/sales_quotation.tex
index 544105f..0190046 100644 (file)
--- a/templates/print/marei/sales_quotation.tex
+++ b/templates/print/marei/sales_quotation.tex
@@ -33,17 +33,17 @@
 \setkomavar{fromemail}{<%employee_email%>}
 \setkomavar{title}{
        \angebot~
-       <%quonumber%>
+       <%quonumber%>%
 }
 
 \setkomavar{transaction}{<%transaction_description%>}
 
-<%if shiptoname%>
+<%if shiptoname%>%
 \makeatletter
   \begin{lrbox}\shippingAddressBox
   \parbox{\useplength{toaddrwidth}}{
        \backaddr@format{\scriptsize\usekomafont{backaddress}%
-               \strut abweichende Lieferadresse
+               \strut\abweichendeLieferadresse
        }
        \par\smallskip
        \setlength{\parskip}{\z@}
@@ -54,29 +54,30 @@
        <%shiptodepartment_1%>\par
        <%shiptodepartment_2%>\par
        <%shiptostreet%>\par
-       <%shiptozipcode%> <%shiptocity%>
+       <%shiptozipcode%> <%shiptocity%>%
  }
 \end{lrbox}
 \makeatother
-<%end if%>
+<%end if%>%
 
 
 \begin{letter}{
   <%name%>\strut\\
-  <%if department_1%><%department_1%>\\<%end if%>
-  <%if department_2%><%department_2%>\\<%end if%>
+  <%if department_1%><%department_1%>\\<%end if%>%
+  <%if department_2%><%department_2%>\\<%end if%>%
   <%cp_givenname%> <%cp_name%>\strut\\
   <%street%>\strut\\
   <%zipcode%> <%city%>\strut\\
   <%country%> \strut
 }
 
-% Anrede nach Geschlecht unterscheiden
+% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
 \opening{
-       \ifstr{<%cp_name%>}{}
-               {\anrede}
+       \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%>,
@@ -102,33 +103,33 @@
        &%
        <%qty%> <%unit%> &%
        <%sellprice%>&%
-       \ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
+       \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
                        <%linetotal%>\tabularnewline
-<%end number%>
+<%end number%>%
 }
        \begin{PricingTotal}
        % Tabellenende letzte Seite
        \nettobetrag & <%subtotal%>\\
-       <%foreach tax%>
+       <%foreach tax%>%
        <%taxdescription%> & <%tax%>\\
-       <%end tax%>
+       <%end tax%>%
        \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
        \end{PricingTotal}
 \end{PricingTabular*}
 
-<%if notes%>
-  <%notes%>
+<%if notes%>%
+  <%notes%>%
   \medskip
-<%end if%>
+<%end if%>%
 
-<%if delivery_term%>
+<%if delivery_term%>%
   \lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>
+<%end delivery_term%>%
 
 \angebotdanke\\
-<%if reqdate%>
+<%if reqdate%>%
 \angebotgueltig~<%reqdate%>.
-<%end if%>
+<%end if%>%
 \angebotfragen