From 38087e58306d822c917a765f3d5790a4720ec673 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 4 Oct 2005 15:01:18 +0000 Subject: [PATCH] Merge von 568 aus unstable. --- templates/German-bin_list.tex | 2 +- templates/German-check.tex | 2 +- templates/German-invoice.tex | 4 ++-- templates/German-packing_list.tex | 4 ++-- templates/German-pick_list.tex | 4 ++-- templates/German-purchase_order.tex | 4 ++-- templates/German-receipt.tex | 2 +- templates/German-request_quotation.tex | 19 +++++++++---------- templates/German-sales_order.tex | 4 ++-- templates/German-sales_quotation.tex | 6 ++---- templates/German-statement.tex | 4 ++-- 11 files changed, 26 insertions(+), 29 deletions(-) diff --git a/templates/German-bin_list.tex b/templates/German-bin_list.tex index 1960cef03..e8588dc34 100644 --- 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{\textwidth}{19.2cm} +\setlength{\textwidth}{17cm} \setlength{\textheight}{24.7cm} \setlength{\footskip}{1cm} \setlength{\parindent}{0pt} diff --git a/templates/German-check.tex b/templates/German-check.tex index ce3b56fe2..38069dc5e 100644 --- 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{\textwidth}{19.2cm} +\setlength{\textwidth}{17cm} \setlength{\textheight}{24.5cm} \setlength{\footskip}{1cm} \setlength{\parindent}{0pt} diff --git a/templates/German-invoice.tex b/templates/German-invoice.tex index 7f541c9e7..bd27f77ac 100644 --- 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{\textwidth}{19.2cm} +\setlength{\textwidth}{17cm} \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}{ diff --git a/templates/German-packing_list.tex b/templates/German-packing_list.tex index a2514aa60..4bc3424ba 100644 --- 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{\textwidth}{19.2cm} +\setlength{\textwidth}{17cm} \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}{ diff --git a/templates/German-pick_list.tex b/templates/German-pick_list.tex index fbd147b06..c92c1ea17 100644 --- 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{\textwidth}{19.2cm} +\setlength{\textwidth}{17cm} \setlength{\textheight}{24.7cm} \setlength{\footskip}{1cm} \setlength{\parindent}{0pt} @@ -19,7 +19,7 @@ \begin{document} -\newlength{\descrwidth}\setlength{\descrwidth}{10cm} +\newlength{\descrwidth}\setlength{\descrwidth}{9cm} \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont \pagestyle{myheadings} diff --git a/templates/German-purchase_order.tex b/templates/German-purchase_order.tex index e81e599e2..6b0353923 100644 --- 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{\textwidth}{19.2cm} +\setlength{\textwidth}{17cm} \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}{ diff --git a/templates/German-receipt.tex b/templates/German-receipt.tex index ce3b56fe2..38069dc5e 100644 --- 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{\textwidth}{19.2cm} +\setlength{\textwidth}{17cm} \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 0a67f07ea..ef7829093 100644 --- a/templates/German-request_quotation.tex +++ b/templates/German-request_quotation.tex @@ -2,6 +2,8 @@ \usepackage[frame]{xy} \usepackage{tabularx} \usepackage{graphicx} +\usepackage{german} +\usepackage[latin1]{inputenc} \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{\textwidth}{19.2cm} +\setlength{\textwidth}{17cm} \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} @@ -56,10 +58,8 @@ \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%> @@ -137,7 +137,7 @@ Fax: <%shiptofax%> \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%> \\ @@ -150,9 +150,8 @@ Bitte nennen Sie uns f \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%> diff --git a/templates/German-sales_order.tex b/templates/German-sales_order.tex index fe28c6cc7..17df2b2dc 100644 --- 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{\textwidth}{19.2cm} +\setlength{\textwidth}{17cm} \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}{ diff --git a/templates/German-sales_quotation.tex b/templates/German-sales_quotation.tex index 203b8d6d4..695ac4930 100644 --- a/templates/German-sales_quotation.tex +++ b/templates/German-sales_quotation.tex @@ -19,6 +19,8 @@ \newlength{\descrwidth}\setlength{\descrwidth}{8.75cm} +\fontfamily{cmss}\fontshape{n}\selectfont + \parbox{\textwidth}{ \parbox[b]{.42\textwidth}{ <%company%> @@ -58,10 +60,6 @@ & \"Ubertrag von Seite <%lastpage%> & & & <%sumcarriedforward%>\\ <%end pagebreak%> -\markright{% -\fontfamily{cmss}\fontshape{n}\selectfont% -} - \pagestyle{myheadings} \thispagestyle{empty} \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont diff --git a/templates/German-statement.tex b/templates/German-statement.tex index defa0374c..80af31aa5 100644 --- 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{\textwidth}{19.2cm} +\setlength{\textwidth}{17cm} \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}{ -- 2.20.1