Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 9aa2a4ab

Von Marei (peiTeX) vor etwa 4 Jahren hinzugefügt

  • ID 9aa2a4ab43ef36bc672e54dd82964ce5fb0dd738
  • Vorgänger e12489db
  • Nachfolger 0db514d1

marei: comment generated line endings

Unterschiede anzeigen:

templates/print/marei/bin_list.tex
28 28

  
29 29
\parbox{\textwidth}{
30 30
  \parbox[b]{.42\textwidth}{%
31
    <%company%>
31
    <%company%>%
32 32

  
33
    <%address%>
33
    <%address%>%
34 34
  }\hfill
35 35
  \begin{tabular}[b]{rr@{}}
36 36
  Tel & <%tel%>\\
37
  Fax & <%fax%>
37
  Fax & <%fax%>%
38 38
  \end{tabular}
39 39

  
40 40
  \rule[1.5ex]{\textwidth}{0.5pt}
......
51 51
<%street%> \\
52 52
<%zipcode%> \\
53 53
<%city%> \\
54
<%country%>
54
<%country%>%
55 55
}
56 56
\parbox[t]{.4\textwidth}{
57 57
\textbf{Lieferanschrift}
......
61 61
<%shiptostreet%> \\
62 62
<%shiptozipcode%> \\
63 63
<%shiptocity%> \\
64
<%shiptocountry%>
64
<%shiptocountry%>%
65 65
}
66 66
\hfill
67 67

  
......
74 74

  
75 75
\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
76 76
  \textbf{BestellNr. \#} & \textbf{Datum} & \textbf{Kontakt}
77
  <%if warehouse%>
77
  <%if warehouse%>%
78 78
  & \textbf{Lager}
79
  <%end warehouse%>
79
  <%end warehouse%>%
80 80
  & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5em]
81 81
  \hline
82 82

  
83
  <%ordnumber%>
84
  <%if shippingdate%>
85
  & <%shippingdate%>
86
  <%end shippingdate%>
87
  <%if not shippingdate%>
88
  & <%orddate%>
89
  <%end shippingdate%>
90
  & <%employee%>
91
  <%if warehouse%>
92
  & <%warehouse%>
93
  <%end warehouse%>
83
  <%ordnumber%>%
84
  <%if shippingdate%>%
85
  & <%shippingdate%>%
86
  <%end shippingdate%>%
87
  <%if not shippingdate%>%
88
  & <%orddate%>%
89
  <%end shippingdate%>%
90
  & <%employee%>%
91
  <%if warehouse%>%
92
  & <%warehouse%>%
93
  <%end warehouse%>%
94 94
  & <%shippingpoint%> & <%shipvia%> \\
95 95
  \hline
96 96
\end{tabularx}
......
100 100
\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
101 101
  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Seriennumner} & & \textbf{Menge} & \textbf{Erh} & & \textbf{Lagerplatz} \\
102 102

  
103
<%foreach number%>
103
<%foreach number%>%
104 104
  <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
105 105
  <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
106
<%end number%>
106
<%end number%>%
107 107
\end{tabularx}
108 108

  
109 109

  
templates/print/marei/check.tex
21 21
\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
22 22

  
23 23
\parbox[t]{12cm}{
24
  <%company%>
24
  <%company%>%
25 25

  
26 26
  <%address%>}
27 27
\hfill
......
33 33

  
34 34
\vspace{0.5cm}
35 35

  
36
\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
36
\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>%
37 37

  
38 38
\vspace{0.5cm}
39 39

  
40
<%name%>
40
<%name%>%
41 41

  
42
<%street%>
42
<%street%>%
43 43

  
44
<%zipcode%>
44
<%zipcode%>%
45 45

  
46
<%city%>
46
<%city%>%
47 47

  
48
<%country%>
48
<%country%>%
49 49

  
50 50
\vspace{2.8cm}
51 51

  
52
<%company%>
52
<%company%>%
53 53

  
54 54
\vspace{0.5cm}
55 55

  
56
<%name%> \hfill <%datepaid%> \hfill <%source%>
56
<%name%> \hfill <%datepaid%> \hfill <%source%>%
57 57

  
58 58
\vspace{0.5cm}
59 59
\begin{tabularx}{\textwidth}{lXrr@{}}
60 60
\textbf{Rechnung} & \textbf{Ausgestellt}
61 61
  & \textbf{Fällig} & \textbf{Verrechnet} \\
62
<%foreach invnumber%>
62
<%foreach invnumber%>%
63 63
<%invnumber%> & <%invdate%> \dotfill
64 64
  & <%due%> & <%paid%> \\
65
<%end invnumber%>
65
<%end invnumber%>%
66 66
\end{tabularx}
67 67

  
68 68
\vfill
templates/print/marei/credit_note.tex
19 19
\begin{document}
20 20
	
21 21

  
22
<%if shiptoname%>
22
<%if shiptoname%>%
23 23
\makeatletter
24 24
\begin{lrbox}\shippingAddressBox
25 25
	\parbox{\useplength{toaddrwidth}}{
......
35 35
		<%shiptodepartment_1%>\par
36 36
		<%shiptodepartment_2%>\par
37 37
		<%shiptostreet%>\par
38
		<%shiptozipcode%> <%shiptocity%>
38
		<%shiptozipcode%> <%shiptocity%>%
39 39
	}
40 40
\end{lrbox}
41 41
\makeatother
42
<%end if%>
42
<%end if%>%
43 43

  
44 44
	
45 45
\setkomavar{title}{
46 46
	\gutschrift~
47
	\nr ~<%invnumber%>
47
	\nr ~<%invnumber%>%
48 48
}
49 49

  
50
<%if invnumber_for_credit_note%>
50
<%if invnumber_for_credit_note%>%
51 51
\setkomavar*{myref}{\fuerRechnung}
52 52
\setkomavar{myref}{<%invnumber_for_credit_note%>}
53
<%end if%>
53
<%end if%>%
54 54

  
55 55
\setkomavar*{date}{\datum}
56 56

  
......
62 62
	
63 63
\begin{letter}{
64 64
		<%name%>\strut\\
65
		<%if department_1%><%department_1%>\\<%end if%>
66
		<%if department_2%><%department_2%>\\<%end if%>
65
		<%if department_1%><%department_1%>\\<%end if%>%
66
		<%if department_2%><%department_2%>\\<%end if%>%
67 67
		<%cp_givenname%> <%cp_name%>\strut\\
68 68
		<%street%>\strut\\
69 69
		<%zipcode%> <%city%>\strut\\
......
103 103
		<%sellprice%>&%
104 104
		\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
105 105
			<%linetotal%>\tabularnewline
106
			<%end number%>
106
			<%end number%>%
107 107
	}
108 108
	\begin{PricingTotal}
109 109
		% Tabellenende letzte Seite
110 110
		\nettobetrag & <%subtotal%>\\
111
		<%foreach tax%>
111
		<%foreach tax%>%
112 112
		<%taxdescription%> & <%tax%>\\
113
		<%end tax%>
113
		<%end tax%>%
114 114
		\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
115 115
	\end{PricingTotal}
116 116
\end{PricingTabular*}
117 117

  
118
<%if notes%>
119
<%notes%>
118
<%if notes%>%
119
<%notes%>%
120 120
\medskip
121
<%end if%>
121
<%end if%>%
122 122

  
123 123
\closing{\gruesse}
124 124

  
templates/print/marei/invoice.tex
24 24
\setkomavar{fromphone}{<%employee_tel%>}
25 25
\setkomavar{fromemail}{<%employee_email%>}
26 26
\setkomavar{title}{
27
	\rechnung~ \nr ~<%invnumber%>
27
	\rechnung~ \nr ~<%invnumber%>%
28 28
}
29
<%if ordnumber%>
29
<%if ordnumber%>%
30 30
\setkomavar*{myref}{\auftragsnummer}
31 31
\setkomavar{myref}{<%ordnumber%>}
32
<%end if%>
33
<%if cusordnumber%>
32
<%end if%>%
33
<%if cusordnumber%>%
34 34
\setkomavar*{yourref}{\ihreBestellnummer}
35 35
\setkomavar{yourref}{<%cusordnumber%>}
36
<%end if%>
37
<%if donumber%>
36
<%end if%>%
37
<%if donumber%>%
38 38
  \setkomavar{delivery}{<%donumber%>}
39
<%end if%>
40
<%if quonumber%>
39
<%end if%>%
40
<%if quonumber%>%
41 41
\setkomavar{quote}{<%quonumber%>}
42
<%end if%>
42
<%end if%>%
43 43

  
44
<%if shiptoname%>
44
<%if shiptoname%>%
45 45
\makeatletter
46 46
\begin{lrbox}\shippingAddressBox
47 47
	\parbox{\useplength{toaddrwidth}}{
......
57 57
		<%shiptodepartment_1%>\par
58 58
		<%shiptodepartment_2%>\par
59 59
		<%shiptostreet%>\par
60
		<%shiptozipcode%> <%shiptocity%>
60
		<%shiptozipcode%> <%shiptocity%>%
61 61
	}
62 62
\end{lrbox}
63 63
\makeatother
64
<%end if%>
64
<%end if%>%
65 65

  
66 66
\begin{document}
67 67

  
68 68
\begin{letter}{
69 69
		<%name%>\strut\\
70
		<%if department_1%><%department_1%>\\<%end if%>
71
		<%if department_2%><%department_2%>\\<%end if%>
70
		<%if department_1%><%department_1%>\\<%end if%>%
71
		<%if department_2%><%department_2%>\\<%end if%>%
72 72
		<%cp_givenname%> <%cp_name%>\strut\\
73 73
		<%street%>\strut\\
74 74
		<%zipcode%> <%city%>\strut\\
......
89 89
		}
90 90
\thispagestyle{kivitendo.letter.first}
91 91

  
92
<%if notes%>
93
        <%notes%>
92
<%if notes%>%
93
        <%notes%>%
94 94
        \vspace{0.5cm}
95
<%end if%>
95
<%end if%>%
96 96

  
97 97

  
98 98
%PricingTabular* kann automatisch spalten ignorieren
......
121 121
\begin{PricingTotal}
122 122
% Tabellenende letzte Seite
123 123
\nettobetrag & <%subtotal%>\\
124
<%foreach tax%>
124
<%foreach tax%>%
125 125
<%taxdescription%> & <%tax%>\\
126
<%end tax%>
126
<%end tax%>%
127 127
\bfseries\schlussbetrag &  \bfseries <%invtotal%>\\
128 128
\end{PricingTotal}
129 129
\end{PricingTabular*}
......
136 136
	\lieferungErfolgtAm ~<%deliverydate%>.
137 137
}\\
138 138

  
139
<%if payment_terms%>
139
<%if payment_terms%>%
140 140
  \zahlung ~<%payment_terms%>\\
141
<%end payment_terms%>
141
<%end payment_terms%>%
142 142

  
143
<%if delivery_term%>
143
<%if delivery_term%>%
144 144
  \lieferung ~<%delivery_term.description_long%>\\
145
<%end delivery_term%>
145
<%end delivery_term%>%
146 146

  
147
<%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>
147
<%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>%
148 148

  
149 149
\ifnum<%taxzone_id%>=1
150 150
    \steuerfreiEU\\  % EU mit USt-ID Nummer
templates/print/marei/pick_list.tex
29 29

  
30 30
\parbox{\textwidth}{
31 31
  \parbox[b]{.42\textwidth}{
32
    <%company%>
32
    <%company%>%
33 33

  
34
    <%address%>
34
    <%address%>%
35 35
  }\hfill
36 36
  \begin{tabular}[b]{rr@{}}
37 37
  Tel & <%tel%>\\
38
  Fax & <%fax%>
38
  Fax & <%fax%>%
39 39
  \end{tabular}
40 40

  
41 41
  \rule[1.5ex]{\textwidth}{0.5pt}
......
57 57
<%shiptostreet%> \\
58 58
<%shiptozipcode%> \\
59 59
<%shiptocity%> \\
60
<%shiptocountry%>
60
<%shiptocountry%>%
61 61
}
62 62
\parbox[t]{.4\textwidth}{
63
  <%shiptocontact%>
63
  <%shiptocontact%>%
64 64

  
65
  <%if shiptophone%>
66
  Tel: <%shiptophone%>
67
  <%end shiptophone%>
65
  <%if shiptophone%>%
66
  Tel: <%shiptophone%>%
67
  <%end shiptophone%>%
68 68

  
69
  <%if shiptofax%>
70
  Fax: <%shiptofax%>
71
  <%end shiptofax%>
69
  <%if shiptofax%>%
70
  Fax: <%shiptofax%>%
71
  <%end shiptofax%>%
72 72

  
73
  <%shiptoemail%>
73
  <%shiptoemail%>%
74 74
}
75 75
\hfill
76 76

  
......
83 83

  
84 84
\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
85 85
  \textbf{BestellNr. \#} & \textbf{Datum} & \textbf{Kontakt}
86
  <%if warehouse%>
86
  <%if warehouse%>%
87 87
  & \textbf{Lager}
88
  <%end warehouse%>
88
  <%end warehouse%>%
89 89
  & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5em]
90 90
  \hline
91
  <%ordnumber%>
92
  <%if shippingdate%>
93
  & <%shippingdate%>
94
  <%end shippingdate%>
95
  <%if not shippingdate%>
96
  & <%orddate%>
97
  <%end shippingdate%>
98
  & <%employee%>
99
  <%if warehouse%>
100
  & <%warehouse%>
101
  <%end warehouse%>
91
  <%ordnumber%>%
92
  <%if shippingdate%>%
93
  & <%shippingdate%>%
94
  <%end shippingdate%>%
95
  <%if not shippingdate%>%
96
  & <%orddate%>%
97
  <%end shippingdate%>%
98
  & <%employee%>%
99
  <%if warehouse%>%
100
  & <%warehouse%>%
101
  <%end warehouse%>%
102 102
  & <%shippingpoint%> & <%shipvia%> \\
103 103
  \hline
104 104
\end{tabularx}
......
108 108
\begin{tabular*}{\textwidth}{@{}rlp{\descrwidth}@{\extracolsep\fill}rcll@{}}
109 109
  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} &
110 110
  \textbf{Menge} & \textbf{Lagerausgang} & & \textbf{Lagerplatz} \\
111
<%foreach number%>
111
<%foreach number%>%
112 112
  <%runningnumber%> & <%number%> & <%description%> &
113 113
  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\
114
<%end number%>
114
<%end number%>%
115 115
\end{tabular*}
116 116

  
117 117

  
templates/print/marei/proforma.tex
20 20
	
21 21
\setkomavar{title}{
22 22
	\proformarechnung~
23
	\nr ~<%ordnumber%>
23
	\nr ~<%ordnumber%>%
24 24
}
25 25
\setkomavar*{date}{\datum}
26 26

  
27 27
\setkomavar{date}{<%orddate%>}
28 28
\setkomavar{customer}{<%customernumber%>}
29
<%if cusordnumber%>
29
<%if cusordnumber%>%
30 30
	\setkomavar*{yourref}{\ihreBestellnummer}
31 31
	\setkomavar{yourref}{<%cusordnumber%>}
32
<%end if%>
33
<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>
32
<%end if%>%
33
<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
34 34
\setkomavar{fromname}{<%employee_name%>}
35 35
\setkomavar{fromphone}{<%employee_tel%>}
36 36
\setkomavar{fromemail}{<%employee_email%>}
37 37
\setkomavar{transaction}{<%transaction_description%>}
38 38
	
39
<%if shiptoname%>
39
<%if shiptoname%>%
40 40
\makeatletter
41 41
\begin{lrbox}\shippingAddressBox
42 42
	\parbox{\useplength{toaddrwidth}}{
......
52 52
		<%shiptodepartment_1%>\par
53 53
		<%shiptodepartment_2%>\par
54 54
		<%shiptostreet%>\par
55
		<%shiptozipcode%> <%shiptocity%>
55
		<%shiptozipcode%> <%shiptocity%>%
56 56
	}
57 57
\end{lrbox}
58 58
\makeatother
59
<%end if%>
59
<%end if%>%
60 60

  
61 61
\begin{letter}{
62 62
		<%name%>\strut\\
63
		<%if department_1%><%department_1%>\\<%end if%>
64
		<%if department_2%><%department_2%>\\<%end if%>
63
		<%if department_1%><%department_1%>\\<%end if%>%
64
		<%if department_2%><%department_2%>\\<%end if%>%
65 65
		<%cp_givenname%> <%cp_name%>\strut\\
66 66
		<%street%>\strut\\
67 67
		<%zipcode%> <%city%>\strut\\
......
91 91
	<%number%> &%
92 92
	\textbf{<%description%>}%
93 93
	<%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
94
    <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>
94
    <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
95 95
	<%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
96 96
	<%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
97 97
	<%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
......
100 100
	<%sellprice%>&%
101 101
	\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
102 102
	<%linetotal%>\tabularnewline
103
	<%end number%>
103
	<%end number%>%
104 104
}
105 105
% Tabellenende letzte Seite
106 106
	\begin{PricingTotal}
107 107
	% Tabellenende letzte Seite
108 108
	\nettobetrag & <%subtotal%>\\
109
	<%foreach tax%>
109
	<%foreach tax%>%
110 110
	<%taxdescription%> & <%tax%>\\
111
	<%end tax%>
111
	<%end tax%>%
112 112
	\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
113 113
\end{PricingTotal}
114 114
\end{PricingTabular*}
115 115

  
116
<%if notes%>
117
<%notes%>
116
<%if notes%>%
117
<%notes%>%
118 118
\medskip
119
<%end if%>
119
<%end if%>%
120 120

  
121
<%if reqdate%>
121
<%if reqdate%>%
122 122
\lieferungErfolgtAm ~<%reqdate%>. \\
123
<%end if%>
123
<%end if%>%
124 124

  
125 125
\textit{\auftragpruefen}
126 126

  
templates/print/marei/purchase_delivery_order.tex
26 26

  
27 27
  \vspace*{0.3cm}
28 28

  
29
  <%name%>
29
  <%name%>%
30 30

  
31
  <%if department_1%><%department_1%><%end if%>
31
  <%if department_1%><%department_1%><%end if%>%
32 32

  
33
  <%if department_2%><%department_2%><%end if%>
33
  <%if department_2%><%department_2%><%end if%>%
34 34

  
35
  <%cp_givenname%> <%cp_name%>
35
  <%cp_givenname%> <%cp_name%>%
36 36

  
37
  <%street%>
37
  <%street%>%
38 38

  
39 39
  ~
40 40

  
41
  <%zipcode%> <%city%>
41
  <%zipcode%> <%city%>%
42 42

  
43
  <%country%>
43
  <%country%>%
44 44
\end{minipage}
45 45
\hfill
46 46
\begin{minipage}{6cm}
47 47
  \rightline{\LARGE\textbf{\textit{\einkaufslieferschein}}} \vspace*{0.2cm}
48
  \rightline{\large\textbf{\textit{\nr ~<%donumber%>
48
  \rightline{\large\textbf{\textit{\nr ~<%donumber%>%
49 49
  }}} \vspace*{0.2cm}
50 50

  
51
  \datum:\hfill <%dodate%>
51
  \datum:\hfill <%dodate%>%
52 52

  
53
  <%if cusordnumber%>\unsereBestellnummer:\hfill <%cusordnumber%><%end if%>
53
  <%if cusordnumber%>\unsereBestellnummer:\hfill <%cusordnumber%><%end if%>%
54 54

  
55
  <%if ordnumber%>\auftragsnummer:\hfill <%ordnumber%><%end if%>
55
  <%if ordnumber%>\auftragsnummer:\hfill <%ordnumber%><%end if%>%
56 56

  
57
  \ansprechpartner:\hfill <%employee_name%>
57
  \ansprechpartner:\hfill <%employee_name%>%
58 58

  
59
  <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>
59
  <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>%
60 60
\end{minipage}
61 61

  
62
<%if shiptoname%>
62
<%if shiptoname%>%
63 63
  \vspace{0.8cm}
64 64
  \scriptsize \underline{\abweichendeLieferadresse:}\\
65
  \normalsize    <%shiptoname%>
65
  \normalsize    <%shiptoname%>%
66 66

  
67
                 <%if shiptocontact%> <%shiptocontact%><%end if%>
67
                 <%if shiptocontact%> <%shiptocontact%><%end if%>%
68 68

  
69
                 <%shiptodepartment_1%>
69
                 <%shiptodepartment_1%>%
70 70

  
71
                  <%shiptodepartment_2%>
71
                  <%shiptodepartment_2%>%
72 72

  
73
                  <%shiptostreet%>
73
                  <%shiptostreet%>%
74 74

  
75
                  <%shiptozipcode%> <%shiptocity%>
76
<%end if%>
75
                  <%shiptozipcode%> <%shiptocity%>%
76
<%end if%>%
77 77
\vspace*{1.5cm}
78 78

  
79 79

  
......
87 87
%
88 88
\begin{SimpleTabular}
89 89
% eigentliche Tabelle
90
<%foreach number%>
90
<%foreach number%>%
91 91
          <%runningnumber%> &
92 92
          <%qty%> <%unit%> &
93 93
          \textbf{<%description%>} \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
94 94

  
95
          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>
96
          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
97
          <%if reqdate%> && \scriptsize \lieferdatum: <%reqdate%>\\<%end reqdate%>
98
          <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
99
          <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
100
          <%foreach si_number%><%if si_chargenumber%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>
95
          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>%
96
          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>%
97
          <%if reqdate%> && \scriptsize \lieferdatum: <%reqdate%>\\<%end reqdate%>%
98
          <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>%
99
          <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>%
100
          <%foreach si_number%><%if si_chargenumber%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>%
101 101

  
102 102
          \\[-0.8em]
103
<%end number%>
103
<%end number%>%
104 104
\end{SimpleTabular}
105 105

  
106 106
\vspace{0.2cm}
107 107

  
108
<%if notes%>
108
<%if notes%>%
109 109
        \vspace{5mm}
110
        <%notes%>
110
        <%notes%>%
111 111
        \vspace{5mm}
112
<%end if%>
112
<%end if%>%
113 113

  
114
<%if delivery_term%>
114
<%if delivery_term%>%
115 115
  \lieferung ~<%delivery_term.description_long%>\\
116
<%end delivery_term%>
116
<%end delivery_term%>%
117 117

  
118 118
\end{document}
templates/print/marei/purchase_order.tex
20 20

  
21 21
\setkomavar{title}{
22 22
	\bestellung~
23
	\nr~<%ordnumber%>
23
	\nr~<%ordnumber%>%
24 24
}
25 25
\setkomavar*{date}{\datum}
26 26
\setkomavar{date}{<%orddate%>}
27
<%if cusordnumber%>
27
<%if cusordnumber%>%
28 28
\setkomavar*{yourref}{\unsereBestellnummer}
29 29
\setkomavar{yourref}{<%cusordnumber%>}
30
<%end if%>
31
<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>
30
<%end if%>%
31
<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
32 32
\setkomavar{fromname}{<%employee_name%>}
33 33
\setkomavar{fromphone}{<%employee_tel%>}
34 34
\setkomavar{fromemail}{<%employee_email%>}
35 35
\setkomavar{transaction}{<%transaction_description%>}
36 36

  
37
<%if shiptoname%>
37
<%if shiptoname%>%
38 38
\makeatletter
39 39
\begin{lrbox}\shippingAddressBox
40 40
	\parbox{\useplength{toaddrwidth}}{
......
50 50
		<%shiptodepartment_1%>\par
51 51
		<%shiptodepartment_2%>\par
52 52
		<%shiptostreet%>\par
53
		<%shiptozipcode%> <%shiptocity%>
53
		<%shiptozipcode%> <%shiptocity%>%
54 54
	}
55 55
\end{lrbox}
56 56
\makeatother
57
<%end if%>
57
<%end if%>%
58 58

  
59 59

  
60 60
\begin{letter}{
61 61
		<%name%>\strut\\
62
		<%if department_1%><%department_1%>\\<%end if%>
63
		<%if department_2%><%department_2%>\\<%end if%>
62
		<%if department_1%><%department_1%>\\<%end if%>%
63
		<%if department_2%><%department_2%>\\<%end if%>%
64 64
		<%cp_givenname%> <%cp_name%>\strut\\
65 65
		<%street%>\strut\\
66 66
		<%zipcode%> <%city%>\strut\\
......
100 100
		<%sellprice%>&%
101 101
		\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
102 102
		<%linetotal%>\tabularnewline
103
		<%end number%>
103
		<%end number%>%
104 104
	}
105 105
	\begin{PricingTotal}
106 106
		% Tabellenende letzte Seite
107 107
		\nettobetrag & <%subtotal%>\\
108
		<%foreach tax%>
108
		<%foreach tax%>%
109 109
		<%taxdescription%> & <%tax%>\\
110
		<%end tax%>
110
		<%end tax%>%
111 111
		\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
112 112
	\end{PricingTotal}
113 113
\end{PricingTabular*}
114 114

  
115
<%if notes%>
116
<%notes%>
115
<%if notes%>%
116
<%notes%>%
117 117
\medskip
118
<%end if%>
118
<%end if%>%
119 119

  
120
<%if delivery_term%>
120
<%if delivery_term%>%
121 121
  \lieferung ~<%delivery_term.description_long%>\\
122
<%end delivery_term%>
122
<%end delivery_term%>%
123 123

  
124 124
\closing{\gruesse}
125 125
\end{letter}
templates/print/marei/receipt.tex
21 21
\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
22 22

  
23 23
\parbox[t]{12cm}{
24
  <%company%>
24
  <%company%>%
25 25

  
26 26
  <%address%>}
27 27
\hfill
......
33 33

  
34 34
\vspace{0.5cm}
35 35

  
36
\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
36
\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>%
37 37

  
38 38
\vspace{0.5cm}
39 39

  
40
<%name%>
40
<%name%>%
41 41

  
42
<%street%>
42
<%street%>%
43 43

  
44
<%zipcode%>
44
<%zipcode%>%
45 45

  
46
<%city%>
46
<%city%>%
47 47

  
48
<%country%>
48
<%country%>%
49 49

  
50 50
\vspace{2.8cm}
51 51

  
52
<%company%>
52
<%company%>%
53 53

  
54 54
\vspace{0.5cm}
55 55

  
56
<%name%> \hfill <%datepaid%> \hfill <%source%>
56
<%name%> \hfill <%datepaid%> \hfill <%source%>%
57 57

  
58 58
\vspace{0.5cm}
59 59
\begin{tabularx}{\textwidth}{lXrr@{}}
60 60
\textbf{Rechnung} & \textbf{Ausgestellt}
61 61
  & \textbf{Fällig} & \textbf{Verrechnet} \\
62
<%foreach invnumber%>
62
<%foreach invnumber%>%
63 63
<%invnumber%> & <%invdate%> \dotfill
64 64
  & <%due%> & <%paid%> \\
65
<%end invnumber%>
65
<%end invnumber%>%
66 66
\end{tabularx}
67 67

  
68 68
\vfill
templates/print/marei/request_quotation.tex
26 26
\setkomavar{fromemail}{<%employee_email%>}
27 27
\setkomavar{title}{
28 28
	\anfrage~
29
	\nr ~<%quonumber%>
29
	\nr ~<%quonumber%>%
30 30
}
31
<%if globalprojectnumber%>
31
<%if globalprojectnumber%>%
32 32
	\setkomavar{projectID}{<%globalprojectnumber%>}
33
<%end globalprojectnumber%>
33
<%end globalprojectnumber%>%
34 34
\setkomavar{transaction}{<%transaction_description%>}
35 35

  
36 36
\begin{letter}{
37 37
		<%name%>\strut\\
38
		<%if department_1%><%department_1%>\\<%end if%>
39
		<%if department_2%><%department_2%>\\<%end if%>
38
		<%if department_1%><%department_1%>\\<%end if%>%
39
		<%if department_2%><%department_2%>\\<%end if%>%
40 40
		<%cp_givenname%> <%cp_name%>\strut\\
41 41
		<%street%>\strut\\
42 42
		<%zipcode%> <%city%>\strut\\
......
93 93
\endlastfoot
94 94

  
95 95
% eigentliche Tabelle
96
<%foreach number%>
96
<%foreach number%>%
97 97
          <%runningnumber%> &
98 98
          <%qty%> <%unit%> &
99 99
          \textbf{<%description%>} \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
100 100

  
101
          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>
102
%          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
103
          <%if make%>
104
            <%foreach make%>
101
          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>%
102
%          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>%
103
          <%if make%>%
104
            <%foreach make%>%
105 105
              \ifstr{<%make%>}{<%name%>}{&& \artikelnummer: <%model%>\\}{}
106
            <%end foreach%>
107
          <%end if%>
106
            <%end foreach%>%
107
          <%end if%>%
108 108

  
109 109
          \\[-0.8em]
110
<%end number%>
110
<%end number%>%
111 111

  
112 112
\end{longtable}
113 113

  
114
<%if notes%>
115
<%notes%>
114
<%if notes%>%
115
<%notes%>%
116 116
\medskip
117
<%end if%>
117
<%end if%>%
118 118

  
119 119

  
120
<%if delivery_term%>
120
<%if delivery_term%>%
121 121
  \lieferung ~<%delivery_term.description_long%>\\
122
<%end delivery_term%>
122
<%end delivery_term%>%
123 123

  
124
<%if reqdate%>
124
<%if reqdate%>%
125 125
\anfrageBenoetigtBis~<%reqdate%>.
126
<%end if%>
126
<%end if%>%
127 127

  
128 128
\anfragedanke
129 129

  
templates/print/marei/sales_delivery_order.tex
20 20

  
21 21
\setkomavar{title}{
22 22
	\lieferschein~
23
	\nr~<%donumber%>
23
	\nr~<%donumber%>%
24 24
}
25 25
\setkomavar*{date}{\datum}
26 26
\setkomavar{date}{<%dodate%>}
27
<%if cusordnumber%>
27
<%if cusordnumber%>%
28 28
	\setkomavar*{yourref}{\unsereBestellnummer}
29 29
	\setkomavar{yourref}{<%cusordnumber%>}
30
<%end if%>
31
<%if ordnumber%>\setkomavar{orderID}{<%ordnumber%>}<%end if%>
30
<%end if%>%
31
<%if ordnumber%>\setkomavar{orderID}{<%ordnumber%>}<%end if%>%
32 32
\setkomavar{fromname}{<%employee_name%>}
33 33
\setkomavar{fromphone}{<%employee_tel%>}
34 34
\setkomavar{fromemail}{<%employee_email%>}
35
<%if globalprojectnumber%>
35
<%if globalprojectnumber%>%
36 36
  \setkomavar{projectID}{<%globalprojectnumber%>}
37
<%end globalprojectnumber%>
37
<%end globalprojectnumber%>%
38 38

  
39 39
\setkomavar{transaction}{<%transaction_description%>}
40 40

  
......
42 42
\begin{letter}{
43 43
  \ifstr{<%shiptoname%>}{}{ % KEINE ABWEICHENDE LIEFERADRESSE
44 44
	<%name%>\strut\\
45
	<%if department_1%><%department_1%>\\<%end if%>
46
	<%if department_2%><%department_2%>\\<%end if%>
45
	<%if department_1%><%department_1%>\\<%end if%>%
46
	<%if department_2%><%department_2%>\\<%end if%>%
47 47
	<%cp_givenname%> <%cp_name%>\strut\\
48 48
	<%street%>\strut\\
49 49
	<%zipcode%> <%city%>\strut\\
......
93 93
\endlastfoot
94 94

  
95 95
% eigentliche Tabelle
96
<%foreach number%>
96
<%foreach number%>%
97 97
          <%runningnumber%> &
98 98
          <%number%> &
99 99
          \textbf{<%description%>}&
100 100
          <%qty%> <%unit%> \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
101 101

  
102
          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>
103
          <%if reqdate%> && \scriptsize \lieferdatum: <%reqdate%>\\<%end reqdate%>
104
          <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
105
          <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
106
          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
107
          <%foreach si_number%><%if si_chargenumber%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>
102
          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>%
103
          <%if reqdate%> && \scriptsize \lieferdatum: <%reqdate%>\\<%end reqdate%>%
104
          <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>%
105
          <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>%
106
          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>%
107
          <%foreach si_number%><%if si_chargenumber%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>%
108 108

  
109 109
          \\[-0.8em]
110
<%end number%>
110
<%end number%>%
111 111

  
112 112
\end{longtable}
113 113

  
114 114

  
115 115
\vspace{0.2cm}
116 116

  
117
<%if notes%>
118
<%notes%>
117
<%if notes%>%
118
<%notes%>%
119 119
\medskip
120
<%end if%>
120
<%end if%>%
121 121

  
122 122

  
123
<%if delivery_term%>
123
<%if delivery_term%>%
124 124
  \lieferung ~<%delivery_term.description_long%>\\
125
<%end delivery_term%>
125
<%end delivery_term%>%
126 126

  
127 127
\end{letter}
128 128

  
templates/print/marei/sales_order.tex
19 19
\begin{document}
20 20
\setkomavar{title}{
21 21
	\auftragsbestaetigung~
22
	\nr~<%ordnumber%>
22
	\nr~<%ordnumber%>%
23 23
}
24 24
\setkomavar*{date}{\datum}
25 25
\setkomavar{date}{<%orddate%>}
26
<%if cusordnumber%>
26
<%if cusordnumber%>%
27 27
\setkomavar*{yourref}{\ihreBestellnummer}
28 28
\setkomavar{yourref}{<%cusordnumber%>}
29
<%end if%>
30
<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>
29
<%end if%>%
30
<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
31 31
\setkomavar{customer}{<%customernumber%>}
32 32
\setkomavar{fromname}{<%employee_name%>}
33 33
\setkomavar{fromphone}{<%employee_tel%>}
......
36 36

  
37 37

  
38 38

  
39
<%if shiptoname%>
39
<%if shiptoname%>%
40 40
\makeatletter
41 41
\begin{lrbox}\shippingAddressBox
42 42
	\parbox{\useplength{toaddrwidth}}{
......
52 52
		<%shiptodepartment_1%>\par
53 53
		<%shiptodepartment_2%>\par
54 54
		<%shiptostreet%>\par
55
		<%shiptozipcode%> <%shiptocity%>
55
		<%shiptozipcode%> <%shiptocity%>%
56 56
	}
57 57
\end{lrbox}
58 58
\makeatother
59
<%end if%>
59
<%end if%>%
60 60

  
61 61
\begin{letter}{
62 62
		<%name%>\strut\\
63
		<%if department_1%><%department_1%>\\<%end if%>
64
		<%if department_2%><%department_2%>\\<%end if%>
63
		<%if department_1%><%department_1%>\\<%end if%>%
64
		<%if department_2%><%department_2%>\\<%end if%>%
65 65
		<%cp_givenname%> <%cp_name%>\strut\\
66 66
		<%street%>\strut\\
67 67
		<%zipcode%> <%city%>\strut\\
......
101 101
		<%sellprice%>&%
102 102
		\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
103 103
		<%linetotal%>\tabularnewline
104
		<%end number%>
104
		<%end number%>%
105 105
	}
106 106
	\begin{PricingTotal}
107 107
		% Tabellenende letzte Seite
108 108
		\nettobetrag & <%subtotal%>\\
109
		<%foreach tax%>
109
		<%foreach tax%>%
110 110
		<%taxdescription%> & <%tax%>\\
111
		<%end tax%>
111
		<%end tax%>%
112 112
		\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
113 113
	\end{PricingTotal}
114 114
\end{PricingTabular*}
115 115

  
116
<%if notes%>
117
<%notes%>
116
<%if notes%>%
117
<%notes%>%
118 118
\medskip
119
<%end if%>
119
<%end if%>%
120 120

  
121
<%if delivery_term%>
121
<%if delivery_term%>%
122 122
  \lieferung ~<%delivery_term.description_long%>\\
123
<%end delivery_term%>
123
<%end delivery_term%>%
124 124

  
125
<%if reqdate%>
125
<%if reqdate%>%
126 126
\lieferungErfolgtAm ~<%reqdate%>.
127
<%end if%>
127
<%end if%>%
128 128

  
129 129
\textit{\auftragpruefen}
130 130

  
templates/print/marei/sales_quotation.tex
33 33
\setkomavar{fromemail}{<%employee_email%>}
34 34
\setkomavar{title}{
35 35
	\angebot~
36
	<%quonumber%>
36
	<%quonumber%>%
37 37
}
38 38

  
39 39
\setkomavar{transaction}{<%transaction_description%>}
40 40

  
41
<%if shiptoname%>
41
<%if shiptoname%>%
42 42
\makeatletter
43 43
  \begin{lrbox}\shippingAddressBox
44 44
  \parbox{\useplength{toaddrwidth}}{
......
54 54
	<%shiptodepartment_1%>\par
55 55
	<%shiptodepartment_2%>\par
56 56
	<%shiptostreet%>\par
57
	<%shiptozipcode%> <%shiptocity%>
57
	<%shiptozipcode%> <%shiptocity%>%
58 58
 }
59 59
\end{lrbox}
60 60
\makeatother
61
<%end if%>
61
<%end if%>%
62 62

  
63 63

  
64 64
\begin{letter}{
65 65
  <%name%>\strut\\
66
  <%if department_1%><%department_1%>\\<%end if%>
67
  <%if department_2%><%department_2%>\\<%end if%>
66
  <%if department_1%><%department_1%>\\<%end if%>%
67
  <%if department_2%><%department_2%>\\<%end if%>%
68 68
  <%cp_givenname%> <%cp_name%>\strut\\
69 69
  <%street%>\strut\\
70 70
  <%zipcode%> <%city%>\strut\\
......
105 105
	<%sellprice%>&%
106 106
	\ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
107 107
			<%linetotal%>\tabularnewline
108
<%end number%>
108
<%end number%>%
109 109
}
110 110
	\begin{PricingTotal}
111 111
	% Tabellenende letzte Seite
112 112
	\nettobetrag & <%subtotal%>\\
113
	<%foreach tax%>
113
	<%foreach tax%>%
114 114
	<%taxdescription%> & <%tax%>\\
115
	<%end tax%>
115
	<%end tax%>%
116 116
	\bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
117 117
	\end{PricingTotal}
118 118
\end{PricingTabular*}
119 119

  
120
<%if notes%>
121
  <%notes%>
120
<%if notes%>%
121
  <%notes%>%
122 122
  \medskip
123
<%end if%>
123
<%end if%>%
124 124

  
125
<%if delivery_term%>
125
<%if delivery_term%>%
126 126
  \lieferung ~<%delivery_term.description_long%>\\
127
<%end delivery_term%>
127
<%end delivery_term%>%
128 128

  
129 129
\angebotdanke\\
130
<%if reqdate%>
130
<%if reqdate%>%
131 131
\angebotgueltig~<%reqdate%>.
132
<%end if%>
132
<%end if%>%
133 133
\angebotfragen
134 134

  
135 135

  
templates/print/marei/statement.tex
20 20

  
21 21
\setkomavar{title}{
22 22
	\sammelrechnung~
23
	\nr~<%quonumber%>
23
	\nr~<%quonumber%>%
24 24
}
25 25
\setkomavar{transaction}{<%transaction_description%>}
26 26
\setkomavar{customer}{<%customernumber%>}
......
31 31

  
32 32
\begin{letter}{
33 33
		<%name%>\strut\\
34
		<%if department_1%><%department_1%>\\<%end if%>
35
		<%if department_2%><%department_2%>\\<%end if%>
34
		<%if department_1%><%department_1%>\\<%end if%>%
35
		<%if department_2%><%department_2%>\\<%end if%>%
36 36
		<%cp_givenname%> <%cp_name%>\strut\\
37 37
		<%street%>\strut\\
38 38
		<%zipcode%> <%city%>\strut\\
......
91 91
\endlastfoot
92 92

  
93 93
% eigentliche Tabelle
94
<%foreach invnumber%>
94
<%foreach invnumber%>%
95 95
          <%invnumber%> & <%invdate%> & <%duedate%> &
96 96
          <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
97
<%end invnumber%>
97
<%end invnumber%>%
98 98

  
99 99
\end{longtable}
100 100

  
templates/print/marei/zahlungserinnerung.tex
27 27
\setkomavar{fromemail}{<%employee_email%>}
28 28
\setkomavar{title}{
29 29
	\mahnung
30
	<%if dunning_id%>~\nr~<%dunning_id%><%end if%>
30
	<%if dunning_id%>~\nr~<%dunning_id%><%end if%>%
31 31
}
32 32
\setkomavar{transaction}{<%transaction_description%>}
33 33

  
34 34
\begin{letter}{
35 35
		<%name%>\strut\\
36
		<%if department_1%><%department_1%>\\<%end if%>
37
		<%if department_2%><%department_2%>\\<%end if%>
36
		<%if department_1%><%department_1%>\\<%end if%>%
37
		<%if department_2%><%department_2%>\\<%end if%>%
38 38
		<%cp_givenname%> <%cp_name%>\strut\\
39 39
		<%street%>\strut\\
40 40
		<%zipcode%> <%city%>\strut\\
......
59 59

  
60 60
\begin{SimpleTabular}[\bfseries\rechnung~\nr&\bfseries\datum&\bfseries\betrag]
61 61
% eigentliche Tabelle
62
<%foreach dn_invnumber%>
62
<%foreach dn_invnumber%>%
63 63
    <%dn_invnumber%> & <%dn_transdate%> & <%dn_amount%> \currency \\[0.1cm]
64
<%end dn_invnumber%>
64
<%end dn_invnumber%>%
65 65
\end{SimpleTabular}
66 66

  
67 67
\vspace{0.2cm}
templates/print/marei/zahlungserinnerung_invoice.tex
20 20

  
21 21
\setkomavar{title}{
22 22
	\rechnung~
23
	\nr ~<%invnumber%>
23
	\nr ~<%invnumber%>%
24 24
}
25 25
\setkomavar*{date}{\rechnungsdatum}
26 26
\setkomavar{date}{<%invdate%>}
......
30 30
\setkomavar{fromname}{<%employee_name%>}
31 31
\setkomavar{fromphone}{<%employee_tel%>}
32 32
\setkomavar{fromemail}{<%employee_email%>}
33
<%if globalprojectnumber%>
33
<%if globalprojectnumber%>%
34 34
	\setkomavar{projectID}{<%globalprojectnumber%>}
35
<%end globalprojectnumber%>
35
<%end globalprojectnumber%>%
36 36
\setkomavar{transaction}{<%transaction_description%>}
37 37

  
38 38
\begin{letter}{
39 39
		<%name%>\strut\\
40
		<%if department_1%><%department_1%>\\<%end if%>
41
		<%if department_2%><%department_2%>\\<%end if%>
40
		<%if department_1%><%department_1%>\\<%end if%>%
41
		<%if department_2%><%department_2%>\\<%end if%>%
42 42
		<%cp_givenname%> <%cp_name%>\strut\\
43 43
		<%street%>\strut\\
44 44
		<%zipcode%> <%city%>\strut\\

Auch abrufbar als: Unified diff