projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
marei: headline/colspec keys for SimpleTabular
[kivitendo-erp.git]
/
templates
/
print
/
marei
/
sales_order.tex
diff --git
a/templates/print/marei/sales_order.tex
b/templates/print/marei/sales_order.tex
index
81b4f40
..
7eac6ae
100644
(file)
--- a/
templates/print/marei/sales_order.tex
+++ b/
templates/print/marei/sales_order.tex
@@
-19,15
+19,15
@@
\begin{document}
\setkomavar{title}{
\auftragsbestaetigung~
\begin{document}
\setkomavar{title}{
\auftragsbestaetigung~
- \nr~<%ordnumber%>
+ \nr~<%ordnumber%>
%
}
\setkomavar*{date}{\datum}
\setkomavar{date}{<%orddate%>}
}
\setkomavar*{date}{\datum}
\setkomavar{date}{<%orddate%>}
-<%if cusordnumber%>
+<%if cusordnumber%>
%
\setkomavar*{yourref}{\ihreBestellnummer}
\setkomavar{yourref}{<%cusordnumber%>}
\setkomavar*{yourref}{\ihreBestellnummer}
\setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>
-<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>
+<%end if%>
%
+<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>
%
\setkomavar{customer}{<%customernumber%>}
\setkomavar{fromname}{<%employee_name%>}
\setkomavar{fromphone}{<%employee_tel%>}
\setkomavar{customer}{<%customernumber%>}
\setkomavar{fromname}{<%employee_name%>}
\setkomavar{fromphone}{<%employee_tel%>}
@@
-36,7
+36,7
@@
-<%if shiptoname%>
+<%if shiptoname%>
%
\makeatletter
\begin{lrbox}\shippingAddressBox
\parbox{\useplength{toaddrwidth}}{
\makeatletter
\begin{lrbox}\shippingAddressBox
\parbox{\useplength{toaddrwidth}}{
@@
-52,26
+52,27
@@
<%shiptodepartment_1%>\par
<%shiptodepartment_2%>\par
<%shiptostreet%>\par
<%shiptodepartment_1%>\par
<%shiptodepartment_2%>\par
<%shiptostreet%>\par
- <%shiptozipcode%> <%shiptocity%>
+ <%shiptozipcode%> <%shiptocity%>
%
}
\end{lrbox}
\makeatother
}
\end{lrbox}
\makeatother
-<%end if%>
+<%end if%>
%
\begin{letter}{
<%name%>\strut\\
\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
}
<%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%>}{}
\opening{
\ifstr{<%cp_name%>}{}
- {
\anrede
}
+ {
<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>
}
{
\ifstr{<%cp_gender%>}{f}
{\anredefrau}
{
\ifstr{<%cp_gender%>}{f}
{\anredefrau}
@@
-100,30
+101,30
@@
<%sellprice%>&%
\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
<%linetotal%>\tabularnewline
<%sellprice%>&%
\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
<%linetotal%>\tabularnewline
- <%end number%>
+ <%end number%>
%
}
\begin{PricingTotal}
% Tabellenende letzte Seite
\nettobetrag & <%subtotal%>\\
}
\begin{PricingTotal}
% Tabellenende letzte Seite
\nettobetrag & <%subtotal%>\\
- <%foreach tax%>
+ <%foreach tax%>
%
<%taxdescription%> & <%tax%>\\
<%taxdescription%> & <%tax%>\\
- <%end tax%>
+ <%end tax%>
%
\bfseries\schlussbetrag & \bfseries <%ordtotal%>\\
\end{PricingTotal}
\end{PricingTabular*}
\bfseries\schlussbetrag & \bfseries <%ordtotal%>\\
\end{PricingTotal}
\end{PricingTabular*}
-<%if notes%>
-<%notes%>
+<%if notes%>
%
+<%notes%>
%
\medskip
\medskip
-<%end if%>
+<%end if%>
%
-<%if delivery_term%>
+<%if delivery_term%>
%
\lieferung ~<%delivery_term.description_long%>\\
\lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>
+<%end delivery_term%>
%
-<%if reqdate%>
+<%if reqdate%>
%
\lieferungErfolgtAm ~<%reqdate%>.
\lieferungErfolgtAm ~<%reqdate%>.
-<%end if%>
+<%end if%>
%
\textit{\auftragpruefen}
\textit{\auftragpruefen}