From 9b84ff0ecc5baf2439173d06b993df0813f1f1cf Mon Sep 17 00:00:00 2001 From: niepra01 <rolf.niepraschk@ptb.de> Date: Fri, 11 Nov 2016 08:56:57 +0100 Subject: [PATCH] Makro "yourref" --- erklaerung/ptb-declaration-de.clo | 2 +- erklaerung/ptb-declaration-en.clo | 2 +- erklaerung/ptb-declaration.cls | 2 ++ erklaerung/test-declaration-de.tex | 1 + erklaerung/test-declaration-en.tex | 1 + kalibrierschein/test-ks-KK-2015.tex | 10 ++++++++-- 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/erklaerung/ptb-declaration-de.clo b/erklaerung/ptb-declaration-de.clo index 81f8af9..750c835 100644 --- a/erklaerung/ptb-declaration-de.clo +++ b/erklaerung/ptb-declaration-de.clo @@ -21,7 +21,7 @@ oder per Fax an \vl@myfax{} oder E-Mail an \vl@myemail{} oder dem Gerät beilege \medskip \textbf{Bezug:}~\parbox[t]{10cm}{PTB-Reg.-Nr.:~\vl@myref~~vom~~\vl@mymail \\ - Unsere Auftragsnummer:} + Unsere Auftragsnummer:~\vl@yourref} \medskip Wir versichern, dass die zur Kalibrierung eingereichten Vakuummessgeräte oder diff --git a/erklaerung/ptb-declaration-en.clo b/erklaerung/ptb-declaration-en.clo index 55534fa..e7df6de 100644 --- a/erklaerung/ptb-declaration-en.clo +++ b/erklaerung/ptb-declaration-en.clo @@ -23,7 +23,7 @@ \medskip \textbf{Subject:}~\parbox[t]{15cm}{Reg. No. (PTB):~\vl@myref,~Date of - confirmation:~\vl@mymail \\ Our order no. (if applicable):} + confirmation:~\vl@mymail \\ Our order no. (if applicable):~\vl@yourref} \medskip This is to certify that the vacuum gauges and/or test leaks (including their diff --git a/erklaerung/ptb-declaration.cls b/erklaerung/ptb-declaration.cls index 9a7f5d4..c95c55c 100644 --- a/erklaerung/ptb-declaration.cls +++ b/erklaerung/ptb-declaration.cls @@ -67,10 +67,12 @@ \newcommand*\mymail[1]{\vl@setcommand{vl@mymail}{#1}} \newcommand*\myfax[1]{\vl@setcommand{vl@myfax}{#1}} \newcommand*\myemail[1]{\vl@setcommand{vl@myemail}{#1}} +\newcommand*\yourref[1]{\vl@setcommand{vl@yourref}{#1}} \newcommand*\vl@myref{} \newcommand*\vl@mymail{} \newcommand*\vl@myfax{} \newcommand*\vl@myemail{} +\newcommand*\vl@yourref{} \newcolumntype{Y}{>{\centering\arraybackslash}X} \newcolumntype{C}[1]{>{\centering\arraybackslash}p{#1}} diff --git a/erklaerung/test-declaration-de.tex b/erklaerung/test-declaration-de.tex index 3c890e2..65f4a73 100644 --- a/erklaerung/test-declaration-de.tex +++ b/erklaerung/test-declaration-de.tex @@ -4,6 +4,7 @@ \mymail{2015-12-04} \myfax{+49-30-3481-7490} \myemail{karl.jousten@ptb.de} +\yourref{Wrdlbrmpft0815} \begin{document} \end{document} diff --git a/erklaerung/test-declaration-en.tex b/erklaerung/test-declaration-en.tex index da7c12a..3d6e270 100644 --- a/erklaerung/test-declaration-en.tex +++ b/erklaerung/test-declaration-en.tex @@ -4,6 +4,7 @@ \mymail{2015-12-04} \myfax{+49-30-3481-7490} \myemail{karl.jousten@ptb.de} +\yourref{Wrdlbrmpft0815} \begin{document} \end{document} diff --git a/kalibrierschein/test-ks-KK-2015.tex b/kalibrierschein/test-ks-KK-2015.tex index 7789bb9..899e1cf 100644 --- a/kalibrierschein/test-ks-KK-2015.tex +++ b/kalibrierschein/test-ks-KK-2015.tex @@ -26,8 +26,14 @@ mbar&mbar&mbar&mbar&&\\\toprule\endhead \object{ Stabil Ion Gauge } \manufacturer{ Granville-Phillips } \type{ EXT-Y, Stabil Ion Controler 370B } -\serialNo{ YEA06800, # & _ ^ 1449 } -\applicant{ { BOC EDWARDS } { Marshall Road } { EASTBOURNE, EAST SUSSEX } { BN22 9BA } } +\serialNo{ YEA06800, # & _ ^ 1449 } +\applicant{ + { Customer.Name } + { Customer.Address.Street } + { Customer.Address.Zipcode Customer.Address.Town } + { Customer.Address.District } +} + \refNo{ ? } \calibMark{ 75120 PTB 13 } \calibDate{ 2013-11-26 } -- GitLab