Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision ab064135

Von Marei Peischl vor etwa 1 Jahr hinzugefügt

  • ID ab064135c490b6b497611d08385cc44b1fdaafd4
  • Vorgänger 347cb9f2
  • Nachfolger 3757e0e4

unify identation

Unterschiede anzeigen:

templates/print/marei/bin_list.tex
15 15
\setkomavar{firsthead}{
16 16
  \normalsize
17 17
  \noindent\begin{tabular}[t]{@{}l@{}}
18
    <%company%>\strut\\
18
    <%company%>\strut \\
19 19
    <%address%>
20 20
  \end{tabular}
21 21
  \hfill
......
43 43
\makeatother
44 44

  
45 45
\begin{letter}{
46
<%name%>\ifhmode\\\fi
47
<%street%>\ifhmode\\\fi
48
<%zipcode%> <%city%>\ifhmode\\\fi
49
<%country%>
50
}
46
    <%name%>\ifhmode\\\fi
47
    <%street%>\ifhmode\\\fi
48
    <%zipcode%> <%city%>\ifhmode\\\fi
49
    <%country%>
50
  }
51 51

  
52
\opening{}
52
  \opening{}
53 53

  
54
\begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
55
        <%if warehouse%>%
56
        &\bfseries\lager%
57
        <%end warehouse%>%
58
        &\bfseries\lagerplatz&\bfseries\lieferungMit}]
54
  \begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
55
    <%if warehouse%>%
56
      &\bfseries\lager%
57
    <%end warehouse%>%
58
    &\bfseries\lagerplatz&\bfseries\lieferungMit}]
59 59

  
60
  <%ordnumber%>%
61
  &%
62
  <%if shippingdate%>%
63
  <%shippingdate%>%
64
  <%end shippingdate%>%
65
  <%if not shippingdate%>%
66
  <%orddate%>%
67
  <%end shippingdate%>%
68
  & <%employee%>%
69
  <%if warehouse%>%
70
  & <%warehouse%>%
71
  <%end warehouse%>%
72
  & <%shippingpoint%> & <%shipvia%> \\
73
\end{SimpleTabular}
60
    <%ordnumber%>%
61
    &%
62
    <%if shippingdate%>%
63
      <%shippingdate%>%
64
    <%end shippingdate%>%
65
    <%if not shippingdate%>%
66
    <%orddate%>%
67
    <%end shippingdate%>%
68
    & <%employee%>%
69
    <%if warehouse%>%
70
      & <%warehouse%>%
71
    <%end warehouse%>%
72
    & <%shippingpoint%> & <%shipvia%> \\
73
  \end{SimpleTabular}
74 74

  
75
\bigskip
75
  \bigskip
76 76

  
77
\begin{SimpleTabular}[colspec=rlXllrrll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\seriennummer & &\bfseries\menge&\bfseries\erh&&\bfseries\lagerplatz}]
78
  <%foreach number%>%
79
  <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
80
  <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
81
  <%end number%>%
82
\end{SimpleTabular}
77
  \begin{SimpleTabular}[colspec=rlXllrrll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\seriennummer & &\bfseries\menge&\bfseries\erh&&\bfseries\lagerplatz}]
78
    <%foreach number%>%
79
      <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
80
      <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
81
    <%end number%>%
82
  \end{SimpleTabular}
83 83

  
84 84
\end{letter}
85 85

  
templates/print/marei/check.tex
31 31
\begin{document}
32 32

  
33 33
\begin{letter}{%
34
<%if billing_address_id%>%
35
	<%billing_address_name%> \strut\\%
36
	<%billing_address_street%>\strut\\%
37
	<%billing_address_zipcode%> <%billing_address_city%> \strut\\%
38
	<%billing_address_country%>\strut\\%
39
<%else%>%
40
	<%name%>\strut\\%
41
	<%street%>\strut\\%
42
	<%zipcode%> <%city%>\strut\\%
43
	<%country%>\strut%
44
<%end if%>%
45
}
46

  
47
\opening{<%company%>}
48
\pagestyle{empty}
49

  
50
<%name%> \hfill <%datepaid%> \hfill <%source%>%
51

  
52
\begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]
53
  <%foreach invnumber%>%
54
  <%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
55
  <%end invnumber%>%
56
\end{SimpleTabular}
34
  <%if billing_address_id%>%
35
    <%billing_address_name%> \strut\\%
36
    <%billing_address_street%>\strut\\%
37
    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
38
    <%billing_address_country%>\strut\\%
39
  <%else%>%
40
    <%name%>\strut\\%
41
    <%street%>\strut\\%
42
    <%zipcode%> <%city%>\strut\\%
43
    <%country%>\strut%
44
  <%end billing_address_id%>%
45
  }
46

  
47
  \opening{<%company%>}
48
  \pagestyle{empty}
49

  
50
  <%name%> \hfill <%datepaid%> \hfill <%source%>%
51

  
52
  \begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]
53
    <%foreach invnumber%>%
54
      <%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
55
    <%end invnumber%>%
56
  \end{SimpleTabular}
57 57

  
58 58
\end{letter}
59 59

  
templates/print/marei/credit_note.tex
29 29
<%if invnumber_for_credit_note%>%
30 30
  \setkomavar*{myref}{\fuerRechnung}
31 31
  \setkomavar{myref}{<%invnumber_for_credit_note%>}
32
<%end if%>%
32
<%end invnumber_for_credit_note%>%
33 33

  
34 34
\setkomavar{transaction}{<%transaction_description%>}
35 35
<%if shiptoname%>%
......
52 52
  }
53 53
\end{lrbox}
54 54
\makeatother
55
<%end if%>%
55
<%end shiptoname%>%
56 56

  
57 57
\begin{document}
58 58

  
59 59
\begin{letter}{%
60
<%if billing_address_id%>%
61
	<%billing_address_name%> \strut\\%
62
	<%if department_1%><%billing_address_department_1%>\\<%end if%>%
63
	<%if department_2%><%billing_address_department_2%>\\<%end if%>%
64
	<%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
65
	<%billing_address_street%>\strut\\%
66
	<%billing_address_zipcode%> <%billing_address_city%> \strut\\%
67
	<%billing_address_country%>\strut\\%
68
<%else%>%
69
	<%name%>\strut\\%
70
	<%if department_1%><%department_1%>\\<%end if%>%
71
	<%if department_2%><%department_2%>\\<%end if%>%
72
	<%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
73
	<%street%>\strut\\%
74
	<%zipcode%> <%city%>\strut\\%
75
	<%country%>\strut%
76
<%end if%>%
77
}
60
  <%if billing_address_id%>%
61
    <%billing_address_name%> \strut\\%
62
    <%if department_1%><%billing_address_department_1%>\\<%end if%>%
63
    <%if department_2%><%billing_address_department_2%>\\<%end if%>%
64
    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
65
    <%billing_address_street%>\strut\\%
66
    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
67
    <%billing_address_country%>\strut\\%
68
  <%else%>%
69
    <%name%>\strut\\%
70
    <%if department_1%><%department_1%>\\<%end if%>%
71
    <%if department_2%><%department_2%>\\<%end if%>%
72
    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
73
    <%street%>\strut\\%
74
    <%zipcode%> <%city%>\strut\\%
75
    <%country%>\strut%
76
  <%end billing_address_id%>%
77
  }
78 78

  
79
% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
80
% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
81
\opening{
82
\Ifstr{<%cp_name%>}{}
83
{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
84
  {
85
    \Ifstr{<%cp_gender%>}{f}
86
        {\anredefrau}
87
        {\anredeherr}
79
  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
80
  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
81
  \opening{
82
    \Ifstr{<%cp_name%>}{}
83
    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede}<%end if%>
84
    {
85
      \Ifstr{<%cp_gender%>}{f}
86
      {\anredefrau}
87
      {\anredeherr}
88 88
      <%cp_title%> <%cp_name%>,
89 89
    }
90 90
  }
91
\thispagestyle{kivitendo.letter.first}
92

  
93

  
94
\gutschriftformel
95

  
96
<%if notes%>%
97
<%notes%>%
98
\vspace{0.5cm}
99
<%end if%>%
100

  
101

  
102
\begin{PricingTabular*}%
103
  % eigentliche Tabelle%
104
  \FakeTable{%
105
  <%foreach number%>%
106
  <%runningnumber%> &%
107
  <%number%> &%
108
  \textbf{<%description%>}%
109
  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
110
  <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
111
  <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
112
  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
113
  &%
114
  <%qty%> <%unit%> &%
115
  <%sellprice%>&%
116
  \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
117
    <%linetotal%>\tabularnewline%
118
    <%end number%>%
119
  }%
120
  \begin{PricingTotal}%
121
    % Tabellenende letzte Seite
122
    \nettobetrag & <%subtotal%>\\%
123
    <%foreach tax%>%
124
    <%taxdescription%> & <%tax%>\\%
125
    <%end tax%>%
126
    \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
127
  \end{PricingTotal}%
128
\end{PricingTabular*}
129

  
130

  
131
\closing{\gruesse}
91
  \thispagestyle{kivitendo.letter.first}
92

  
93

  
94
  \gutschriftformel
95

  
96
  <%if notes%>%
97
    <%notes%>%
98
    \vspace{0.5cm}
99
  <%end notes%>%
100

  
101

  
102
  \begin{PricingTabular*}%
103
    % eigentliche Tabelle%
104
    \FakeTable{%
105
      <%foreach number%>%
106
      <%runningnumber%> &%
107
      <%number%> &%
108
      \textbf{<%description%>}%
109
      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
110
      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
111
      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
112
      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
113
      &%
114
      <%qty%> <%unit%> &%
115
      <%sellprice%>&%
116
      \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
117
      <%linetotal%>\tabularnewline%
118
      <%end number%>%
119
    }%
120
    \begin{PricingTotal}%
121
      % Tabellenende letzte Seite
122
      \nettobetrag & <%subtotal%>\\%
123
      <%foreach tax%>%
124
        <%taxdescription%> & <%tax%>\\%
125
      <%end tax%>%
126
      \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
127
    \end{PricingTotal}%
128
  \end{PricingTabular*}
129

  
130

  
131
  \closing{\gruesse}
132 132

  
133 133
\end{letter}
134 134

  
templates/print/marei/ic_supply.tex
17 17
\begin{document}
18 18

  
19 19
\begin{Form}
20
\large
21
Bestätigung über das Gelangen des Gegenstands einer innergemeinschaftlichen Lieferung
22
in einen anderen EU-Mitgliedstaat (Gelangensbestätigung)
23
\vspace{0.4cm}
20
  \large
21
  Bestätigung über das Gelangen des Gegenstands einer innergemeinschaftlichen Lieferung
22
  in einen anderen EU-Mitgliedstaat (Gelangensbestätigung)
23
  \vspace{0.4cm}
24 24

  
25
{\color{purple} Bitte unterschreiben und faxen/mailen an:
26
\begin{center} <%employee_fax%> / <%employee_email%> \end{center}}
27
\normalsize
28
\vspace{0.4cm}
29
<%name%>, <%street%>, <%zipcode%> <%city%>, <%country%>\hspace*{\fill}\\
30
\TextField[name=department, bordercolor=gray, width=\linewidth]{}\\
31
{\color{gray}(Name und Anschrift des Abnehmers der innergemeinschaftlichen Lieferung, ggf. E-Mail-Adresse)}
25
  {\color{purple} Bitte unterschreiben und faxen/mailen an:
26
    \begin{center} <%employee_fax%> / <%employee_email%> \end{center}}
27
  \normalsize
28
  \vspace{0.4cm}
29
  <%name%>, <%street%>, <%zipcode%> <%city%>, <%country%>\hspace*{\fill}\\
30
  \TextField[name=department, bordercolor=gray, width=\linewidth]{}\\
31
  {\color{gray}(Name und Anschrift des Abnehmers der innergemeinschaftlichen Lieferung, ggf. E-Mail-Adresse)}
32 32

  
33
\vspace{0.4cm}
33
  \vspace{0.4cm}
34 34

  
35
Hiermit bestätige ich als Abnehmer, dass ich folgenden Gegenstand / dass folgender Gegenstand \textsuperscript{1)} einer
36
innergemeinschaftlichen Lieferung\\
35
  Hiermit bestätige ich als Abnehmer, dass ich folgenden Gegenstand / dass folgender Gegenstand \textsuperscript{1)} einer
36
  innergemeinschaftlichen Lieferung\\
37 37

  
38 38

  
39
\TextField[name=qty, bordercolor=gray, width=\linewidth]{}\\
40
{\color{gray}(Menge des Gegenstands der Lieferung)}\\
39
  \TextField[name=qty, bordercolor=gray, width=\linewidth]{}\\
40
  {\color{gray}(Menge des Gegenstands der Lieferung)}\\
41 41

  
42
\TextField[name=desc, bordercolor=gray, width=\linewidth]{}\\
43
{\color{gray}(handelsübliche Bezeichnung, bei Fahrzeugen zusätzlich die Fahrzeug-Identifikationsnummer)}\\
42
  \TextField[name=desc, bordercolor=gray, width=\linewidth]{}\\
43
  {\color{gray}(handelsübliche Bezeichnung, bei Fahrzeugen zusätzlich die Fahrzeug-Identifikationsnummer)}\\
44 44

  
45
im\\
45
  im\\
46 46

  
47
\uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\
47
  \uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\
48 48
  {\color{gray}(Monat und Jahr des Erhalts des Liefergegenstands im Mitgliedstaat, in den der Liefergegenstand gelangt ist, wenn der liefernde Unternehmer den Liefergegenstand befördert oder versendet hat oder wenn der Abnehmer den Liefergegenstand versendet hat)}\\
49 49

  
50 50

  
51
\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
52
{\color{gray}(Monat und Jahr des Endes der Beförderung, wenn der Abnehmer den Liefergegenstand selbst befördert hat)}\\
51
  \TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
52
  {\color{gray}(Monat und Jahr des Endes der Beförderung, wenn der Abnehmer den Liefergegenstand selbst befördert hat)}\\
53 53

  
54
in / nach \textsuperscript{1)}\\
54
  in / nach \textsuperscript{1)}\\
55 55

  
56 56

  
57
\uline{<%country%>\hspace*{\fill}}\\
57
  \uline{<%country%>\hspace*{\fill}}\\
58 58
  {\color{gray}(Mitgliedstaat und Ort, wohin der Liefergegenstand im Rahmen einer Beförderung oder Versendung gelangt ist)}\\
59 59

  
60
erhalten habe / gelangt ist.
60
  erhalten habe / gelangt ist.
61 61

  
62
\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
63
{\color{gray}(Datum der Ausstellung der Bestätigung)}\\
62
  \TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
63
  {\color{gray}(Datum der Ausstellung der Bestätigung)}\\
64 64

  
65
\uline{\hspace*{\fill}}
65
  \uline{\hspace*{\fill}}
66 66

  
67
{\color{gray}(Unterschrift des Abnehmers oder seines Vertretungsberechtigten sowie Name des Unterzeichnenden in Druckschrift)}\\
67
  {\color{gray}(Unterschrift des Abnehmers oder seines Vertretungsberechtigten sowie Name des Unterzeichnenden in Druckschrift)}\\
68 68

  
69
\textbf{\textsuperscript{1)} Nichtzutreffendes bitte streichen.}
69
  \textbf{\textsuperscript{1)} Nichtzutreffendes bitte streichen.}
70 70
\end{Form}
71 71
\end{document}
72 72

  
templates/print/marei/ic_supply_EN.tex
17 17
\begin{document}
18 18

  
19 19
\begin{Form}
20
\large
21
Certification of the entry of the object of an intra-Community supply into another EU Member State (Entry Certificate)
20
  \large
21
  Certification of the entry of the object of an intra-Community supply into another EU Member State (Entry Certificate)
22 22

  
23
\vspace{0.4cm}
23
  \vspace{0.4cm}
24 24

  
25
{\color{purple} Please sign below and send back to fax-number/mail-address:
26
\begin{center} <%employee_fax%> / <%employee_email%> \end{center}}
25
  {\color{purple} Please sign below and send back to fax-number/mail-address:
26
    \begin{center} <%employee_fax%> / <%employee_email%> \end{center}}
27 27

  
28
\normalsize
29
\vspace{0.4cm}
30
<%name%>, <%street%>, <%zipcode%> <%city%>, <%country%>\hspace*{\fill}\\
31
\TextField[name=department, bordercolor=gray, width=\linewidth]{}\\
32
{\color{gray}(Name and address of the customer of the intra-Community supply, e-mail address if applicable)}
28
  \normalsize
29
  \vspace{0.4cm}
30
  <%name%>, <%street%>, <%zipcode%> <%city%>, <%country%>\hspace*{\fill}\\
31
  \TextField[name=department, bordercolor=gray, width=\linewidth]{}\\
32
  {\color{gray}(Name and address of the customer of the intra-Community supply, e-mail address if applicable)}
33 33

  
34 34

  
35
\vspace{0.4cm}
36
I as the customer hereby certify my receipt / the entry \textsuperscript{1)} of the following object of an intra-Community supply\\
35
  \vspace{0.4cm}
36
  I as the customer hereby certify my receipt / the entry \textsuperscript{1)} of the following object of an intra-Community supply\\
37 37

  
38
\TextField[name=qty, bordercolor=gray, width=\linewidth]{}\\
39
{\color{gray}(Quantity of the object of the supply)}\\
38
  \TextField[name=qty, bordercolor=gray, width=\linewidth]{}\\
39
  {\color{gray}(Quantity of the object of the supply)}\\
40 40

  
41
\TextField[name=desc, bordercolor=gray, width=\linewidth]{}\\
42
{\color{gray}(Standard commercial description – in the case of vehicles, including vehicle identification number)}\\
41
  \TextField[name=desc, bordercolor=gray, width=\linewidth]{}\\
42
  {\color{gray}(Standard commercial description – in the case of vehicles, including vehicle identification number)}\\
43 43

  
44
in\\
44
  in\\
45 45

  
46
\uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\
46
  \uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\
47 47
  {\color{gray}(Month and year the object of the supply was received in the Member State of entry if the supplying trader transported or dispatched the object of the supply or if the customer dispatched the object of the supply)}\\
48 48

  
49
\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
50
{\color{gray}(Month and year the transportation ended if the customer transported the object of the supply himself or herself)}\\
49
  \TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
50
  {\color{gray}(Month and year the transportation ended if the customer transported the object of the supply himself or herself)}\\
51 51

  
52
in / at \textsuperscript{1)}\\
52
  in / at \textsuperscript{1)}\\
53 53

  
54
\uline{<%country%>\hspace*{\fill}}\\
54
  \uline{<%country%>\hspace*{\fill}}\\
55 55
  {\color{gray}(Member State and place of entry as part of the transport or dispatch of the object)}\\
56 56

  
57 57

  
58
% X\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
59
\uline{X\hspace*{\fill}}\\
60
{\color{gray}(Date of issue of the certificate)}\\
58
  % X\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
59
  \uline{X\hspace*{\fill}}\\
60
  {\color{gray}(Date of issue of the certificate)}\\
61 61

  
62
\uline{X\hspace*{\fill}}\\
63
{\color{gray}(Signature of the customer or of the authorised representative as well as the signatory’s name in capitals)}\\
62
  \uline{X\hspace*{\fill}}\\
63
  {\color{gray}(Signature of the customer or of the authorised representative as well as the signatory’s name in capitals)}\\
64 64

  
65
\textbf{\textsuperscript{1)} Delete as appropriate.}
65
  \textbf{\textsuperscript{1)} Delete as appropriate.}
66 66

  
67 67
\end{Form}
68 68
\end{document}
templates/print/marei/invoice.tex
7 7
  }]{foreground}
8 8
  \AddLayersToPageStyle{kivitendo.letter.first}{foreground}%Hintergrund für die erste Seite aktivieren
9 9
  \AddLayersToPageStyle{kivitendo.letter}{foreground}%Hintergrund für die erste Seite aktivieren
10
<%end if%>
10
<%end template_meta.formname == "invoice_copy"%>
11 11

  
12 12

  
13 13

  
......
23 23

  
24 24
<%if template_meta.formname == "invoice_for_advance_payment"%>
25 25
  \renewcommand{\rechnung}{\anzahlungsrechnung}
26
<%end if%>
26
<%end template_meta.formname == "invoice_for_advance_payment"%>
27 27

  
28 28
<%if template_meta.formname == "final_invoice"%>
29 29
  \renewcommand{\rechnung}{\schlussrechnung}
30
<%end if%>
30
<%end template_meta.formname == "final_invoice"%>
31 31

  
32 32
% laufende Kopfzeile:
33 33
\ourhead{\kundennummer}{<%customernumber%>}{\rechnung}{<%invnumber%>}{<%invdate%>}
......
44 44
<%if ordnumber%>%
45 45
  \setkomavar*{myref}{\auftragsnummer}
46 46
  \setkomavar{myref}{<%ordnumber%>}
47
<%end if%>%
47
<%end ordnumber%>%
48 48
<%if tax_point%>%
49 49
  \setkomavar*{taxpoint}{\leistungsdatum}
50 50
  \setkomavar{taxpoint}{<%tax_point%>}
51
<%end if%>%
51
<%end tax_point%>%
52 52
<%if cusordnumber%>%
53 53
  \setkomavar*{yourref}{\ihreBestellnummer}
54 54
  \setkomavar{yourref}{<%cusordnumber%>}
55
<%end if%>%
55
<%end cusordnumber%>%
56 56
<%if donumber%>%
57 57
  \setkomavar{delivery}{<%donumber%>}
58
<%end if%>%
58
<%end donumber%>%
59 59

  
60 60
<%if quonumber%>%
61 61
\setkomavar{quote}{<%quonumber%>}
62
<%end if%>%
62
<%end quonumber%>%
63 63

  
64 64
\setkomavar{transaction}{<%transaction_description%>}
65 65
<%if shiptoname%>%
......
82 82
  }
83 83
\end{lrbox}
84 84
\makeatother
85
<%end if%>%
85
<%end shiptoname%>%
86 86

  
87 87
\begin{document}
88 88

  
89 89
\begin{letter}{%
90
<%if billing_address_id%>%
91
	<%billing_address_name%> \strut\\%
92
	<%if department_1%><%billing_address_department_1%>\\<%end if%>%
93
	<%if department_2%><%billing_address_department_2%>\\<%end if%>%
94
	<%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%me%>\strut\\%me%>\strut\\%me%>\strut\\%
95
	<%billing_address_street%>\strut\\%
96
	<%billing_address_zipcode%> <%billing_address_city%> \strut\\%
97
	<%billing_address_country%>\strut\\%
98
<%else%>%
99
	<%name%>\strut\\%
100
	<%if department_1%><%department_1%>\\<%end if%>%
101
	<%if department_2%><%department_2%>\\<%end if%>%
102
	<%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
103
	<%street%>\strut\\%
104
	<%zipcode%> <%city%>\strut\\%
105
	<%country%>\strut%
106
<%end if%>%
107
}
90
  <%if billing_address_id%>%
91
    <%billing_address_name%> \strut\\%
92
    <%if department_1%><%billing_address_department_1%>\\<%end if%>%
93
    <%if department_2%><%billing_address_department_2%>\\<%end if%>%
94
    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%me%>\strut\\%me%>\strut\\%me%>\strut\\%
95
    <%billing_address_street%>\strut\\%
96
    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
97
    <%billing_address_country%>\strut\\%
98
  <%else%>%
99
    <%name%>\strut\\%
100
    <%if department_1%><%department_1%>\\<%end if%>%
101
    <%if department_2%><%department_2%>\\<%end if%>%
102
    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
103
    <%street%>\strut\\%
104
    <%zipcode%> <%city%>\strut\\%
105
    <%country%>\strut%
106
  <%end billing_address_id%>%
107
  }
108 108

  
109
% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
110
% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
111
\opening{
112
\Ifstr{<%cp_name%>}{}
113
{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
114
  {
115
    \Ifstr{<%cp_gender%>}{f}
116
        {\anredefrau}
117
        {\anredeherr}
109
  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
110
  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
111
  \opening{
112
    \Ifstr{<%cp_name%>}{}
113
    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede}<%end if%>
114
    {
115
      \Ifstr{<%cp_gender%>}{f}
116
      {\anredefrau}
117
      {\anredeherr}
118 118
      <%cp_title%> <%cp_name%>,
119 119
    }
120 120
  }
121
\thispagestyle{kivitendo.letter.first}
122

  
123
<%if notes%>%
124
<%notes%>%
125
\vspace{0.5cm}
126
<%end if%>%
127

  
128

  
129
%PricingTabular* kann automatisch spalten ignorieren
130
% \begin{PricingTabular*}[id=false]
131
% deaktiviert damit die Spalte der Produktnummer
132
% analog ist dies für pos, amount, price, pricetotal möglich.
133
% Die Spalte der Bezeichnung ist nicht deaktivierbar
134
%
135
% Darüber hinaus kann die Reihenfolge verändert werden, die Voreinstellung entspricht:
136
% \begin{PricingTabular*[columns={pos, id, desc, amount, price, pricetotal}]
137
% Auf diese Art ist auch möglich mehrSpalten anzulegen als definiert sind. Für jede Spalte kann die Breite über weitere Optionen angepasst werden, die Einträge der columns-Liste entspricht den Spaltennamen.
138
%
139
% id = false, % deaktiviert die Spalte der Artikelnummer
140
% amount = 1cm, % Setzt die Breite der Mengenspalte auf 1cm
141
% desc/header = Artikelbeschreibung, %Ändert die Überschrift der Bezeichnunsspalte in „Artikelbeschreibung”
142
\begin{PricingTabular*}%
143
  % eigentliche Tabelle
144
  \FakeTable{%
145
  <%foreach number%>%
146
  <%runningnumber%> &%
147
  <%number%> &%
148
  \textbf{<%description%>}%
149
  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
150
  <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
151
  <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
152
  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
153
  &%
154
  <%qty%> <%unit%> &%
155
  <%sellprice%>&%
156
  \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
157
    <%linetotal%>\tabularnewline%
121
  \thispagestyle{kivitendo.letter.first}
122

  
123
  <%if notes%>%
124
    <%notes%>%
125
    \vspace{0.5cm}
126
  <%end notes%>%
127

  
128

  
129
  %PricingTabular* kann automatisch spalten ignorieren
130
  % \begin{PricingTabular*}[id=false]
131
  % deaktiviert damit die Spalte der Produktnummer
132
  % analog ist dies für pos, amount, price, pricetotal möglich.
133
  % Die Spalte der Bezeichnung ist nicht deaktivierbar
134
  %
135
  % Darüber hinaus kann die Reihenfolge verändert werden, die Voreinstellung entspricht:
136
  % \begin{PricingTabular*[columns={pos, id, desc, amount, price, pricetotal}]
137
  % Auf diese Art ist auch möglich mehrSpalten anzulegen als definiert sind. Für jede Spalte kann die Breite über weitere Optionen angepasst werden, die Einträge der columns-Liste entspricht den Spaltennamen.
138
  %
139
  % id = false, % deaktiviert die Spalte der Artikelnummer
140
  % amount = 1cm, % Setzt die Breite der Mengenspalte auf 1cm
141
  % desc/header = Artikelbeschreibung, %Ändert die Überschrift der Bezeichnunsspalte in „Artikelbeschreibung”
142
  \begin{PricingTabular*}%
143
    % eigentliche Tabelle
144
    \FakeTable{%
145
    <%foreach number%>%
146
      <%runningnumber%> &%
147
      <%number%> &%
148
      \textbf{<%description%>}%
149
      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
150
      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
151
      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
152
      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
153
      &%
154
      <%qty%> <%unit%> &%
155
      <%sellprice%>&%
156
      \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
157
      <%linetotal%>\tabularnewline%
158 158
    <%end number%>%
159
  }%
160
  \begin{PricingTotal}%
161
    % Tabellenende letzte Seite
162
    \nettobetrag & <%subtotal%>\\%
163
    <%foreach tax%>%
164
    <%taxdescription%> & <%tax%>\\%
165
    <%end tax%>%
166
    \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
167
  \end{PricingTotal}%
168
\end{PricingTabular*}
169

  
170
\vspace{0.2cm}
171

  
172
<%if template_meta.formname == "final_invoice"%>
159
    }%
160
    \begin{PricingTotal}%
161
      % Tabellenende letzte Seite
162
      \nettobetrag & <%subtotal%>\\%
163
      <%foreach tax%>%
164
        <%taxdescription%> & <%tax%>\\%
165
      <%end tax%>%
166
      \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
167
    \end{PricingTotal}%
168
  \end{PricingTabular*}
169

  
170
  \vspace{0.2cm}
171

  
172
  <%if template_meta.formname == "final_invoice"%>
173 173
  <%if iap_existing%>
174 174
    \abzueglichAnzahlungsrechnungen:\\
175 175
    \begin{SimpleTabular}[colspec=llr<{\tabcurrency}r<{\tabcurrency},headline={\bfseries\nr& \bfseries\date& \bfseries\betrag & \bfseries\ust}]%
......
177 177
        <%iap_invnumber%> & <%iap_transdate_as_date%> & <%iap_amount%> & <%iap_taxamount%>\\%
178 178
      <%end iap_invnumber%>%
179 179
    \end{SimpleTabular}%
180
      \bfseries\rechnungsbetrag: <%iap_final_amount%> \currency\\%
180
    \bfseries\rechnungsbetrag: <%iap_final_amount%> \currency\\%
181 181
  <%end iap_existing%>
182
<%end%>%
182
  <%end%>%
183 183

  
184
\Ifstr{<%deliverydate%>}{}{%
185
  \leistungsdatumGleichRechnungsdatum%
186
}{
187
  \lieferungErfolgtAm ~<%deliverydate%>.
188
}\\
184
  \Ifstr{<%deliverydate%>}{}{%
185
    \leistungsdatumGleichRechnungsdatum%
186
  }{
187
    \lieferungErfolgtAm ~<%deliverydate%>.
188
  }\\
189 189

  
190
<%if payment_terms%>%
191
\zahlung ~<%payment_terms%>\\
192
<%end payment_terms%>%
190
  <%if payment_terms%>%
191
    \zahlung ~<%payment_terms%>\\
192
  <%end payment_terms%>%
193 193

  
194
<%if delivery_term%>%
195
\lieferung ~<%delivery_term.description_long%>\\
196
<%end delivery_term%>%
194
  <%if delivery_term%>%
195
    \lieferung ~<%delivery_term.description_long%>\\
196
  <%end delivery_term%>%
197 197

  
198
<%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>%
198
  <%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>%
199 199

  
200
\ifnum<%taxzone_id%>=1
201
\steuerfreiEU\\  % EU mit USt-ID Nummer
202
\else
203
\ifnum<%taxzone_id%>=3
204
\steuerfreiAUS\\  % Außerhalb EU
205
\fi
206
\fi
200
  \ifnum<%taxzone_id%>=1
201
    \steuerfreiEU\\  % EU mit USt-ID Nummer
202
  \else
203
    \ifnum<%taxzone_id%>=3
204
      \steuerfreiAUS\\  % Außerhalb EU
205
    \fi
206
  \fi
207 207

  
208
\closing{\gruesse}
208
  \closing{\gruesse}
209 209

  
210 210
\end{letter}
211 211

  
templates/print/marei/kiviletter.sty
209 209
        }
210 210
        \prop_if_in:cnTF {l_kivi_col_##1_prop} {colspec} {
211 211
          \kivi_if_Price_col:nTF {##1} {
212
             \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {K}
212
            \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {K}
213 213
          }{
214
             \tl_gput_right:Nx \g_kivi_Pricing_colspec_tl {\prop_item:cn {l_kivi_col_##1_prop} {colspec}}
214
            \tl_gput_right:Nx \g_kivi_Pricing_colspec_tl {\prop_item:cn {l_kivi_col_##1_prop} {colspec}}
215 215
          }
216 216
          \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {{\dim_use:c {l_kivi_tab_##1_dim}}}
217
         } {
217
        } {
218 218
          \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {K{\dim_use:c {l_kivi_tab_##1_dim}}}
219
         }
219
        }
220 220
        \kivi_if_Price_col:nT {##1} {\tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {<{\__kivi_tab_column_currency:}}}
221 221
      }
222 222
    }
......
234 234
\tcbuselibrary{breakable, skins}
235 235

  
236 236
\tcb@new@skin{kivi@LT}{base@unbroken,%
237
  frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
238
  skin~first=kivi@LT@first,skin~middle=kivi@LT@middle,skin~last=kivi@LT@last,
239
  underlay~first~and~middle={
240
    \node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
241
    \node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@foot_box}};
237
frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
238
skin~first=kivi@LT@first,skin~middle=kivi@LT@middle,skin~last=kivi@LT@last,
239
underlay~first~and~middle={
240
\node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
241
\node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@foot_box}};
242 242
},
243
  underlay~unbroken~and~last={
244
    \node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
245
    \node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@lastfoot_box}};
246
  },
247
  boxsep=0pt,
248
  boxrule=0pt,
249
  left=0pt,
250
  right=0pt,
251
  bottom=\box_ht:N  \g_kivi_LT@foot_box+\box_dp:N  \g_kivi_LT@foot_box + \aboverulesep,
252
  top=\box_ht:N  \g_kivi_LT@head_box+\box_dp:N  \g_kivi_LT@head_box +\belowrulesep,
253
  parbox=false,
243
underlay~unbroken~and~last={
244
\node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
245
\node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@lastfoot_box}};
246
},
247
boxsep=0pt,
248
boxrule=0pt,
249
left=0pt,
250
right=0pt,
251
bottom=\box_ht:N  \g_kivi_LT@foot_box+\box_dp:N  \g_kivi_LT@foot_box + \aboverulesep,
252
top=\box_ht:N  \g_kivi_LT@head_box+\box_dp:N  \g_kivi_LT@head_box +\belowrulesep,
253
parbox=false,
254 254
}
255 255

  
256 256
\tcb@new@skin{kivi@LT@first}{base@first,%
......
322 322
      {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_even_tl}}
323 323
    }
324 324
    {
325
     \parbox{\linewidth}{
325
      \parbox{\linewidth}{
326 326
        \seq_set_split:Nnn  \l_kivi_columns_seq {&} {##1}
327 327
        \seq_gclear:N \g_kivi_extraDescription_seq
328 328
        \exp_args:Nnx \use:n {\tabular[t]}\g_kivi_Pricing_colspec_tl
......
332 332
          &\seq_item:Nn \l_kivi_columns_seq {####1}
333 333
        }
334 334
        \endtabular
335
       }
336 335
      }
336
    }
337 337

  
338
        \seq_if_empty:NTF \g_kivi_extraDescription_seq
339
        {\par}
340
        {\par\nopagebreak
341
            \bool_if:NT \g__kivi_Tabular_content_rowcolor_bool {
342
              \int_if_odd:nTF {\g__kivi_PricingTable_rowcolor_int}
343
              {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_odd_tl}}
344
              {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_even_tl}}
345
            }
346
          {
347
          \setlength{\leftskip}{\dim_eval:n {\bool_if:NT \g__kivi_Tabular_rowcolor_bool {-\tabcolsep} +\l_kivi_tab_desc_leftskip_dim}}
348
          \setlength{\hsize}{\dim_eval:n {\l_kivi_tab_desc_dim+\leftskip}}
349
          \setlength{\linewidth}{\hsize}
350
          \addtolength{\leftmargini}{\l_kivi_tab_desc_leftskip_dim}
351
          \usekomafont{extraDescription}
352
          \seq_use:Nn \g_kivi_extraDescription_seq {\ifhmode\\\fi}
353
          \par
354
          }
355
        }
338
    \seq_if_empty:NTF \g_kivi_extraDescription_seq
339
    {\par}
340
    {\par\nopagebreak
341
      \bool_if:NT \g__kivi_Tabular_content_rowcolor_bool {
342
        \int_if_odd:nTF {\g__kivi_PricingTable_rowcolor_int}
343
        {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_odd_tl}}
344
        {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_even_tl}}
345
      }
346
      {
347
        \setlength{\leftskip}{\dim_eval:n {\bool_if:NT \g__kivi_Tabular_rowcolor_bool {-\tabcolsep} +\l_kivi_tab_desc_leftskip_dim}}
348
        \setlength{\hsize}{\dim_eval:n {\l_kivi_tab_desc_dim+\leftskip}}
349
        \setlength{\linewidth}{\hsize}
350
        \addtolength{\leftmargini}{\l_kivi_tab_desc_leftskip_dim}
351
        \usekomafont{extraDescription}
352
        \seq_use:Nn \g_kivi_extraDescription_seq {\ifhmode\\\fi}
353
        \par
354
      }
355
    }
356 356
    \par
357 357
    \tl_if_empty:NF \l__kivi_Tabular_rowsep_tl {\nointerlineskip\l__kivi_Tabular_rowsep_tl}
358 358
  }
......
371 371

  
372 372
\tl_new:N \g_kivi_Pricing_colspec_tl
373 373
\tl_gset:Nn \g_kivi_Pricing_colspec_tl {
374
  \bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
375
  \bool_if:NT \l_kivi_col_pos_bool {p{\l_kivi_tab_pos_dim}}
376
  \bool_if:NT \l_kivi_col_id_bool {p{\l_kivi_tab_id_dim}}
377
  p{\l_kivi_tab_desc_dim}
378
  \bool_if:NT \l_kivi_col_amount_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_amount_dim}}}
379
  \bool_if:NT \l_kivi_col_price_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_price_dim}<{\__kivi_tab_column_currency:}}}
380
  \bool_if:NT \l_kivi_col_pricetotal_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_pricetotal_dim}<{\__kivi_tab_column_currency:}}}
381
  \bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
374
\bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
375
\bool_if:NT \l_kivi_col_pos_bool {p{\l_kivi_tab_pos_dim}}
376
\bool_if:NT \l_kivi_col_id_bool {p{\l_kivi_tab_id_dim}}
377
p{\l_kivi_tab_desc_dim}
378
\bool_if:NT \l_kivi_col_amount_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_amount_dim}}}
379
\bool_if:NT \l_kivi_col_price_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_price_dim}<{\__kivi_tab_column_currency:}}}
380
\bool_if:NT \l_kivi_col_pricetotal_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_pricetotal_dim}<{\__kivi_tab_column_currency:}}}
381
\bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
382 382
}
383 383

  
384 384
\cs_new_protected:Nn \__kivi_tab_column_currency: {\,\currency}
......
404 404
    }
405 405
  }
406 406
  \bool_if:nT {\g__kivi_Tabular_rowcolor_bool  && ! \g__kivi_Tabular_content_rowcolor_bool } {
407
	\box_gset_dp:Nn \g_kivi_LT@head_box  {\box_dp:N \g_kivi_LT@head_box + \l__kivi_fboxsep_dim}
407
    \box_gset_dp:Nn \g_kivi_LT@head_box  {\box_dp:N \g_kivi_LT@head_box + \l__kivi_fboxsep_dim}
408 408
  }
409 409
  \hbox_gset:Nn \g_kivi_LT@foot_box {
410 410
    \begin{tabular*}{\textwidth}[t]{@{\extracolsep{\fill}}r@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}}
......
417 417
  \hbox_gset:Nn \g_kivi_LT@lastfoot_box {
418 418
    \raisebox{\dimexpr\depth+\baselineskip}[0pt][0pt]{
419 419
      \begin{tabular*}{\textwidth}{@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}\extracolsep{\fill}}r@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}}
420
      \bool_if:NF \g__kivi_Tabular_rowcolor_bool \bottomrule
420
        \bool_if:NF \g__kivi_Tabular_rowcolor_bool \bottomrule
421 421
      \end{tabular*}
422 422
    }
423 423
  }
......
426 426

  
427 427
%Macht es sinn hier eine Variante zu machen, in der alle Spalten Belegbar sind?
428 428
\NewDocumentEnvironment{PricingTotal}{+b}{
429
  \par\nointerlineskip
429
\par\nointerlineskip
430 430
}{
431
  \bool_if:NT \g__kivi_Tabular_rowcolor_bool {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_PricingTotal_tl}}
432
  {
433
    \tabular[t]{
434
      @{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}
435
      p{\dim_eval:n {\linewidth-\l_kivi_tab_pricetotal_dim-\bool_if:NTF \g__kivi_Tabular_rowcolor_bool {4}{2}\tabcolsep}}P{\l_kivi_tab_pricetotal_dim}@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}
436
    }
437
    \l__kivi_Tabular_PricingTotal_topsep_tl
438
    #1
439
    \endtabular
440
  }
431
\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_PricingTotal_tl}}
432
{
433
\tabular[t]{
434
@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}
435
p{\dim_eval:n {\linewidth-\l_kivi_tab_pricetotal_dim-\bool_if:NTF \g__kivi_Tabular_rowcolor_bool {4}{2}\tabcolsep}}P{\l_kivi_tab_pricetotal_dim}@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}
436
}
437
\l__kivi_Tabular_PricingTotal_topsep_tl
438
#1
439
\endtabular
440
}
441 441
}
442 442

  
443 443
\tl_new:N \l__kivi_Tabular_PricingTotal_topsep_tl
......
502 502

  
503 503
\keys_define:nn {kivi/Tabular} {
504 504
  color-rows .code:n = {
505
		\bool_gset_eq:Nc \g__kivi_Tabular_rowcolor_bool {c_#1_bool}
506
		\bool_gset_eq:Nc \g__kivi_Tabular_content_rowcolor_bool {c_#1_bool}
507
	},
505
      \bool_gset_eq:Nc \g__kivi_Tabular_rowcolor_bool {c_#1_bool}
506
      \bool_gset_eq:Nc \g__kivi_Tabular_content_rowcolor_bool {c_#1_bool}
507
    },
508 508
  color-rows .initial:n = false,
509 509
  color-rows .default:n = true,
510 510
  color-only-structure .code:n  = {
511
		\bool_gset_eq:Nc \g__kivi_Tabular_rowcolor_bool {c_#1_bool}
512
		\bool_gset_eq:Nc \g__kivi_Tabular_content_rowcolor_bool {c_#1_bool}
513
		\bool_gset_inverse:N \g__kivi_Tabular_content_rowcolor_bool
514
	},
511
      \bool_gset_eq:Nc \g__kivi_Tabular_rowcolor_bool {c_#1_bool}
512
      \bool_gset_eq:Nc \g__kivi_Tabular_content_rowcolor_bool {c_#1_bool}
513
      \bool_gset_inverse:N \g__kivi_Tabular_content_rowcolor_bool
514
    },
515 515
  color-only-structure .initial:n = false,
516 516
  color-only-structure .default:n = true,
517 517
  rowcolor-odd .tl_gset:N = \g__kivi_Tabular_rowcolor_odd_tl,
......
525 525
  rowsep .tl_set:N =\l__kivi_Tabular_rowsep_tl,
526 526
  rowsep .initial:n = ,
527 527
  hrule .meta:n = {
528
    rowsep={
529
      \vskip\aboverulesep
530
      \leavevmode\hrule\@height\lightrulewidth
531
      \vskip\belowrulesep}},
528
      rowsep={
529
          \vskip\aboverulesep
530
          \leavevmode\hrule\@height\lightrulewidth
531
          \vskip\belowrulesep}},
532 532
}
533 533

  
534 534
\newcommand*{\SetupSimpleTabular}[1]{\keys_set:nn {kivi/SimpleTabular} {#1}}
templates/print/marei/letter.tex
34 34
$( END )$
35 35

  
36 36
\begin{letter}{
37
$( KiviLatex.filter(customer.name) )$\strut\\
38
$( KiviLatex.filter(letter.contact.formal_greeting) )$\strut\\
39
$( KiviLatex.filter(customer.street) )$\strut\\
40
$( KiviLatex.filter(customer.zipcode) )$ $( KiviLatex.filter(customer.city) )$\strut\\
41
$( KiviLatex.filter(customer.country) )$%
42
}
37
    $( KiviLatex.filter(customer.name) )$\strut\\
38
    $( KiviLatex.filter(letter.contact.formal_greeting) )$\strut\\
39
    $( KiviLatex.filter(customer.street) )$\strut\\
40
    $( KiviLatex.filter(customer.zipcode) )$ $( KiviLatex.filter(customer.city) )$\strut\\
41
    $( KiviLatex.filter(customer.country) )$%
42
  }
43 43

  
44
\opening{$( KiviLatex.filter(letter.greeting) )$}
45
\thispagestyle{kivitendo.letter.first}
44
  \opening{$( KiviLatex.filter(letter.greeting) )$}
45
  \thispagestyle{kivitendo.letter.first}
46 46

  
47
$( KiviLatex.filter_html(letter.body) )$
47
  $( KiviLatex.filter_html(letter.body) )$
48 48

  
49
\closing{\gruesse}
49
  \closing{\gruesse}
50 50

  
51 51
\end{letter}
52 52

  
templates/print/marei/pick_list.tex
15 15
\setkomavar{firsthead}{
16 16
  \normalsize
17 17
  \noindent\begin{tabular}[t]{@{}l@{}}
18
    <%company%>\strut\\
18
    <%company%>\strut \\
19 19
    <%address%>
20 20
  \end{tabular}
21 21
  \hfill
......
28 28

  
29 29
\makeatletter
30 30
\setkomavar{location}{
31
  \normalsize
32
  <%shiptocontact%>%
33
  <%if shiptophone%>%
31
\normalsize
32
<%shiptocontact%>%
33
<%if shiptophone%>%
34 34
  \\\textTelefon : <%shiptophone%>
35
  <%end shiptophone%>%
36
  <%if shiptofax%>%
35
<%end shiptophone%>%
36
<%if shiptofax%>%
37 37
  \\\textFax : <%shiptofax%>
38
  <%end shiptofax%>%
39
  \\%
40
  <%shiptoemail%>%
38
<%end shiptofax%>%
39
\\%
40
<%shiptoemail%>%
41 41
}
42 42
\makeatother
43 43

  
44 44
\setkomavar{backaddress}{\lieferanschrift}
45 45

  
46 46
\begin{letter}{\strut%
47
<%shiptoname%>\ifhmode\\\fi
48
<%shiptostreet%>\ifhmode\\\fi
49
<%shiptozipcode%>\ifhmode\\\fi
50
<%shiptocity%>\ifhmode\\\fi
51
<%shiptocountry%>%
52
}
53

  
54
\opening{}
55

  
56

  
57
\begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
58
        <%if warehouse%>%
59
        &\bfseries\lager%
60
        <%end warehouse%>%
61
        &\bfseries\lagerplatz&\bfseries\lieferungMit}]
62
  <%ordnumber%>%
63
  &%
64
  <%if shippingdate%>%
65
  <%shippingdate%>%
66
  <%end shippingdate%>%
67
  <%if not shippingdate%>%
68
  <%orddate%>%
69
  <%end shippingdate%>%
70
  & <%employee%>%
71
  <%if warehouse%>%
72
  & <%warehouse%>%
73
  <%end warehouse%>%
74
  & <%shippingpoint%> & <%shipvia%> \\
75
\end{SimpleTabular}
76

  
77
\bigskip
78

  
79
\begin{SimpleTabular}[colspec=rlXrcll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\menge&\bfseries\lagerausgang&&\bfseries\lagerplatz}]%
80
  <%foreach number%>%
81
  <%runningnumber%> & <%number%> & <%description%> &%
82
  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\%
83
  <%end number%>%
84
\end{SimpleTabular}
47
    <%shiptoname%>\ifhmode\\\fi
48
    <%shiptostreet%>\ifhmode\\\fi
49
    <%shiptozipcode%>\ifhmode\\\fi
50
    <%shiptocity%>\ifhmode\\\fi
51
    <%shiptocountry%>%
52
  }
53

  
54
  \opening{}
55

  
56

  
57
  \begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
58
    <%if warehouse%>%
59
      &\bfseries\lager%
60
    <%end warehouse%>%
61
    &\bfseries\lagerplatz&\bfseries\lieferungMit}]
62
    <%ordnumber%>%
63
    &%
64
    <%if shippingdate%>%
65
      <%shippingdate%>%
66
    <%end shippingdate%>%
67
    <%if not shippingdate%>%
68
    <%orddate%>%
69
    <%end shippingdate%>%
70
    & <%employee%>%
71
    <%if warehouse%>%
72
      & <%warehouse%>%
73
    <%end warehouse%>%
74
    & <%shippingpoint%> & <%shipvia%> \\
75
  \end{SimpleTabular}
76

  
77
  \bigskip
78

  
79
  \begin{SimpleTabular}[colspec=rlXrcll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\menge&\bfseries\lagerausgang&&\bfseries\lagerplatz}]%
80
    <%foreach number%>%
81
      <%runningnumber%> & <%number%> & <%description%> &%
82
      <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\%
83
    <%end number%>%
84
  \end{SimpleTabular}
85 85

  
86 86
\end{letter}
87 87

  
templates/print/marei/proforma.tex
27 27
\setkomavar{date}{<%orddate%>}
28 28
\setkomavar{customer}{<%customernumber%>}
29 29
<%if cusordnumber%>%
30
\setkomavar*{yourref}{\ihreBestellnummer}
31
\setkomavar{yourref}{<%cusordnumber%>}
32
<%end if%>%
30
  \setkomavar*{yourref}{\ihreBestellnummer}
31
  \setkomavar{yourref}{<%cusordnumber%>}
32
<%end cusordnumber%>%
33 33
<%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
34 34
\setkomavar{fromname}{<%employee_name%>}
35 35
\setkomavar{fromphone}{<%employee_tel%>}
......
37 37
\setkomavar{transaction}{<%transaction_description%>}
38 38

  
39 39
<%if shiptoname%>%
40
\makeatletter
41
\begin{lrbox}\shippingAddressBox
42
  \parbox{\useplength{toaddrwidth}}{
43
    \backaddr@format{\scriptsize\usekomafont{backaddress}%
44
      \strut\abweichendeLieferadresse
40
  \makeatletter
41
  \begin{lrbox}\shippingAddressBox
42
    \parbox{\useplength{toaddrwidth}}{
43
      \backaddr@format{\scriptsize\usekomafont{backaddress}%
44
        \strut\abweichendeLieferadresse
45
      }
46
      \par\smallskip
47
      \setlength{\parskip}{\z@}
48
      \par
49
      \normalsize
50
      <%shiptoname%>\par
51
      <%if shiptocontact%> <%shiptocontact%><%end if%>\par
52
      <%shiptodepartment_1%>\par
53
      <%shiptodepartment_2%>\par
54
      <%shiptostreet%>\par
55
      <%shiptozipcode%> <%shiptocity%>%
45 56
    }
46
    \par\smallskip
47
    \setlength{\parskip}{\z@}
48
    \par
49
    \normalsize
50
    <%shiptoname%>\par
51
    <%if shiptocontact%> <%shiptocontact%><%end if%>\par
52
    <%shiptodepartment_1%>\par
53
    <%shiptodepartment_2%>\par
54
    <%shiptostreet%>\par
55
    <%shiptozipcode%> <%shiptocity%>%
56
  }
57
\end{lrbox}
58
\makeatother
59
<%end if%>%
57
  \end{lrbox}
58
  \makeatother
59
<%end shiptoname%>%
60 60

  
61 61
\begin{letter}{%
62
<%if billing_address_id%>%
63
	<%billing_address_name%> \strut\\%
64
	<%if department_1%><%billing_address_department_1%>\\<%end if%>%
65
	<%if department_2%><%billing_address_department_2%>\\<%end if%>%
66
	<%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
67
	<%billing_address_street%>\strut\\%
68
	<%billing_address_zipcode%> <%billing_address_city%> \strut\\%
69
	<%billing_address_country%>\strut\\%
70
<%else%>%
71
	<%name%>\strut\\%
72
	<%if department_1%><%department_1%>\\<%end if%>%
73
	<%if department_2%><%department_2%>\\<%end if%>%
74
	<%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
75
	<%street%>\strut\\%
76
	<%zipcode%> <%city%>\strut\\%
77
	<%country%>\strut%
78
<%end if%>%
79
}
62
  <%if billing_address_id%>%
63
    <%billing_address_name%> \strut\\%
64
    <%if department_1%><%billing_address_department_1%>\\<%end if%>%
65
    <%if department_2%><%billing_address_department_2%>\\<%end if%>%
66
    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
67
    <%billing_address_street%>\strut\\%
68
    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
69
    <%billing_address_country%>\strut\\%
70
  <%else%>%
71
    <%name%>\strut\\%
72
    <%if department_1%><%department_1%>\\<%end if%>%
73
    <%if department_2%><%department_2%>\\<%end if%>%
74
    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
75
    <%street%>\strut\\%
76
    <%zipcode%> <%city%>\strut\\%
77
    <%country%>\strut%
78
  <%end billing_address_id%>%
79
  }
80 80

  
81
% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
82
% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
83
\opening{
84
\Ifstr{<%cp_name%>}{}
85
{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
86
  {
87
    \Ifstr{<%cp_gender%>}{f}
88
        {\anredefrau}
89
        {\anredeherr}
81
  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
82
  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
83
  \opening{
84
    \Ifstr{<%cp_name%>}{}
85
    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede}<%end if%>
86
    {
87
      \Ifstr{<%cp_gender%>}{f}
88
      {\anredefrau}
89
      {\anredeherr}
90 90
      <%cp_title%> <%cp_name%>,
91 91
    }
92 92
  }
93
\thispagestyle{kivitendo.letter.first}
94

  
95
\auftragsformel
96

  
97
\begin{PricingTabular*}%
98
  % eigentliche Tabelle
99
  \FakeTable{%
100
  <%foreach number%>%
101
  <%runningnumber%> &%
102
  <%number%> &%
103
  \textbf{<%description%>}%
104
  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
105
  <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
106
  <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
107
  <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
108
  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
109
  &%
110
  <%qty%> <%unit%> &%
111
  <%sellprice%>&%
112
  \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
113
    <%linetotal%>\tabularnewline%
93
  \thispagestyle{kivitendo.letter.first}
94

  
95
  \auftragsformel
96

  
97
  \begin{PricingTabular*}%
98
    % eigentliche Tabelle
99
    \FakeTable{%
100
    <%foreach number%>%
101
      <%runningnumber%> &%
102
      <%number%> &%
103
      \textbf{<%description%>}%
104
      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
105
      <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
106
      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
107
      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
108
      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
109
      &%
110
      <%qty%> <%unit%> &%
111
      <%sellprice%>&%
112
      \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
113
      <%linetotal%>\tabularnewline%
114 114
    <%end number%>%
115
  }%
116
  \begin{PricingTotal}%
117
    % Tabellenende letzte Seite%
118
    \nettobetrag & <%subtotal%>\\%
119
    <%foreach tax%>%
120
    <%taxdescription%> & <%tax%>\\%
121
    <%end tax%>%
122
    \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
123
  \end{PricingTotal}%
124
\end{PricingTabular*}
125

  
126
<%if notes%>%
127
<%notes%>%
128
\medskip
129
<%end if%>%
130

  
131
<%if reqdate%>%
132
\lieferungErfolgtAm ~<%reqdate%>. \\
133
<%end if%>%
134

  
135
\textit{\auftragpruefen}
136

  
137
\closing{\gruesse}
115
    }%
116
    \begin{PricingTotal}%
117
      % Tabellenende letzte Seite%
118
      \nettobetrag & <%subtotal%>\\%
119
      <%foreach tax%>%
120
        <%taxdescription%> & <%tax%>\\%
121
      <%end tax%>%
122
      \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
123
    \end{PricingTotal}%
124
  \end{PricingTabular*}
125

  
126
  <%if notes%>%
127
    <%notes%>%
128
    \medskip
129
  <%end notes%>%
130

  
131
  <%if reqdate%>%
132
    \lieferungErfolgtAm ~<%reqdate%>. \\
133
  <%end reqdate%>%
134

  
135
  \textit{\auftragpruefen}
136

  
137
  \closing{\gruesse}
138 138

  
139 139
\end{letter}
140 140

  
templates/print/marei/purchase_delivery_order.tex
26 26
}
27 27
<%if ordnumber%>
28 28
	\setkomavar{orderID}{<%ordnumber%>}
29
<%end if%>%
29
<%end ordnumber%>%
30 30
<%if cusordnumber%>%
31 31
	\setkomavar*{yourref}{\unsereBestellnummer}
32 32
	\setkomavar{yourref}{<%cusordnumber%>}
33
<%end if%>%
33
<%end cusordnumber%>%
34 34
\setkomavar{transaction}{<%transaction_description%>}
35 35

  
36 36
<%if globalprojectnumber%>%
......
59 59
	}
60 60
\end{lrbox}
61 61
\makeatother
62
<%end if%>%
62
<%end shiptoname%>%
63 63

  
64 64

  
65 65
\begin{document}
66 66

  
67 67

  
68 68
\begin{letter}{
69
	<%name%>\strut\\
70
	<%if department_1%><%department_1%>\\<%end if%>%
71
	<%if department_2%><%department_2%>\\<%end if%>%
69
    <%name%>\strut\\
70
    <%if department_1%><%department_1%>\\<%end if%>%
71
    <%if department_2%><%department_2%>\\<%end if%>%
72 72
    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\
73
	<%street%>\strut\\
74
	<%zipcode%> <%city%>\strut\\
75
	<%country%> \strut
76
}
77

  
78

  
79
\opening{}
80
\thispagestyle{kivitendo.letter.first}
81

  
82
\begin{PricingTabular*}[columns={pos,amount,desc}]
83
% eigentliche Tabelle
84
\FakeTable{
85
<%foreach number%>%
86
	<%runningnumber%> &
87
	<%qty%> <%unit%> &
88
	\textbf{<%description%>}
89
		<%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
90
		<%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
91
		<%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
92
		<%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
93
		<%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
94
		<%foreach si_number%>%
95
			\ExtraDescription{<%if si_chargenumber%>\charge: <%si_chargenumber%>
73
    <%street%>\strut\\
74
    <%zipcode%> <%city%>\strut\\
75
    <%country%> \strut
76
  }
77

  
78

  
79
  \opening{}
80
  \thispagestyle{kivitendo.letter.first}
81

  
82
  \begin{PricingTabular*}[columns={pos,amount,desc}]
83
    % eigentliche Tabelle
84
    \FakeTable{
85
    <%foreach number%>%
86
      <%runningnumber%> &
87
      <%qty%> <%unit%> &
88
      \textbf{<%description%>}
89
      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
90
      <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
91
      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
92
      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
93
      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
94
      <%foreach si_number%>%
95
      \ExtraDescription{<%if si_chargenumber%>\charge: <%si_chargenumber%>
96 96
        <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end si_bestbefore%>~--~<%si_qty%>~<%si_unit%>
97 97
        <%end si_chargenumber%>%%
98 98
      }%
99
		<%end si_number%>%
100
	\tabularnewline
101
<%end number%>%
102
}
103
\end{PricingTabular*}
104

  
105
\medskip
106

  
107
<%if notes%>%
108
<%notes%>%
109
\medskip
110
<%end if%>%
111

  
112
<%if delivery_term%>%
113
  \lieferung ~<%delivery_term.description_long%>\\
114
<%end delivery_term%>%
99
      <%end si_number%>%
100
      \tabularnewline
101
    <%end number%>%
102
    }
103
  \end{PricingTabular*}
104

  
105
  \medskip
106

  
107
  <%if notes%>%
108
    <%notes%>%
109
    \medskip
110
  <%end notes%>%
111

  
112
  <%if delivery_term%>%
113
    \lieferung ~<%delivery_term.description_long%>\\
114
  <%end delivery_term%>%
115 115

  
116 116
\end{letter}
117 117

  
... Dieser Diff wurde abgeschnitten, weil er die maximale Anzahl anzuzeigender Zeilen überschreitet.

Auch abrufbar als: Unified diff