Merge von 739 aus unstable: Bugfix 166

Solved Bug 166

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

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 0829934c275ccd99eac0babf197c678e61de90f8..e55c999843027df1857508a494e4591980ef8cd1 100644 (file)
--- 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>
        </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>
        </tr>
         <tr valign=top>
          <th align=right>| . $locale->text('DUNS-Nr') . qq|</th>