[freeside-commits] freeside/FS/FS Conf.pm, 1.180.2.19, 1.180.2.20 cust_main.pm, 1.271.2.38, 1.271.2.39

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv27647/FS/FS

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	Conf.pm cust_main.pm 
Log Message:
add option to enable searching of cust_main.agent_custid with one or two letter prefix before the numeric part

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.180.2.19
retrieving revision 1.180.2.20
diff -u -d -r1.180.2.19 -r1.180.2.20
--- Conf.pm	17 Dec 2007 00:59:32 -0000	1.180.2.19
+++ Conf.pm	11 Jan 2008 22:54:09 -0000	1.180.2.20
@@ -2226,6 +2226,17 @@
 			 },
   },
 
+  {
+    'key'         => 'cust_main-agent_custid-format',
+    'section'     => '',
+    'description' => 'Enables searching of various formatted values in cust_main.agent_custid',
+    'type'        => 'select',
+    'select_hash' => [
+                       ''      => 'Numeric only',
+                       'ww?d+' => 'Numeric with one or two letter prefix',
+                     ],
+  },
+
 );
 
 1;

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.271.2.38
retrieving revision 1.271.2.39
diff -u -d -r1.271.2.38 -r1.271.2.39
--- cust_main.pm	8 Jan 2008 11:28:35 -0000	1.271.2.38
+++ cust_main.pm	11 Jan 2008 22:54:09 -0000	1.271.2.39
@@ -2013,8 +2013,7 @@
       # only for figuring next bill date, nothing else, so, reset $sdate again
       # here
       $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
-      $cust_pkg->last_bill($sdate)
-        if $cust_pkg->dbdef_table->column('last_bill');
+      $cust_pkg->last_bill($sdate);
 
       if ( $part_pkg->freq =~ /^\d+$/ ) {
         $mon += $part_pkg->freq;