changes to track email addresses for email invoicing

2 files changed, 8 insertions, 7 deletions

diff --git a/htdocs/docs/trouble.html b/htdocs/docs/trouble.html
index 2c5b92fd5..dcbe1bbd2 100644
--- a/htdocs/docs/trouble.html
+++ b/htdocs/docs/trouble.html
@@ -5,7 +5,7 @@
   <h1>Troubleshooting</h1>
   <ul>
     <li>When troubleshooting the web interface, helpful information is often in your web server's error log.
-    <li>Internet Explorer will not work with Freeside's HTML interface. 
+    <li>Internet Explorer will not work with Freeside's HTML interface.  <b>This may be fixed in >1.2, please report your experiences!</b>
 <a HREF="http://www.netscape.com">Netscape</a>,                                 
 <a HREF="http://lynx.browser.org">Lynx</a>, and                                 
 <a HREF="http://www.cs.indiana.edu/elisp/w3/docs.html">Emacs/W3</a>,            
@@ -17,7 +17,7 @@ Ambiguous use of value => resolved to "value" =>
 at /usr/lib/perl5/site_perl/File/CounterFile.pm line 132.
 </pre>
         This clutters up your log files but is otherwise harmless.  Upgrade to the latest File::CounterFile. 
-    <li>If you get an Internal Server Error when adding or editing, but find that the update has occured, and you get something like the following in your web server's error log:
+    <li><b>(No longer applicable in >1.2!)</b> If you get an Internal Server Error when adding or editing, but find that the update has occured, and you get something like the following in your web server's error log:
 <pre>
 access to <i>/your/path</i>/edit/process/<i>some_table</i>.cgi failed for
 <i>machine.domain.tld</i>, reason: malformed header from script.
diff --git a/htdocs/docs/upgrade3.html b/htdocs/docs/upgrade3.html
index d2795bdb2..539fe5d82 100644
--- a/htdocs/docs/upgrade3.html
+++ b/htdocs/docs/upgrade3.html
@@ -14,18 +14,19 @@
   <li>Move /var/spool/freeside/export to /usr/local/etc/freeside/export.<i>datasrc</i>.
   <li>Apply the following changes to your database:
 <pre>
-ALTER TABLE cust_main ADD middle varchar(80) NULL;
+<!-- ALTER TABLE cust_main ADD middle varchar(80) NULL;
 ALTER TABLE cust_main ADD titlenum int NULL;
-ALTER TABLE cust_main CHANGE state state varchar(80) NULL;
+-->ALTER TABLE cust_main CHANGE state state varchar(80) NULL;
 ALTER TABLE cust_main_county CHANGE state state varchar(80) NULL;
 ALTER TABLE cust_main_county ADD country char(2);
-UPDATE cust_main_county SET country = "US" where country IS NULL;
-CREATE TABLE part_title (
+UPDATE cust_main SET country = "US" where country IS NULL OR country = '';
+UPDATE cust_main_county SET country = "US" where country IS NULL OR country = "";
+<!--CREATE TABLE part_title (
    titlenum int NOT NULL,
    title varchar(80) NOT NULL,
    PRIMARY KEY (titlenum)
 );
-CREATE TABLE cust_main_invoice (
+-->CREATE TABLE cust_main_invoice (
    destnum int NOT NULL,
    custnum int NOT NULL,
    dest varchar(80) NOT NULL,