X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Frequest_quotation.tex;fp=templates%2Fprint%2Fmarei%2Frequest_quotation.tex;h=0cfc11934a752e45c536eb245d76fffee968710c;hp=963173598ac6129065ebd48bf58dd7a92d0e23c3;hb=b293ff8ad52fc76ba0c44783e3982418114d6b08;hpb=d4925a8b60f04674885e30d9316dc0263f8b9a84 diff --git a/templates/print/marei/request_quotation.tex b/templates/print/marei/request_quotation.tex index 963173598..0cfc11934 100644 --- a/templates/print/marei/request_quotation.tex +++ b/templates/print/marei/request_quotation.tex @@ -23,11 +23,11 @@ \setkomavar{fromphone}{<%employee_tel%>} \setkomavar{fromemail}{<%employee_email%>} \setkomavar{title}{ - \anfrage~ - \nr ~<%quonumber%>% + \anfrage~ + \nr ~<%quonumber%>% } <%if globalprojectnumber%>% - \setkomavar{projectID}{<%globalprojectnumber%>} + \setkomavar{projectID}{<%globalprojectnumber%>} <%end globalprojectnumber%>% \setkomavar{transaction}{<%transaction_description%>} @@ -35,48 +35,48 @@ \begin{document} \begin{letter}{ - <%name%>\strut\\ - <%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 - } +<%name%>\strut\\ +<%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 +} % Bei Kontaktperson Anrede nach Geschlecht unterscheiden. % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede. \opening{ - \Ifstr{<%cp_name%>}{} - {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>} - { - \Ifstr{<%cp_gender%>}{f} - {\anredefrau} - {\anredeherr} - <%cp_title%> <%cp_name%>, - } -} +\Ifstr{<%cp_name%>}{} +{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>} + { + \Ifstr{<%cp_gender%>}{f} + {\anredefrau} + {\anredeherr} + <%cp_title%> <%cp_name%>, + } + } \thispagestyle{kivitendo.letter.first} \anfrageformel \begin{PricingTabular*}[columns={pos,amount,desc}] -% eigentliche Tabelle -\FakeTable{ -<%foreach number%>% - <%runningnumber%> & - <%qty%> <%unit%> & - \textbf{<%description%>} - <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>% - <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>% - <%if make%>% - <%foreach make%>% - \Ifstr{<%make%>}{<%name%>}{\ExtraDescription{\artikelnummer: <%model%>}}{} - <%end foreach%>% - <%end if%>% - \tabularnewline -<%end number%>% -}% + % eigentliche Tabelle + \FakeTable{ + <%foreach number%>% + <%runningnumber%> & + <%qty%> <%unit%> & + \textbf{<%description%>} + <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>% + <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>% + <%if make%>% + <%foreach make%>% + \Ifstr{<%make%>}{<%name%>}{\ExtraDescription{\artikelnummer: <%model%>}}{} + <%end foreach%>% + <%end if%>% + \tabularnewline + <%end number%>% + }% \end{PricingTabular*} @@ -87,7 +87,7 @@ <%if delivery_term%>% - \lieferung ~<%delivery_term.description_long%>\\ +\lieferung ~<%delivery_term.description_long%>\\ <%end delivery_term%>% <%if reqdate%>%