[freeside-commits] freeside/FS/FS Schema.pm, 1.44.2.36, 1.44.2.37 cust_main.pm, 1.271.2.66, 1.271.2.67

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv27466

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	Schema.pm cust_main.pm 
Log Message:
add cust_main.archived field, skip billing if Y, RT#4412

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.44.2.36
retrieving revision 1.44.2.37
diff -u -d -r1.44.2.36 -r1.44.2.37
--- Schema.pm	17 Apr 2009 19:50:21 -0000	1.44.2.36
+++ Schema.pm	20 Apr 2009 16:58:07 -0000	1.44.2.37
@@ -551,16 +551,23 @@
         'referral_custnum', 'int',  'NULL', '', '', '', 
         'comments', 'text', 'NULL', '', '', '', 
         'spool_cdr','char', 'NULL', 1, '', '', 
+        'archived', 'char', 'NULL', 1, '', '',
       ],
       'primary_key' => 'custnum',
       'unique' => [ [ 'agentnum', 'agent_custid' ] ],
       #'index' => [ ['last'], ['company'] ],
-      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ],
-                   [ 'daytime' ], [ 'night' ], [ 'fax' ], [ 'refnum' ],
-                   [ 'county' ], [ 'state' ], [ 'country' ], [ 'zip' ],
-                   [ 'ship_last' ], [ 'ship_company' ],
+      'index' => [
+                   [ 'agentnum' ], [ 'refnum' ], [ 'custbatch' ],
+                   [ 'referral_custnum' ],
                    [ 'payby' ], [ 'paydate' ],
-                   [ 'agentnum' ], [ 'custbatch' ],
+                   [ 'archived' ],
+                   #billing
+                   ['last'], [ 'company' ],
+                   [ 'county' ], [ 'state' ], [ 'country' ],
+                   [ 'zip' ],
+                   [ 'daytime' ], [ 'night' ], [ 'fax' ],
+                   #shipping
+                   [ 'ship_last' ], [ 'ship_company' ],
                  ],
     },
 

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.271.2.66
retrieving revision 1.271.2.67
diff -u -d -r1.271.2.66 -r1.271.2.67
--- cust_main.pm	17 Apr 2009 12:08:49 -0000	1.271.2.66
+++ cust_main.pm	20 Apr 2009 16:58:08 -0000	1.271.2.67
@@ -1569,7 +1569,7 @@
     $self->payname($1);
   }
 
-  foreach my $flag (qw( tax spool_cdr )) {
+  foreach my $flag (qw( tax spool_cdr archived )) {
     $self->$flag() =~ /^(Y?)$/ or return "Illegal $flag: ". $self->$flag();
     $self->$flag($1);
   }