Die Variablen "texnumber" (früher "steuernummer"), "co_ustid" und "duns" aus der...

diff --git a/SL/Form.pm b/SL/Form.pm
index a2e55b0cec92e2701aebf5e74b287174409c3a34..d0cf6e8b1da1ea84b5db1b49cb5d3eea2e7a7e62 100644 (file)
--- 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->{$_}; }
   $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));
 
   map({ $self->{"employee_${_}"} =~ s/\\n/\n/g; }
       qw(company address signature));
 

diff --git a/SL/User.pm b/SL/User.pm
index 88deb0b1f1ff8857f4685dd38d05ea0fb2f558a2..0b42a35a9ae48f487afd7ba2fd6c1d025bb83a34 100644 (file)
--- 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
     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();
 
 
   $main::lxdebug->leave_sub();
 

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 76513b0e14d8606480a8090476c4f1b49e2643f1..20bb28071087d620167e6c20734d6140538f53b3 100644 (file)
--- 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>
          <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>
        </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 5af041bc80135ceaaf3205282db83582695f4526..0de6a50b41ab7fbb4554f466a85d8365c46a43f4 100644 (file)
--- 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>
     <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>
    <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>
     <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>
    <tr>
     <td><code>employee_tel</code></td>
     <td>Telefonnummer</td>