Merge von 568 aus unstable.

diff --git a/templates/German-bin_list.tex b/templates/German-bin_list.tex
index 1960cef..e8588dc 100644 (file)
--- a/templates/German-bin_list.tex
+++ b/templates/German-bin_list.tex
@@ -11,7 +11,7 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}

-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{17cm}

 \setlength{\textheight}{24.7cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \setlength{\textheight}{24.7cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}

diff --git a/templates/German-check.tex b/templates/German-check.tex
index ce3b56f..38069dc 100644 (file)
--- a/templates/German-check.tex
+++ b/templates/German-check.tex
@@ -10,7 +10,7 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}

-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{17cm}

 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}

diff --git a/templates/German-invoice.tex b/templates/German-invoice.tex
index 7f541c9..bd27f77 100644 (file)
--- a/templates/German-invoice.tex
+++ b/templates/German-invoice.tex
@@ -10,14 +10,14 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}

-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{17cm}

 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 
 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 

-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\newlength{\descrwidth}\setlength{\descrwidth}{9cm}

 
 \newsavebox{\hdr}
 \sbox{\hdr}{
 
 \newsavebox{\hdr}
 \sbox{\hdr}{

diff --git a/templates/German-packing_list.tex b/templates/German-packing_list.tex
index a2514aa..4bc3424 100644 (file)
--- a/templates/German-packing_list.tex
+++ b/templates/German-packing_list.tex
@@ -10,14 +10,14 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}

-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{17cm}

 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 
 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 

-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\newlength{\descrwidth}\setlength{\descrwidth}{9cm}

 
 \newsavebox{\hdr}
 \sbox{\hdr}{
 
 \newsavebox{\hdr}
 \sbox{\hdr}{

diff --git a/templates/German-pick_list.tex b/templates/German-pick_list.tex
index fbd147b..c92c1ea 100644 (file)
--- a/templates/German-pick_list.tex
+++ b/templates/German-pick_list.tex
@@ -11,7 +11,7 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}

-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{17cm}

 \setlength{\textheight}{24.7cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \setlength{\textheight}{24.7cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}


@@ -19,7 +19,7 @@
 
 \begin{document}
 
 
 \begin{document}
 

-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\newlength{\descrwidth}\setlength{\descrwidth}{9cm}

 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \pagestyle{myheadings}
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \pagestyle{myheadings}

diff --git a/templates/German-purchase_order.tex b/templates/German-purchase_order.tex
index e81e599..6b03539 100644 (file)
--- a/templates/German-purchase_order.tex
+++ b/templates/German-purchase_order.tex
@@ -10,14 +10,14 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}

-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{17cm}

 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 
 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 

-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\newlength{\descrwidth}\setlength{\descrwidth}{9cm}

 
 \newsavebox{\hdr}
 \sbox{\hdr}{
 
 \newsavebox{\hdr}
 \sbox{\hdr}{

diff --git a/templates/German-receipt.tex b/templates/German-receipt.tex
index ce3b56f..38069dc 100644 (file)
--- a/templates/German-receipt.tex
+++ b/templates/German-receipt.tex
@@ -10,7 +10,7 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}

-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{17cm}

 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}

diff --git a/templates/German-request_quotation.tex b/templates/German-request_quotation.tex
index 0a67f07..ef78290 100644 (file)
--- a/templates/German-request_quotation.tex
+++ b/templates/German-request_quotation.tex
@@ -2,6 +2,8 @@
 \usepackage[frame]{xy}
 \usepackage{tabularx}
 \usepackage{graphicx}
 \usepackage[frame]{xy}
 \usepackage{tabularx}
 \usepackage{graphicx}

+\usepackage{german}
+\usepackage[latin1]{inputenc}

 \setlength{\voffset}{0.5cm}
 \setlength{\hoffset}{-2.0cm}
 \setlength{\topmargin}{0cm}
 \setlength{\voffset}{0.5cm}
 \setlength{\hoffset}{-2.0cm}
 \setlength{\topmargin}{0cm}


@@ -10,14 +12,14 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}

-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{17cm}

 \setlength{\textheight}{24.7cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 
 \setlength{\textheight}{24.7cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 

-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\newlength{\descrwidth}\setlength{\descrwidth}{12cm}

 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \pagestyle{myheadings}
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \pagestyle{myheadings}


@@ -56,10 +58,8 @@
 
 \vspace*{-12pt}
 
 
 \vspace*{-12pt}
 

-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Menge} &
-    \textbf{Einheit} & \textbf{Preis} & \textbf{Gesamt} \\
-  & Übertrag <%lastpage%> & & & & <%sumcarriedforward%> \\
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rl}
+  \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Menge} & \\

 <%end pagebreak%>
 
 
 <%end pagebreak%>
 
 


@@ -137,7 +137,7 @@ Fax: <%shiptofax%>
 
 \vspace{1cm}
 
 
 \vspace{1cm}
 

-\begin{tabularx}{\textwidth}{*{5}{|X}|} \hline
+\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline

   \textbf{AnfrageNr. \#} & \textbf{Datum} & \textbf{Benötigt am} & \textbf{Kontakt} & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5ex]
   \hline
   <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
   \textbf{AnfrageNr. \#} & \textbf{Datum} & \textbf{Benötigt am} & \textbf{Kontakt} & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5ex]
   \hline
   <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\


@@ -150,9 +150,8 @@ Bitte nennen Sie uns f
 
 \vspace{1cm}
 
 
 \vspace{1cm}
 

-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rllrr@{}}
-  \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Menge} & &
-  \textbf{Lieferung} & \textbf{Stückpreis} & \textbf{Gesamtpreis} \\
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rl}
+  \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Menge} & \\

 <%foreach number%>
   <%number%> & <%description%> & <%qty%> & <%unit%> \\
 <%end number%>
 <%foreach number%>
   <%number%> & <%description%> & <%qty%> & <%unit%> \\
 <%end number%>

diff --git a/templates/German-sales_order.tex b/templates/German-sales_order.tex
index fe28c6c..17df2b2 100644 (file)
--- a/templates/German-sales_order.tex
+++ b/templates/German-sales_order.tex
@@ -10,14 +10,14 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}

-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{17cm}

 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 
 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 

-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\newlength{\descrwidth}\setlength{\descrwidth}{9cm}

 
 \newsavebox{\hdr}
 \sbox{\hdr}{
 
 \newsavebox{\hdr}
 \sbox{\hdr}{

diff --git a/templates/German-sales_quotation.tex b/templates/German-sales_quotation.tex
index 203b8d6..695ac49 100644 (file)
--- a/templates/German-sales_quotation.tex
+++ b/templates/German-sales_quotation.tex
@@ -19,6 +19,8 @@
 
 \newlength{\descrwidth}\setlength{\descrwidth}{8.75cm}
 
 
 \newlength{\descrwidth}\setlength{\descrwidth}{8.75cm}
 

+\fontfamily{cmss}\fontshape{n}\selectfont
+

 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{
     <%company%>
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{
     <%company%>


@@ -58,10 +60,6 @@
   & \"Ubertrag von Seite <%lastpage%> & & & <%sumcarriedforward%>\\
 <%end pagebreak%>
 
   & \"Ubertrag von Seite <%lastpage%> & & & <%sumcarriedforward%>\\
 <%end pagebreak%>
 

-\markright{%
-\fontfamily{cmss}\fontshape{n}\selectfont%
-}
-

 \pagestyle{myheadings}
 \thispagestyle{empty}
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 \pagestyle{myheadings}
 \thispagestyle{empty}
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont

diff --git a/templates/German-statement.tex b/templates/German-statement.tex
index defa037..80af31a 100644 (file)
--- a/templates/German-statement.tex
+++ b/templates/German-statement.tex
@@ -10,14 +10,14 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}

-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{17cm}

 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 
 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 

-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\newlength{\descrwidth}\setlength{\descrwidth}{9cm}

 
 \newsavebox{\hdr}
 \sbox{\hdr}{
 
 \newsavebox{\hdr}
 \sbox{\hdr}{