X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Fsales_order.tex;h=e0c8f30db209bfb01d9af43171553b6d3dde0881;hb=549f187d3a2b1d15f96c4556714666ed954447bb;hp=7eac6ae7cfc00dd3b90a7f1f4725536b5cb31168;hpb=9aa2a4ab43ef36bc672e54dd82964ce5fb0dd738;p=kivitendo-erp.git diff --git a/templates/print/marei/sales_order.tex b/templates/print/marei/sales_order.tex index 7eac6ae7c..e0c8f30db 100644 --- a/templates/print/marei/sales_order.tex +++ b/templates/print/marei/sales_order.tex @@ -16,101 +16,108 @@ \ourhead{\kundennummer}{<%customernumber%>}{\auftragsbestaetigung}{<%ordnumber%>}{<%orddate%>} -\begin{document} -\setkomavar{title}{ - \auftragsbestaetigung~ - \nr~<%ordnumber%>% -} + \setkomavar*{date}{\datum} \setkomavar{date}{<%orddate%>} -<%if cusordnumber%>% -\setkomavar*{yourref}{\ihreBestellnummer} -\setkomavar{yourref}{<%cusordnumber%>} -<%end if%>% -<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>% \setkomavar{customer}{<%customernumber%>} \setkomavar{fromname}{<%employee_name%>} \setkomavar{fromphone}{<%employee_tel%>} \setkomavar{fromemail}{<%employee_email%>} +\setkomavar{title}{ + \auftragsbestaetigung~ + \nr~<%ordnumber%>% +} +<%if tax_point%>% + \setkomavar*{taxpoint}{\leistungsdatum} + \setkomavar{taxpoint}{<%tax_point%>} +<%end if%>% +<%if cusordnumber%>% + \setkomavar*{yourref}{\ihreBestellnummer} + \setkomavar{yourref}{<%cusordnumber%>} +<%end if%>% \setkomavar{transaction}{<%transaction_description%>} - +<%if quonumber%> + \setkomavar{quote}{<%quonumber%>} +<%end if%>% <%if shiptoname%>% \makeatletter \begin{lrbox}\shippingAddressBox - \parbox{\useplength{toaddrwidth}}{ - \backaddr@format{\scriptsize\usekomafont{backaddress}% - \strut abweichende Lieferadresse - } - \par\smallskip - \setlength{\parskip}{\z@} - \par - \normalsize - <%shiptoname%>\par - <%if shiptocontact%> <%shiptocontact%><%end if%>\par - <%shiptodepartment_1%>\par - <%shiptodepartment_2%>\par - <%shiptostreet%>\par - <%shiptozipcode%> <%shiptocity%>% - } + \parbox{\useplength{toaddrwidth}}{ + \backaddr@format{\scriptsize\usekomafont{backaddress}% + \strut abweichende Lieferadresse + } + \par\smallskip + \setlength{\parskip}{\z@} + \par + \normalsize + <%shiptoname%>\par + <%if shiptocontact%> <%shiptocontact%><%end if%>\par + <%shiptodepartment_1%>\par + <%shiptodepartment_2%>\par + <%shiptostreet%>\par + <%shiptozipcode%> <%shiptocity%>% + } \end{lrbox} \makeatother <%end if%>% +\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} \auftragsformel \begin{PricingTabular*} - % eigentliche Tabelle - \FakeTable{ - <%foreach number%>% - <%runningnumber%> &% - <%number%> &% - \textbf{<%description%>}% - <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>% - <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>% - <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>% - <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>% - <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>% - &% - <%qty%> <%unit%> &% - <%sellprice%>&% - \ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}% - <%linetotal%>\tabularnewline - <%end number%>% - } - \begin{PricingTotal} - % Tabellenende letzte Seite - \nettobetrag & <%subtotal%>\\ - <%foreach tax%>% - <%taxdescription%> & <%tax%>\\ - <%end tax%>% - \bfseries\schlussbetrag & \bfseries <%ordtotal%>\\ - \end{PricingTotal} + % eigentliche Tabelle + \FakeTable{ + <%foreach number%>% + <%runningnumber%> &% + <%number%> &% + \textbf{<%description%>}% + <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>% + <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>% + <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>% + <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>% + <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>% + &% + <%qty%> <%unit%> &% + <%sellprice%>&% + \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}% + <%linetotal%>\tabularnewline + <%end number%>% + }% + \begin{PricingTotal}% + % Tabellenende letzte Seite + \nettobetrag & <%subtotal%>\\% + <%foreach tax%>% + <%taxdescription%> & <%tax%>\\% + <%end tax%>% + \bfseries\schlussbetrag & \bfseries <%ordtotal%>\\% + \end{PricingTotal} \end{PricingTabular*} <%if notes%>% @@ -119,7 +126,7 @@ <%end if%>% <%if delivery_term%>% - \lieferung ~<%delivery_term.description_long%>\\ +\lieferung ~<%delivery_term.description_long%>\\ <%end delivery_term%>% <%if reqdate%>% @@ -133,4 +140,3 @@ \end{letter} \end{document} -