X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2Fmarei%2Finvoice.tex;h=b434e0b9400a7407da874f50b2b184ccf9744d6f;hb=424ee46d4d1c360cc86e05a43d14c02c71db15e2;hp=3e36ab1b5cd104ada6a7340075ab6a7b8a7b65e7;hpb=b1aea59dfef7b8e2fac9f0059d6a304ef1c505bf;p=kivitendo-erp.git diff --git a/templates/print/marei/invoice.tex b/templates/print/marei/invoice.tex index 3e36ab1b5..b434e0b94 100644 --- a/templates/print/marei/invoice.tex +++ b/templates/print/marei/invoice.tex @@ -65,32 +65,32 @@ \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} <%if notes%>% - <%notes%>% - \vspace{0.5cm} +<%notes%>% +\vspace{0.5cm} <%end if%>% @@ -108,57 +108,57 @@ % amount = 1cm, % Setzt die Breite der Mengenspalte auf 1cm % desc/header = Artikelbeschreibung, %Ändert die Überschrift der Bezeichnunsspalte in „Artikelbeschreibung” \begin{PricingTabular*}% - % eigentliche Tabelle - \FakeTable{% - <%foreach number%>% - <%runningnumber%> &% - <%number%> &% - \textbf{<%description%>}% - <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>% - <%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 <%invtotal%>\\% - \end{PricingTotal}% + % eigentliche Tabelle + \FakeTable{% + <%foreach number%>% + <%runningnumber%> &% + <%number%> &% + \textbf{<%description%>}% + <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>% + <%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 <%invtotal%>\\% + \end{PricingTotal}% \end{PricingTabular*} \vspace{0.2cm} \Ifstr{<%deliverydate%>}{}{}{% - \leistungsdatumGleichRechnungsdatum% + \leistungsdatumGleichRechnungsdatum% }{ - \lieferungErfolgtAm ~<%deliverydate%>. + \lieferungErfolgtAm ~<%deliverydate%>. }\\ <%if payment_terms%>% - \zahlung ~<%payment_terms%>\\ +\zahlung ~<%payment_terms%>\\ <%end payment_terms%>% <%if delivery_term%>% - \lieferung ~<%delivery_term.description_long%>\\ +\lieferung ~<%delivery_term.description_long%>\\ <%end delivery_term%>% <%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>% \ifnum<%taxzone_id%>=1 - \steuerfreiEU\\ % EU mit USt-ID Nummer +\steuerfreiEU\\ % EU mit USt-ID Nummer \else - \ifnum<%taxzone_id%>=3 - \steuerfreiAUS\\ % Außerhalb EU - \fi +\ifnum<%taxzone_id%>=3 +\steuerfreiAUS\\ % Außerhalb EU +\fi \fi \closing{\gruesse}