projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EK-Bericht Suchoptionen für Sollkonto und Erfassungsdatum
[kivitendo-erp.git]
/
templates
/
print
/
marei
/
purchase_order.tex
diff --git
a/templates/print/marei/purchase_order.tex
b/templates/print/marei/purchase_order.tex
index
c0484c0
..
677e2ab
100644
(file)
--- a/
templates/print/marei/purchase_order.tex
+++ b/
templates/print/marei/purchase_order.tex
@@
-16,25
+16,28
@@
\ourhead{}{}{\bestellung}{<%ordnumber%>}{<%orddate%>}
\ourhead{}{}{\bestellung}{<%ordnumber%>}{<%orddate%>}
-\begin{document}
-
-\setkomavar{title}{
- \bestellung~
- \nr~<%ordnumber%>
-}
\setkomavar*{date}{\datum}
\setkomavar{date}{<%orddate%>}
\setkomavar*{date}{\datum}
\setkomavar{date}{<%orddate%>}
-<%if cusordnumber%>
-\setkomavar*{yourref}{\unsereBestellnummer}
-\setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>
-<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>
+
\setkomavar{fromname}{<%employee_name%>}
\setkomavar{fromphone}{<%employee_tel%>}
\setkomavar{fromemail}{<%employee_email%>}
\setkomavar{fromname}{<%employee_name%>}
\setkomavar{fromphone}{<%employee_tel%>}
\setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{
+ \bestellung~
+ \nr~<%ordnumber%>%
+}
+
+<%if cusordnumber%>%
+ \setkomavar*{yourref}{\unsereBestellnummer}
+ \setkomavar{yourref}{<%cusordnumber%>}
+<%end if%>%
\setkomavar{transaction}{<%transaction_description%>}
\setkomavar{transaction}{<%transaction_description%>}
-<%if shiptoname%>
+<%if quonumber%>
+ \setkomavar{quote}{<%quonumber%>}
+<%end if%>%
+
+<%if shiptoname%>%
\makeatletter
\begin{lrbox}\shippingAddressBox
\parbox{\useplength{toaddrwidth}}{
\makeatletter
\begin{lrbox}\shippingAddressBox
\parbox{\useplength{toaddrwidth}}{
@@
-50,33
+53,35
@@
<%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{document}
\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{
\opening{
- \
i
fstr{<%cp_name%>}{}
-
{\anrede
}
-
{
- \
i
fstr{<%cp_gender%>}{f}
+ \
I
fstr{<%cp_name%>}{}
+
{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>
}
+ {
+ \
I
fstr{<%cp_gender%>}{f}
{\anredefrau}
{\anredeherr}
<%cp_title%> <%cp_name%>,
{\anredefrau}
{\anredeherr}
<%cp_title%> <%cp_name%>,
-
}
+ }
}
\thispagestyle{kivitendo.letter.first}
}
\thispagestyle{kivitendo.letter.first}
@@
-85,7
+90,7
@@
\begin{PricingTabular*}
% eigentliche Tabelle
\FakeTable{
\begin{PricingTabular*}
% eigentliche Tabelle
\FakeTable{
-
<%foreach number%>%
+ <%foreach number%>%
<%runningnumber%> &%
<%number%> &%
\textbf{<%description%>}%
<%runningnumber%> &%
<%number%> &%
\textbf{<%description%>}%
@@
-97,28
+102,28
@@
&%
<%qty%> <%unit%> &%
<%sellprice%>&%
&%
<%qty%> <%unit%> &%
<%sellprice%>&%
- \
i
fstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
+ \
I
fstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
<%linetotal%>\tabularnewline
<%linetotal%>\tabularnewline
- <%end number%>
- }
- \begin{PricingTotal}
+ <%end number%>%
+ }
%
+ \begin{PricingTotal}
%
% Tabellenende letzte Seite
% Tabellenende letzte Seite
- \nettobetrag & <%subtotal%>\\
- <%foreach tax%>
- <%taxdescription%> & <%tax%>\\
- <%end tax%>
- \bfseries\schlussbetrag & \bfseries <%ordtotal%>\\
+ \nettobetrag & <%subtotal%>\\
%
+ <%foreach tax%>
%
+ <%taxdescription%> & <%tax%>\\
%
+ <%end tax%>
%
+ \bfseries\schlussbetrag & \bfseries <%ordtotal%>\\
%
\end{PricingTotal}
\end{PricingTabular*}
\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%>
%
\closing{\gruesse}
\end{letter}
\closing{\gruesse}
\end{letter}