From 6dc16826718038718653bb07b130299fe2366e45 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 2 Jan 2007 15:47:53 +0000
Subject: [PATCH] =?utf8?q?Die=20Variablen=20"texnumber"=20(fr=C3=BCher=20"?=
 =?utf8?q?steuernummer"),=20"co=5Fustid"=20und=20"duns"=20aus=20der=20Benu?=
 =?utf8?q?tzerkonfiguration=20in=20Vorlagen=20zur=20Verf=C3=BCgung=20stell?=
 =?utf8?q?en.=20Behebt=20die=20Bugzilla-IDs=20466=20und=20468.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/Form.pm                                |  3 ++-
 SL/User.pm                                |  2 +-
 bin/mozilla/admin.pl                      |  4 ++--
 doc/dokumentenvorlagen-und-variablen.html | 12 ++++++++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/SL/Form.pm b/SL/Form.pm
index a2e55b0ce..d0cf6e8b1 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -773,7 +773,8 @@ sub parse_template {
   $self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
 
   map({ $self->{"employee_${_}"} = $myconfig->{$_}; }
-      qw(email tel fax name signature company address businessnumber));
+      qw(email tel fax name signature company address businessnumber
+         co_ustid taxnumber duns));
   map({ $self->{"employee_${_}"} =~ s/\\n/\n/g; }
       qw(company address signature));
 
diff --git a/SL/User.pm b/SL/User.pm
index 88deb0b1f..0b42a35a9 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -1071,7 +1071,7 @@ sub config_vars {
     currency dateformat dbconnect dbdriver dbhost dbport dboptions
     dbname dbuser dbpasswd email fax name numberformat in_numberformat password
     printer role sid signature stylesheet tel templates vclimit angebote bestellungen rechnungen
-    anfragen lieferantenbestellungen einkaufsrechnungen steuernummer co_ustid duns menustyle);
+    anfragen lieferantenbestellungen einkaufsrechnungen taxnumber co_ustid duns menustyle);
 
   $main::lxdebug->leave_sub();
 
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 76513b0e1..20bb28071 100644
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -539,8 +539,8 @@ sub form_header {
 	  <td><textarea name=address rows=4 cols=35>$myconfig->{address}</textarea></td>
 	</tr>
         <tr valign=top>
-	  <th align=right>| . $locale->text('Steuernummer') . qq|</th>
-	  <td><input name=steuernummer size=14 value="$myconfig->{steuernummer}"></td>
+	  <th align=right>| . $locale->text('Tax number') . qq|</th>
+	  <td><input name=taxnumber size=14 value="$myconfig->{taxnumber}"></td>
 	</tr>
         <tr valign=top>
 	  <th align=right>| . $locale->text('Ust-IDNr') . qq|</th>
diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html
index 5af041bc8..0de6a50b4 100644
--- a/doc/dokumentenvorlagen-und-variablen.html
+++ b/doc/dokumentenvorlagen-und-variablen.html
@@ -396,6 +396,14 @@ td {
     <td><code>employee_company</code></td>
     <td>Firmenname</td>
    </tr>
+   <tr>
+    <td><code>employee_co_ustid</code></td>
+    <td>Usatzsteuer-Identifikationsnummer</td>
+   </tr>
+   <tr>
+    <td><code>employee_duns</code></td>
+    <td>DUNS-Nummer</td>
+   </tr>
    <tr>
     <td><code>employee_email</code></td>
     <td>Email</td>
@@ -412,6 +420,10 @@ td {
     <td><code>employee_signature</code></td>
     <td>Signatur</td>
    </tr>
+   <tr>
+    <td><code>employee_taxnumber</code></td>
+    <td>Steuernummer</td>
+   </tr>
    <tr>
     <td><code>employee_tel</code></td>
     <td>Telefonnummer</td>
-- 
2.20.1