Merge branch 'debian' into b-3.6.1

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

diff --git a/templates/print/marei/invoice.tex b/templates/print/marei/invoice.tex
index 04cf99e..b8970c2 100644 (file)
--- a/templates/print/marei/invoice.tex
+++ b/templates/print/marei/invoice.tex
@@ -21,6 +21,13 @@
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
 
+<%if template_meta.formname == "invoice_for_advance_payment"%>
+  \renewcommand{\rechnung}{\anzahlungsrechnung}
+<%end if%>
+
+<%if template_meta.formname == "final_invoice"%>
+  \renewcommand{\rechnung}{\schlussrechnung}
+<%end if%>
 
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\rechnung}{<%invnumber%>}{<%invdate%>}
@@ -38,6 +45,10 @@
   \setkomavar*{myref}{\auftragsnummer}
   \setkomavar{myref}{<%ordnumber%>}
 <%end if%>%
+<%if tax_point%>%
+  \setkomavar*{taxpoint}{\leistungsdatum}
+  \setkomavar{taxpoint}{<%tax_point%>}
+<%end if%>%
 <%if cusordnumber%>%
   \setkomavar*{yourref}{\ihreBestellnummer}
   \setkomavar{yourref}{<%cusordnumber%>}
@@ -50,6 +61,7 @@
 \setkomavar{quote}{<%quonumber%>}
 <%end if%>%
 
+\setkomavar{transaction}{<%transaction_description%>}
 <%if shiptoname%>%
 \makeatletter
 \begin{lrbox}\shippingAddressBox
@@ -147,6 +159,18 @@
 
 \vspace{0.2cm}
 
+<%if template_meta.formname == "final_invoice"%>
+  <%if iap_existing%>
+    \abzueglichAnzahlungsrechnungen:\\
+    \begin{SimpleTabular}[colspec=llr<{\tabcurrency}r<{\tabcurrency},headline={\bfseries\nr& \bfseries\date& \bfseries\betrag & \bfseries\ust}]%
+      <%foreach iap_invnumber%>%
+        <%iap_invnumber%> & <%iap_transdate_as_date%> & <%iap_amount%> & <%iap_taxamount%>\\%
+      <%end iap_invnumber%>%
+    \end{SimpleTabular}%
+      \bfseries\rechnungsbetrag: <%iap_final_amount%> \currency\\%
+  <%end iap_available%>
+<%end%>%
+
 \Ifstr{<%deliverydate%>}{}{%
   \leistungsdatumGleichRechnungsdatum%
 }{