- update qsearch for Pg 7.3

- preliminary 1.5.0 upgrade docs
- syntax error in main customer view

3 files changed, 19 insertions, 7 deletions

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 31b6070a3..d783870cc 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -224,19 +224,27 @@ sub qsearch {
 
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
         if ( $op eq '=' ) {
-          if ( driver_name =~ /^Pg$/i ) {
-            qq-( $column IS NULL OR $column = '' )-;
+          if ( driver_name eq 'Pg' ) {
+            if ( $dbdef->table($table)->column($column)->type =~ /(int)/i ) {
+              qq-( $column IS NULL )-;
+            } else {
+              qq-( $column IS NULL OR $column = '' )-;
+            }
           } else {
             qq-( $column IS NULL OR $column = "" )-;
           }
         } elsif ( $op eq '!=' ) {
-          if ( driver_name =~ /^Pg$/i ) {
-            qq-( $column IS NOT NULL AND $column != '' )-;
+          if ( driver_name eq 'Pg' ) {
+            if ( $dbdef->table($table)->column($column)->type =~ /(int)/i ) {
+              qq-( $column IS NOT NULL )-;
+            } else {
+              qq-( $column IS NOT NULL AND $column != '' )-;
+            }
           } else {
             qq-( $column IS NOT NULL AND $column != "" )-;
           }
         } else {
-          if ( driver_name =~ /^Pg$/i ) {
+          if ( driver_name eq 'Pg' ) {
             qq-( $column $op '' )-;
           } else {
             qq-( $column $op "" )-;
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index eaa5b9b92..de25947f3 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -12,6 +12,7 @@
   <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
   <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
   <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
+  <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2?) to 1.5.0</a>
 <!--
   <li><a href="config.html">Configuration files</a>
 !-->
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 1d6243e23..01ad57373 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -365,8 +365,11 @@ if ( $conf->exists('hidecancelledpackages') ) {
 
 if ( @packages ) {
   #formatting
+
+  my $colspan = $packages[0]->dbdef_table->column('last_bill') ? 6 : 5;
+  
   print &table(), "\n",
-        qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
+        qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=$colspan>!,
         qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n<TR>!,
         qq!<TH><FONT SIZE=-1>Setup</FONT></TH>!;
 
@@ -375,7 +378,7 @@ if ( @packages ) {
 
   print qq!<TH><FONT SIZE=-1>Next bill</FONT></TH>!,
         qq!<TH><FONT SIZE=-1>Susp.</FONT></TH>!,
-        qq!<TH><FONT SIZE=-1>Expire!</FONT></TH>!,
+        qq!<TH><FONT SIZE=-1>Expire</FONT></TH>!,
         qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!,
         qq!</TR>\n!;
 }