allow NULL zip in some countries

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 1c5c3d2..c867a72 100755 (executable)
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -463,7 +463,7 @@ sub tables_hash_hack {
         'city',     'varchar', '',     $char_d,
         'county',   'varchar', 'NULL', $char_d,
         'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', '',     10,
+        'zip',      'varchar', 'NULL', 10,
         'country',  'char', '',     2,
         'daytime',  'varchar', 'NULL', 20,
         'night',    'varchar', 'NULL', 20,
@@ -597,7 +597,7 @@ sub tables_hash_hack {
         'address2', 'varchar', 'NULL', $char_d,
         'city',     'varchar', '',     $char_d,
         'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', '',     10,
+        'zip',      'varchar', 'NULL', 10,
         'country',  'char', '',     2,
 #        'trancode', 'int', '', '',
         'cardnum',  'varchar', '',     16,

diff --git a/README.1.5.0pre7 b/README.1.5.0pre7
index b521d5d..dda49a7 100644 (file)
--- a/README.1.5.0pre7
+++ b/README.1.5.0pre7
@@ -36,6 +36,9 @@ ALTER TABLE h_part_pkg ADD promo_code varchar(80) NULL;
 CREATE INDEX part_pkg2 ON part_pkg ( promo_code );
 CREATE INDEX h_part_pkg2 ON h_part_pkg ( promo_code );
 
+ALTER TABLE cust_main ALTER COLUMN zip DROP NOT NULL;
+ALTER TABLE h_cust_main ALTER COLUMN zip DROP NOT NULL;
+
 Installs w/integrated RT:
   CREATE SEQUENCE attributes_id_seq;
 

diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 9e6418b..d818685 100644 (file)
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -261,9 +261,12 @@ ALTER TABLE svc_forward ALTER COLUMN srcsvc DROP NOT NULL;
 ALTER TABLE h_svc_forward ALTER COLUMN srcsvc DROP NOT NULL;
 ALTER TABLE svc_forward ALTER COLUMN dstsvc DROP NOT NULL;
 ALTER TABLE h_svc_forward ALTER COLUMN dstsvc DROP NOT NULL;
+ALTER TABLE cust_main ALTER COLUMN zip DROP NOT NULL;
+ALTER TABLE h_cust_main ALTER COLUMN zip DROP NOT NULL;
 
 Or on Pg versions that don't support DROP NOT NULL (tested on 7.1 and 7.2 so far):
 UPDATE pg_attribute SET attnotnull = FALSE WHERE ( attname = 'srcsvc' OR attname = 'dstsvc' ) AND ( attrelid = ( SELECT oid FROM pg_class WHERE relname = 'svc_forward' ) OR attrelid = ( SELECT oid FROM pg_class WHERE relname = 'h_svc_forward' ) );
+UPDATE pg_attribute SET attnotnull = FALSE WHERE ( attname = 'zip' ) AND ( attrelid = ( SELECT oid FROM pg_class WHERE relname = 'cust_main' ) OR attrelid = ( SELECT oid FROM pg_class WHERE relname = 'h_cust_main' ) );
 
 If you created your database with a version before 1.4.2, dump database, edit:
 - cust_main and h_cust_main: increase otaker from 8 to 32