From: Stephan Köhler <s.koehler@linet-services.de>
Date: Sat, 7 Jan 2006 14:03:16 +0000 (+0000)
Subject: Merge von 739 aus unstable: Bugfix 166
X-Git-Tag: release-2.2.0~48
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b0cf0374ae17601dec9eacae7588e67976039351;p=kivitendo-erp.git

Merge von 739 aus unstable: Bugfix 166
Solved Bug 166
---

diff --git a/SL/User.pm b/SL/User.pm
index bf649c8cd..f1ba06a0c 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -841,7 +841,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 ustid duns menustyle);
+    anfragen lieferantenbestellungen einkaufsrechnungen steuernummer co_ustid duns menustyle);
 
   $main::lxdebug->leave_sub();
 
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 0829934c2..e55c99984 100644
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -539,7 +539,7 @@ sub form_header {
 	</tr>
         <tr valign=top>
 	  <th align=right>| . $locale->text('Ust-IDNr') . qq|</th>
-	  <td><input name=ustid size=14 value="$myconfig->{ustid}"></td>
+	  <td><input name=co_ustid size=14 value="$myconfig->{co_ustid}"></td>
 	</tr>
         <tr valign=top>
 	  <th align=right>| . $locale->text('DUNS-Nr') . qq|</th>