From cbbd0225b07269209c674733bcf70f1c1308e84a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Jan 2006 12:34:29 +0000
Subject: change texas-style tax exemptions to be against a specific line item
 rather than just general per-customer, for later tracking and tax reporting. 
 fix 1969/1970 exemptions for one-off charges

---
 FS/FS/Record.pm              |   5 +
 FS/FS/Schema.pm              |  18 ++++
 FS/FS/cust_bill.pm           |  22 +++-
 FS/FS/cust_main.pm           | 234 ++++++++++++++++++++++++-------------------
 FS/FS/cust_tax_exempt.pm     |  21 +++-
 FS/FS/cust_tax_exempt_pkg.pm | 135 +++++++++++++++++++++++++
 FS/FS/h_cust_bill.pm         |  33 ++++++
 FS/FS/h_cust_tax_exempt.pm   |  40 ++++++++
 FS/MANIFEST                  |   6 ++
 FS/t/cust_tax_exempt_pkg.t   |   5 +
 FS/t/h_cust_bill.t           |   5 +
 FS/t/h_cust_tax_exempt.t     |   5 +
 README.2.0.0                 |  17 ++++
 13 files changed, 435 insertions(+), 111 deletions(-)
 create mode 100644 FS/FS/cust_tax_exempt_pkg.pm
 create mode 100644 FS/FS/h_cust_bill.pm
 create mode 100644 FS/FS/h_cust_tax_exempt.pm
 create mode 100644 FS/t/cust_tax_exempt_pkg.t
 create mode 100644 FS/t/h_cust_bill.t
 create mode 100644 FS/t/h_cust_tax_exempt.t
 create mode 100644 README.2.0.0

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 887c8dcd4..19da3d181 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -977,6 +977,11 @@ sub replace {
 
   warn "[debug]$me $new ->replace $old\n" if $DEBUG;
 
+  if ( $new->can('replace_check') ) {
+    my $error = $new->replace_check($old);
+    return $error if $error;
+  }
+
   return "Records not in same table!" unless $new->table eq $old->table;
 
   my $primary_key = $old->dbdef_table->primary_key;
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 451ef2d2e..d502a12be 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -976,6 +976,24 @@ sub tables_hashref {
       'index'       => [],
     },
 
+    'cust_tax_exempt_pkg' => {
+      'columns' => [
+        'exemptpkgnum',  'serial', '', '',
+        #'custnum',      'int', '', '',
+        'billpkgnum',   'int', '', '',
+        'taxnum',       'int', '', '',
+        'year',         'int', '', '',
+        'month',        'int', '', '',
+        'amount',       @money_type,
+      ],
+      'primary_key' => 'exemptpkgnum',
+      'unique' => [],
+      'index'  => [ [ 'taxnum', 'year', 'month' ],
+                    [ 'billpkgnum' ],
+                    [ 'taxnum' ]
+                  ],
+    },
+
     'router' => {
       'columns' => [
         'routernum', 'serial', '', '',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 6e3b2b2f8..159c9e405 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -121,8 +121,14 @@ returns the error, otherwise returns false.
 
 =item delete
 
-Currently unimplemented.  I don't remove invoices because there would then be
-no record you ever posted this invoice (which is bad, no?)
+This method now works but you probably shouldn't use it.  Instead, apply a
+credit against the invoice.
+
+Using this method to delete invoices outright is really, really bad.  There
+would be no record you ever posted this invoice, and there are no check to
+make sure charged = 0 or that there are no associated cust_bill_pkg records.
+
+Really, don't use it.
 
 =cut
 
@@ -142,14 +148,20 @@ collect method of a customer object (see L<FS::cust_main>).
 
 =cut
 
-sub replace {
+#replace can be inherited from Record.pm
+
+# replace_check is now the preferred way to #implement replace data checks
+# (so $object->replace() works without an argument)
+
+sub replace_check {
   my( $new, $old ) = ( shift, shift );
   return "Can't change custnum!" unless $old->custnum == $new->custnum;
   #return "Can't change _date!" unless $old->_date eq $new->_date;
   return "Can't change _date!" unless $old->_date == $new->_date;
-  return "Can't change charged!" unless $old->charged == $new->charged;
+  return "Can't change charged!" unless $old->charged == $new->charged
+                                     || $old->charged == 0;
 
-  $new->SUPER::replace($old);
+  '';
 }
 
 =item check
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a265e4177..b5ccf5a3f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -43,6 +43,7 @@ use FS::part_pkg;
 use FS::part_bill_event;
 use FS::cust_bill_event;
 use FS::cust_tax_exempt;
+use FS::cust_tax_exempt_pkg;
 use FS::type_pkgs;
 use FS::payment_gateway;
 use FS::agent_payment_gateway;
@@ -1617,16 +1618,28 @@ sub bill {
 
   $self->select_for_update; #mutex
 
+  #create a new invoice
+  #(we'll remove it later if it doesn't actually need to be generated [contains
+  # no line items] and we're inside a transaciton so nothing else will see it)
+  my $cust_bill = new FS::cust_bill ( {
+    'custnum' => $self->custnum,
+    '_date'   => $time,
+    #'charged' => $charged,
+    'charged' => 0,
+  } );
+  $error = $cust_bill->insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "can't create invoice for customer #". $self->custnum. ": $error";
+  }
+  my $invnum = $cust_bill->invnum;
+
+  ###
   # find the packages which are due for billing, find out how much they are
   # & generate invoice database.
- 
-  my( $total_setup, $total_recur ) = ( 0, 0 );
-  #my( $taxable_setup, $taxable_recur ) = ( 0, 0 );
-  my @cust_bill_pkg = ();
-  #my $tax = 0;##
-  #my $taxable_charged = 0;##
-  #my $charged = 0;##
+  ###
 
+  my( $total_setup, $total_recur ) = ( 0, 0 );
   my %tax;
 
   foreach my $cust_pkg (
@@ -1649,7 +1662,10 @@ sub bill {
 
     my @details = ();
 
+    ###
     # bill setup
+    ###
+
     my $setup = 0;
     if ( !$cust_pkg->setup || $options{'resetup'} ) {
     
@@ -1664,7 +1680,10 @@ sub bill {
       $cust_pkg->setfield('setup', $time) unless $cust_pkg->setup;
     }
 
-    #bill recurring fee
+    ###
+    # bill recurring fee
+    ### 
+
     my $recur = 0;
     my $sdate;
     if ( $part_pkg->getfield('freq') ne '0' &&
@@ -1719,6 +1738,10 @@ sub bill {
     warn "\$recur is undefined" unless defined($recur);
     warn "\$cust_pkg->bill is undefined" unless defined($cust_pkg->bill);
 
+    ###
+    # If $cust_pkg has been modified, update it and create cust_bill_pkg records
+    ###
+
     if ( $cust_pkg->modified ) {
 
       warn "  package ". $cust_pkg->pkgnum. " modified; updating\n"
@@ -1740,10 +1763,13 @@ sub bill {
         $dbh->rollback if $oldAutoCommit;
         return "negative recur $recur for pkgnum ". $cust_pkg->pkgnum;
       }
+
       if ( $setup != 0 || $recur != 0 ) {
-        warn "    charges (setup=$setup, recur=$recur); queueing line items\n"
+
+        warn "    charges (setup=$setup, recur=$recur); adding line items\n"
           if $DEBUG > 1;
         my $cust_bill_pkg = new FS::cust_bill_pkg ({
+          'invnum'  => $invnum,
           'pkgnum'  => $cust_pkg->pkgnum,
           'setup'   => $setup,
           'recur'   => $recur,
@@ -1751,10 +1777,18 @@ sub bill {
           'edate'   => $cust_pkg->bill,
           'details' => \@details,
         });
-        push @cust_bill_pkg, $cust_bill_pkg;
+        $error = $cust_bill_pkg->insert;
+        if ( $error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return "can't create invoice line item for invoice #$invnum: $error";
+        }
         $total_setup += $setup;
         $total_recur += $recur;
 
+        ###
+        # handle taxes
+        ###
+
         unless ( $self->tax =~ /Y/i || $self->payby eq 'COMP' ) {
 
           my @taxes = qsearch( 'cust_main_county', {
@@ -1803,7 +1837,8 @@ sub bill {
             next unless $taxable_charged;
 
             if ( $tax->exempt_amount && $tax->exempt_amount > 0 ) {
-              my ($mon,$year) = (localtime($sdate) )[4,5];
+              #my ($mon,$year) = (localtime($sdate) )[4,5];
+              my ($mon,$year) = (localtime( $sdate || $cust_bill->_date ) )[4,5];
               $mon++;
               my $freq = $part_pkg->freq || 1;
               if ( $freq !~ /(\d+)$/ ) {
@@ -1811,40 +1846,74 @@ sub bill {
                 return "daily/weekly package definitions not (yet?)".
                        " compatible with monthly tax exemptions";
               }
-              my $taxable_per_month = sprintf("%.2f", $taxable_charged / $freq );
+              my $taxable_per_month =
+                sprintf("%.2f", $taxable_charged / $freq );
+
+              #call the whole thing off if this customer has any old
+              #exemption records...
+              my @cust_tax_exempt =
+                qsearch( 'cust_tax_exempt' => { custnum=> $self->custnum } );
+              if ( @cust_tax_exempt ) {
+                $dbh->rollback if $oldAutoCommit;
+                return
+                  'this customer still has old-style tax exemption records; '.
+                  'run bin/fs-migrate-cust_tax_exempt?';
+              }
+
               foreach my $which_month ( 1 .. $freq ) {
-                my %hash = (
-                  'custnum' => $self->custnum,
-                  'taxnum'  => $tax->taxnum,
-                  'year'    => 1900+$year,
-                  'month'   => $mon++,
-                );
-                #until ( $mon < 12 ) { $mon -= 12; $year++; }
-                until ( $mon < 13 ) { $mon -= 12; $year++; }
-                my $cust_tax_exempt =
-                  qsearchs('cust_tax_exempt', \%hash)
-                  || new FS::cust_tax_exempt( { %hash, 'amount' => 0 } );
-                my $remaining_exemption = sprintf("%.2f",
-                  $tax->exempt_amount - $cust_tax_exempt->amount );
+
+                #maintain the new exemption table now
+                my $sql = "
+                  SELECT SUM(amount)
+                    FROM cust_tax_exempt_pkg
+                      LEFT JOIN cust_bill_pkg USING ( billpkgnum )
+                      LEFT JOIN cust_bill     USING ( invnum     )
+                    WHERE custnum = ?
+                      AND taxnum  = ?
+                      AND year    = ?
+                      AND month   = ?
+                ";
+                my $sth = dbh->prepare($sql) or do {
+                  $dbh->rollback if $oldAutoCommit;
+                  return "fatal: can't lookup exising exemption: ". dbh->errstr;
+                };
+                $sth->execute(
+                  $self->custnum,
+                  $tax->taxnum,
+                  1900+$year,
+                  $mon,
+                ) or do {
+                  $dbh->rollback if $oldAutoCommit;
+                  return "fatal: can't lookup exising exemption: ". dbh->errstr;
+                };
+                my $existing_exemption = $sth->fetchrow_arrayref->[0];
+                
+                my $remaining_exemption =
+                  $tax->exempt_amount - $existing_exemption;
                 if ( $remaining_exemption > 0 ) {
                   my $addl = $remaining_exemption > $taxable_per_month
                     ? $taxable_per_month
                     : $remaining_exemption;
                   $taxable_charged -= $addl;
-                  my $new_cust_tax_exempt = new FS::cust_tax_exempt ( {
-                    $cust_tax_exempt->hash,
-                    'amount' =>
-                      sprintf("%.2f", $cust_tax_exempt->amount + $addl),
+
+                  my $cust_tax_exempt_pkg = new FS::cust_tax_exempt_pkg ( {
+                    'billpkgnum' => $cust_bill_pkg->billpkgnum,
+                    'taxnum'     => $tax->taxnum,
+                    'year'       => 1900+$year,
+                    'month'      => $mon,
+                    'amount'     => sprintf("%.2f", $addl ),
                   } );
-                  $error = $new_cust_tax_exempt->exemptnum
-                    ? $new_cust_tax_exempt->replace($cust_tax_exempt)
-                    : $new_cust_tax_exempt->insert;
+                  $error = $cust_tax_exempt_pkg->insert;
                   if ( $error ) {
                     $dbh->rollback if $oldAutoCommit;
-                    return "fatal: can't update cust_tax_exempt: $error";
+                    return "fatal: can't insert cust_tax_exempt_pkg: $error";
                   }
-  
                 } # if $remaining_exemption > 0
+
+                #++
+                $mon++;
+                #until ( $mon < 12 ) { $mon -= 12; $year++; }
+                until ( $mon < 13 ) { $mon -= 12; $year++; }
   
               } #foreach $which_month
   
@@ -1866,86 +1935,41 @@ sub bill {
 
   } #foreach my $cust_pkg
 
-  my $charged = sprintf( "%.2f", $total_setup + $total_recur );
-#  my $taxable_charged = sprintf( "%.2f", $taxable_setup + $taxable_recur );
-
-  unless ( @cust_bill_pkg ) { #don't create invoices with no line items
+  unless ( $cust_bill->cust_bill_pkg ) {
+    $cust_bill->delete; #don't create an invoice w/o line items
     $dbh->commit or die $dbh->errstr if $oldAutoCommit;
     return '';
-  } 
-
-#  unless ( $self->tax =~ /Y/i
-#           || $self->payby eq 'COMP'
-#           || $taxable_charged == 0 ) {
-#    my $cust_main_county = qsearchs('cust_main_county',{
-#        'state'   => $self->state,
-#        'county'  => $self->county,
-#        'country' => $self->country,
-#    } ) or die "fatal: can't find tax rate for state/county/country ".
-#               $self->state. "/". $self->county. "/". $self->country. "\n";
-#    my $tax = sprintf( "%.2f",
-#      $taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
-#    );
-
-  if ( dbdef->table('cust_bill_pkg')->column('itemdesc') ) { #1.5 schema
-
-    foreach my $taxname ( grep { $tax{$_} > 0 } keys %tax ) {
-      my $tax = sprintf("%.2f", $tax{$taxname} );
-      $charged = sprintf( "%.2f", $charged+$tax );
-  
-      my $cust_bill_pkg = new FS::cust_bill_pkg ({
-        'pkgnum'   => 0,
-        'setup'    => $tax,
-        'recur'    => 0,
-        'sdate'    => '',
-        'edate'    => '',
-        'itemdesc' => $taxname,
-      });
-      push @cust_bill_pkg, $cust_bill_pkg;
-    }
-  
-  } else { #1.4 schema
-
-    my $tax = 0;
-    foreach ( values %tax ) { $tax += $_ };
-    $tax = sprintf("%.2f", $tax);
-    if ( $tax > 0 ) {
-      $charged = sprintf( "%.2f", $charged+$tax );
-
-      my $cust_bill_pkg = new FS::cust_bill_pkg ({
-        'pkgnum' => 0,
-        'setup'  => $tax,
-        'recur'  => 0,
-        'sdate'  => '',
-        'edate'  => '',
-      });
-      push @cust_bill_pkg, $cust_bill_pkg;
-    }
-
   }
 
-  my $cust_bill = new FS::cust_bill ( {
-    'custnum' => $self->custnum,
-    '_date'   => $time,
-    'charged' => $charged,
-  } );
-  $error = $cust_bill->insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "can't create invoice for customer #". $self->custnum. ": $error";
-  }
+  my $charged = sprintf( "%.2f", $total_setup + $total_recur );
 
-  my $invnum = $cust_bill->invnum;
-  my $cust_bill_pkg;
-  foreach $cust_bill_pkg ( @cust_bill_pkg ) {
-    #warn $invnum;
-    $cust_bill_pkg->invnum($invnum);
+  foreach my $taxname ( grep { $tax{$_} > 0 } keys %tax ) {
+    my $tax = sprintf("%.2f", $tax{$taxname} );
+    $charged = sprintf( "%.2f", $charged+$tax );
+  
+    my $cust_bill_pkg = new FS::cust_bill_pkg ({
+      'invnum'   => $invnum,
+      'pkgnum'   => 0,
+      'setup'    => $tax,
+      'recur'    => 0,
+      'sdate'    => '',
+      'edate'    => '',
+      'itemdesc' => $taxname,
+    });
     $error = $cust_bill_pkg->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return "can't create invoice line item for customer #". $self->custnum.
-             ": $error";
+      return "can't create invoice line item for invoice #$invnum: $error";
     }
+    $total_setup += $tax;
+
+  }
+
+  $cust_bill->charged( sprintf( "%.2f", $total_setup + $total_recur ) );
+  $error = $cust_bill->replace;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "can't update charged for invoice #$invnum: $error";
   }
   
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
diff --git a/FS/FS/cust_tax_exempt.pm b/FS/FS/cust_tax_exempt.pm
index da0de000a..3e398877a 100644
--- a/FS/FS/cust_tax_exempt.pm
+++ b/FS/FS/cust_tax_exempt.pm
@@ -3,6 +3,8 @@ package FS::cust_tax_exempt;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs );
+use FS::cust_main;
+use FS::cust_main_county;
 
 @ISA = qw(FS::Record);
 
@@ -27,7 +29,7 @@ FS::cust_tax_exempt - Object methods for cust_tax_exempt records
 
 =head1 DESCRIPTION
 
-An FS::cust_tax_exempt object represents a historical record of a customer tax
+An FS::cust_tax_exempt object represents a record of an old-style customer tax
 exemption.  Currently this is only used for "texas tax".  FS::cust_tax_exempt
 inherits from FS::Record.  The following fields are currently supported:
 
@@ -47,6 +49,12 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =back
 
+=head1 NOTE
+
+Old-style customer tax exemptions are only useful for legacy migrations - if
+you are looking for current customer tax exemption data see
+L<FS::cust_tax_exempt_pkg>.
+
 =head1 METHODS
 
 =over 4
@@ -115,6 +123,17 @@ sub check {
   ;
 }
 
+=item cust_main_county
+
+Returns the FS::cust_main_county object associated with this tax exemption.
+
+=cut
+
+sub cust_main_county {
+  my $self = shift;
+  qsearchs( 'cust_main_county', { 'taxnum' => $self->taxnum } );
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/cust_tax_exempt_pkg.pm b/FS/FS/cust_tax_exempt_pkg.pm
new file mode 100644
index 000000000..7193ace74
--- /dev/null
+++ b/FS/FS/cust_tax_exempt_pkg.pm
@@ -0,0 +1,135 @@
+package FS::cust_tax_exempt_pkg;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_bill_pkg;
+use FS::cust_main_county;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::cust_tax_exempt_pkg - Object methods for cust_tax_exempt_pkg records
+
+=head1 SYNOPSIS
+
+  use FS::cust_tax_exempt_pkg;
+
+  $record = new FS::cust_tax_exempt_pkg \%hash;
+  $record = new FS::cust_tax_exempt_pkg { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_tax_exempt_pkg object represents a record of a customer tax
+exemption.  Currently this is only used for "texas tax".  FS::cust_tax_exempt
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item exemptpkgnum - primary key
+
+=item billpkgnum - invoice line item (see L<FS::cust_bill_pkg>)
+
+=item taxnum - tax rate (see L<FS::cust_main_county>)
+
+=item year
+
+=item month
+
+=item amount
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new exemption record.  To add the example to the database, see
+L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cust_tax_exempt_pkg'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('exemptnum')
+#    || $self->ut_foreign_key('custnum', 'cust_main', 'custnum')
+    || $self->ut_foreign_key('billpkgnum', 'cust_bill_pkg', 'billpkgnum')
+    || $self->ut_foreign_key('taxnum', 'cust_main_county', 'taxnum')
+    || $self->ut_number('year') #check better
+    || $self->ut_number('month') #check better
+    || $self->ut_money('amount')
+    || $self->SUPER::check
+  ;
+}
+
+=back
+
+=head1 BUGS
+
+Texas tax is still a royal pain in the ass.
+
+=head1 SEE ALSO
+
+L<FS::cust_main_county>, L<FS::cust_bill_pkg>, L<FS::Record>, schema.html from
+the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/h_cust_bill.pm b/FS/FS/h_cust_bill.pm
new file mode 100644
index 000000000..7a3d81146
--- /dev/null
+++ b/FS/FS/h_cust_bill.pm
@@ -0,0 +1,33 @@
+package FS::h_cust_bill;
+
+use strict;
+use vars qw( @ISA );
+use FS::h_Common;
+use FS::cust_bill;
+
+@ISA = qw( FS::h_Common FS::cust_bill );
+
+sub table { 'h_cust_bill' };
+
+=head1 NAME
+
+FS::h_cust_bill - Historical record of customer tax changes (old-style)
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+An FS::h_cust_bill object represents historical changes to invoices.
+FS::h_cust_bill inherits from FS::h_Common and FS::cust_bill.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::cust_bill>,  L<FS::h_Common>, L<FS::Record>, schema.html from the base
+documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/h_cust_tax_exempt.pm b/FS/FS/h_cust_tax_exempt.pm
new file mode 100644
index 000000000..9d2318bd5
--- /dev/null
+++ b/FS/FS/h_cust_tax_exempt.pm
@@ -0,0 +1,40 @@
+package FS::h_cust_tax_exempt;
+
+use strict;
+use vars qw( @ISA );
+use FS::h_Common;
+use FS::cust_tax_exempt;
+
+@ISA = qw( FS::h_Common FS::cust_tax_exempt );
+
+sub table { 'h_cust_tax_exempt' };
+
+=head1 NAME
+
+FS::h_cust_tax_exempt - Historical record of customer tax changes (old-style)
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+An FS::h_cust_tax_exempt object represents historical changes to old-style
+customer tax exemptions.  FS::h_cust_tax_exempt inherits from FS::h_Common and
+FS::cust_tax_exempt.
+
+=head1 NOTE
+
+Old-style customer tax exemptions are only useful for legacy migrations - if
+you are looking for current customer tax exemption data see
+L<FS::cust_tax_exempt_pkg>.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::cust_tax_exempt>, L<FS::cust_tax_exempt_pkg>, L<FS::h_Common>,
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index e7d9dea34..54ea52555 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -65,7 +65,9 @@ FS/cust_refund.pm
 FS/cust_credit_refund.pm
 FS/cust_svc.pm
 FS/h_Common.pm
+FS/h_cust_bill.pm
 FS/h_cust_svc.pm
+FS/h_cust_tax_exempt.pm
 FS/h_domain_record.pm
 FS/h_svc_acct.pm
 FS/h_svc_broadband.pm
@@ -152,6 +154,7 @@ FS/queue_arg.pm
 FS/queue_depend.pm
 FS/msgcat.pm
 FS/cust_tax_exempt.pm
+FS/cust_tax_exempt_pkg.pm
 FS/clientapi_session.pm
 FS/clientapi_session_field.pm
 t/agent.t
@@ -189,7 +192,9 @@ t/cust_pay_refund.t
 t/cust_pkg.t
 t/cust_refund.t
 t/cust_svc.t
+t/h_cust_bill.t
 t/h_cust_svc.t
+t/h_cust_tax_exempt.t
 t/h_Common.t
 t/h_cust_svc.t
 t/h_domain_record.t
@@ -200,6 +205,7 @@ t/h_svc_external.t
 t/h_svc_forward.t
 t/h_svc_www.t
 t/cust_tax_exempt.t
+t/cust_tax_exempt_pkg.t
 t/domain_record.t
 t/nas.t
 t/part_bill_event.t
diff --git a/FS/t/cust_tax_exempt_pkg.t b/FS/t/cust_tax_exempt_pkg.t
new file mode 100644
index 000000000..099a0ce8a
--- /dev/null
+++ b/FS/t/cust_tax_exempt_pkg.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_tax_exempt_pkg;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/h_cust_bill.t b/FS/t/h_cust_bill.t
new file mode 100644
index 000000000..ceccb2a3d
--- /dev/null
+++ b/FS/t/h_cust_bill.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::h_cust_bill;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/h_cust_tax_exempt.t b/FS/t/h_cust_tax_exempt.t
new file mode 100644
index 000000000..432238aa5
--- /dev/null
+++ b/FS/t/h_cust_tax_exempt.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::h_cust_tax_exempt;
+$loaded=1;
+print "ok 1\n";
diff --git a/README.2.0.0 b/README.2.0.0
new file mode 100644
index 000000000..3f5f1158f
--- /dev/null
+++ b/README.2.0.0
@@ -0,0 +1,17 @@
+
+make install-perl-modules
+run "freeside-upgrade username" to uprade your database schema
+
+(if freeside-upgrade hangs, try stopping Apache, all Freeside processes, and
+ anything else connected to your database, especially on older Pg versions)
+
+If you have any records in the cust_tax_exempt table, you *MUST* migrate them
+to the new cust_tax_exempt_pkg table.  An example script to get you started is
+in bin/fs-migrate-cust_tax_exempt - it may need to be customized for your
+specific data.
+
+------
+
+make install-docs
+ (or "make deploy" if you've got everything setup in the Makefile)
+
-- 
cgit v1.2.1


From b782294eb91805f708a7776fe67f1c0863f4096b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Jan 2006 15:27:10 +0000
Subject: whew, FINALLY can fix monthly exemption columns to work correctly. 
 also make them agent-specific.  also fix package exemption columns, they were
 bunk too, sheesh.  start adding package classes for package class tax
 reporting.

---
 FS/FS/Schema.pm                           |  11 ++
 FS/FS/cust_tax_exempt_pkg.pm              |   3 +-
 FS/FS/part_pkg.pm                         |   7 ++
 FS/FS/pkg_class.pm                        | 111 ++++++++++++++++++
 FS/MANIFEST                               |   2 +
 FS/t/pkg_class.t                          |   5 +
 httemplate/search/cust_bill_pkg.cgi       |  32 ++++--
 httemplate/search/cust_tax_exempt_pkg.cgi | 143 ++++++++++++++++++++++++
 httemplate/search/report_tax.cgi          | 179 +++++++++++++++++-------------
 httemplate/search/report_tax.html         |  30 ++++-
 10 files changed, 429 insertions(+), 94 deletions(-)
 create mode 100644 FS/FS/pkg_class.pm
 create mode 100644 FS/t/pkg_class.t
 create mode 100644 httemplate/search/cust_tax_exempt_pkg.cgi

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index d502a12be..a0637f50c 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -625,6 +625,7 @@ sub tables_hashref {
         'plandata',   'text', 'NULL', '',
         'disabled',   'char', 'NULL', 1,
         'taxclass',   'varchar', 'NULL', $char_d,
+        'classnum',   'int',     'NULL', '',
       ],
       'primary_key' => 'pkgpart',
       'unique' => [],
@@ -1277,6 +1278,16 @@ sub tables_hashref {
       'index'  => [ [ 'disabled' ] ],
     },
 
+    'pkg_class' => {
+      'columns' => [
+        'classnum',   'serial',  '', '',
+        'classname',  'varchar', '', $char_d,
+      ],
+      'primary_key' => 'classnum',
+      'unique' => [],
+      'index' => [],
+    },
+
   };
 
 }
diff --git a/FS/FS/cust_tax_exempt_pkg.pm b/FS/FS/cust_tax_exempt_pkg.pm
index 7193ace74..28fa24327 100644
--- a/FS/FS/cust_tax_exempt_pkg.pm
+++ b/FS/FS/cust_tax_exempt_pkg.pm
@@ -3,10 +3,11 @@ package FS::cust_tax_exempt_pkg;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs );
+use FS::cust_main_Mixin;
 use FS::cust_bill_pkg;
 use FS::cust_main_county;
 
-@ISA = qw(FS::Record);
+@ISA = qw( FS::cust_main_Mixin FS::Record );
 
 =head1 NAME
 
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 73f3bae04..a5e3c2170 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -438,6 +438,13 @@ sub check {
   ;
   return $error if $error;
 
+  if ( $self->classnum !~ /^$/ ) {
+    my $error = $self->ut_foreign_key('classnum', 'pkg_class', 'classnum');
+    return $error if $error;
+  } else {
+    $self->classnum('');
+  }
+
   return 'Unknown plan '. $self->plan
     unless exists($plans{$self->plan});
 
diff --git a/FS/FS/pkg_class.pm b/FS/FS/pkg_class.pm
new file mode 100644
index 000000000..0fa6e4810
--- /dev/null
+++ b/FS/FS/pkg_class.pm
@@ -0,0 +1,111 @@
+package FS::pkg_class;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch );
+use FS::part_pkg;
+
+@ISA = qw( FS::Record );
+
+=head1 NAME
+
+FS::pkg_class - Object methods for pkg_class records
+
+=head1 SYNOPSIS
+
+  use FS::pkg_class;
+
+  $record = new FS::pkg_class \%hash;
+  $record = new FS::pkg_class { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::pkg_class object represents an package class.  Every package definition
+(see L<FS::part_pkg>) has, optionally, a package class. FS::pkg_class inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item classnum - primary key (assigned automatically for new package classes)
+
+=item classname - Text name of this package class
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new package class.  To add the package class to the database, see
+L<"insert">.
+
+=cut
+
+sub table { 'pkg_class'; }
+
+=item insert
+
+Adds this package class to the database.  If there is an error, returns the
+error, otherwise returns false.
+
+=item delete
+
+Deletes this package class from the database.  Only package classes with no
+associated package definitions can be deleted.  If there is an error, returns
+the error, otherwise returns false.
+
+=cut
+
+sub delete {
+  my $self = shift;
+
+  return "Can't delete an pkg_class with part_pkg records!"
+    if qsearch( 'part_pkg', { 'classnum' => $self->classnum } );
+
+  $self->SUPER::delete;
+}
+
+=item replace OLD_RECORD
+
+Replaces OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid package class.  If there is an
+error, returns the error, otherwise returns false.  Called by the insert and
+replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  $self->ut_numbern('classnum')
+  or $self->ut_text('classname')
+  or $self->SUPER::check;
+
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, L<FS::part_pkg>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 54ea52555..c8f10f291 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -125,6 +125,7 @@ FS/part_svc.pm
 FS/part_svc_column.pm
 FS/part_svc_router.pm
 FS/part_virtual_field.pm
+FS/pkg_class.pm
 FS/pkg_svc.pm
 FS/rate.pm
 FS/rate_detail.pm
@@ -258,6 +259,7 @@ t/part_pop_local.t
 t/part_referral.t
 t/part_svc.t
 t/part_svc_column.t
+t/pkg_class.t
 t/pkg_svc.t
 t/port.t
 t/prepay_credit.t
diff --git a/FS/t/pkg_class.t b/FS/t/pkg_class.t
new file mode 100644
index 000000000..fb3774f8c
--- /dev/null
+++ b/FS/t/pkg_class.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::pkg_class;
+$loaded=1;
+print "ok 1\n";
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 082ccc893..cc0f97536 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -4,7 +4,7 @@ my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
 
 my $join_cust = "
     JOIN cust_bill USING ( invnum ) 
-    JOIN cust_main USING ( custnum )
+    LEFT JOIN cust_main USING ( custnum )
 ";
 
 my $join_pkg = "
@@ -17,6 +17,10 @@ my $where = "
     AND payby != 'COMP'
 ";
 
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  $where .= " AND agentnum = $1 ";
+}
+
 if ( $cgi->param('out') ) {
 
   $where .= "
@@ -62,19 +66,27 @@ my $count_query;
 if ( $cgi->param('pkg_tax') ) {
 
   $count_query =
-    "SELECT COUNT(*), SUM( ( CASE WHEN part_pkg.setuptax = 'Y'
-                                 THEN cust_bill_pkg.setup
-                                 ELSE 0 )
-                          +
-                          ( CASE WHEN part_pkg.recurtax = 'Y'
-                                 THEN cust_bill_pkg.recur
-                                 ELSE 0 )
-                        )";
+    "SELECT COUNT(*), SUM(
+                           ( CASE WHEN part_pkg.setuptax = 'Y'
+                                  THEN cust_bill_pkg.setup
+                                  ELSE 0
+                             END
+                           )
+                           +
+                           ( CASE WHEN part_pkg.recurtax = 'Y'
+                                  THEN cust_bill_pkg.recur
+                                  ELSE 0
+                             END
+                           )
+                         )
+    ";
 
   $where .= " AND (
                        ( part_pkg.setuptax = 'Y' AND cust_bill_pkg.setup > 0 )
                     OR ( part_pkg.recurtax = 'Y' AND cust_bill_pkg.recur > 0 )
-                  )";
+                  )
+              AND ( tax != 'Y' OR tax IS NULL )
+            ";
 
 } else {
 
diff --git a/httemplate/search/cust_tax_exempt_pkg.cgi b/httemplate/search/cust_tax_exempt_pkg.cgi
new file mode 100644
index 000000000..bc1e743b2
--- /dev/null
+++ b/httemplate/search/cust_tax_exempt_pkg.cgi
@@ -0,0 +1,143 @@
+<%
+
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+
+my $join_cust = "
+    JOIN cust_bill USING ( invnum )
+    LEFT JOIN cust_main USING ( custnum )
+";
+
+my $join_pkg = "
+    LEFT JOIN cust_pkg USING ( pkgnum )
+    LEFT JOIN part_pkg USING ( pkgpart )
+";
+
+my $join = "
+    JOIN cust_bill_pkg USING ( billpkgnum )
+    $join_cust
+    $join_pkg
+";
+
+my $where = "
+  WHERE _date >= $beginning AND _date <= $ending
+";
+#    AND payby != 'COMP'
+
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  $where .= " AND agentnum = $1 ";
+}
+
+if ( $cgi->param('out') ) {
+
+  $where .= "
+    AND 0 = (
+      SELECT COUNT(*) FROM cust_main_county AS county_out
+      WHERE (    county_out.county  = cust_main.county
+              OR ( county_out.county IS NULL AND cust_main.county  =  '' )
+              OR ( county_out.county  =  ''  AND cust_main.county IS NULL)
+              OR ( county_out.county IS NULL AND cust_main.county IS NULL)
+            )
+        AND (    county_out.state   = cust_main.state
+              OR ( county_out.state  IS NULL AND cust_main.state  =  ''  )
+              OR ( county_out.state   =  ''  AND cust_main.state IS NULL )
+              OR ( county_out.state  IS NULL AND cust_main.state IS NULL )
+            )
+        AND county_out.country = cust_main.country
+        AND county_out.tax > 0
+    )
+  ";
+
+} elsif ( $cgi->param('country' ) ) {
+
+  my $county  = dbh->quote( $cgi->param('county')  );
+  my $state   = dbh->quote( $cgi->param('state')   );
+  my $country = dbh->quote( $cgi->param('country') );
+  $where .= "
+    AND ( county  = $county OR $county = '' )
+    AND ( state   = $state  OR $state = '' )
+    AND   country = $country
+  ";
+  $where .= ' AND taxclass = '. dbh->quote( $cgi->param('taxclass') )
+    if $cgi->param('taxclass');
+
+}
+
+my $count_query = "SELECT COUNT(*), SUM(amount)".
+                  "  FROM cust_tax_exempt_pkg $join $where";
+
+my $query = {
+  'table'     => 'cust_tax_exempt_pkg',
+  'addl_from' => $join,
+  'hashref'   => {},
+  'select'    => join(', ',
+                   'cust_tax_exempt_pkg.*',
+                   #'cust_bill_pkg.*',
+                   #'cust_bill._date',
+                   #'part_pkg.pkg',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
+                 ),
+  'extra_sql' => $where,
+};
+
+my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ];
+my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
+%><%= include( 'elements/search.html',
+                 'title'       => 'Tax exemptions',
+                 'name'        => 'tax exemptions',
+                 'query'       => $query,
+                 'count_query' => $count_query,
+                 'count_addl'  => [ $money_char. '%.2f total', ],
+                 'header'      => [
+                   '#',
+                   'Date',
+                   'Amount',
+
+                   #'Description',
+                   #'Setup charge',
+                   #'Recurring charge',
+                   #'Invoice',
+                   #'Date',
+
+                   FS::UI::Web::cust_header(),
+                 ],
+                 'fields'      => [
+                   'exemptpkgnum',
+                   sub { $_[0]->month. '/'. $_[0]->year; },
+                   'amount',
+
+                   #sub { $_[0]->pkgnum > 0
+                   #        ? $_[0]->get('pkg')
+                   #        : $_[0]->get('itemdesc')
+                   #    },
+                   ##strikethrough or "N/A ($amount)" or something these when
+                   ## they're not applicable to pkg_tax search
+                   #sub { sprintf($money_char.'%.2f', shift->setup ) },
+                   #sub { sprintf($money_char.'%.2f', shift->recur ) },
+                   #'invnum',
+                   #sub { time2str('%b %d %Y', shift->_date ) },
+
+                   \&FS::UI::Web::cust_fields,
+                 ],
+                 'links'       => [
+                   '',
+                   '',
+                   '',
+
+                   #'',
+                   #'',
+                   #'',
+                   #'',
+                   #$ilink,
+                   #$ilink,
+
+                   ( map { $clink } FS::UI::Web::cust_header() ),
+                 ],
+                 'align' => 'rrr', # 'rlrrrc',
+           )
+%>
+
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 9062f0626..b1c6d3809 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -7,22 +7,25 @@ my $user = getotaker;
 
 my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
 
-my $from_join_cust = "
-  FROM cust_bill_pkg
+my $join_cust = "
     JOIN cust_bill USING ( invnum ) 
-    JOIN cust_main USING ( custnum )
+    LEFT JOIN cust_main USING ( custnum )
 ";
+my $from_join_cust = "
+    FROM cust_bill_pkg
+    $join_cust
+"; 
 my $join_pkg = "
-    JOIN cust_pkg USING ( pkgnum )
-    JOIN part_pkg USING ( pkgpart )
+    LEFT JOIN cust_pkg USING ( pkgnum )
+    LEFT JOIN part_pkg USING ( pkgpart )
 ";
 my $where = "
   WHERE _date >= $beginning AND _date <= $ending
     AND ( county  = ? OR ? = '' )
     AND ( state   = ? OR ? = '' )
     AND   country = ?
-    AND payby != 'COMP'
 ";
+#    AND payby != 'COMP'
 my @base_param = qw( county county state state country );
 
 my $agentname = '';
@@ -46,8 +49,6 @@ my $gotcust = "
             )
 ";
 
-my $monthly_exempt_warning = 0;
-my $taxclass_flag = 0;
 my($total, $tot_taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 );
 my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0 );
 my $out = 'Out of taxable region(s)';
@@ -59,17 +60,18 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
   $regions{$label}->{'label'} = $label;
   $regions{$label}->{'url_param'} = join(';', map "$_=".$r->$_(), qw( county state country ) );
 
-  my $fromwhere = $from_join_cust. $join_pkg. $where;
   my @param = @base_param;
+  my $mywhere = $where;
 
   if ( $r->taxclass ) {
-    $fromwhere .= " AND taxclass = ? ";
+    $mywhere .= " AND taxclass = ? ";
     push @param, 'taxclass';
     $regions{$label}->{'url_param'} .= ';taxclass='. $r->taxclass
       if $cgi->param('show_taxclasses');
-    $taxclass_flag = 1;
   }
 
+  my $fromwhere = $from_join_cust. $join_pkg. $mywhere. " AND payby != 'COMP' ";
+
 #  my $label = getlabel($r);
 #  $regions{$label}->{'label'} = $label;
 
@@ -83,57 +85,80 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
   $total += $t;
   $regions{$label}->{'total'} += $t;
 
-  ## calculate package-exemption for this region
-
-  foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i }
-                       qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
-    my $x = scalar_sql($r, \@param,
-      "SELECT SUM($e) $fromwhere AND $nottax"
-    );
-    $exempt_pkg += $x;
-    $regions{$label}->{'exempt_pkg'} += $x;
-  }
-
   ## calculate customer-exemption for this region
 
-  my($taxable, $x_cust) = (0, 0);
-  foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
-                       qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
-    $taxable += scalar_sql($r, \@param, 
-      "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
-    );
-
-    $x_cust += scalar_sql($r, \@param, 
-      "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
-    );
-  }
+##  my $taxable = $t;
+
+#  my($taxable, $x_cust) = (0, 0);
+#  foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
+#                       qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
+#    $taxable += scalar_sql($r, \@param, 
+#      "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
+#    );
+#
+#    $x_cust += scalar_sql($r, \@param, 
+#      "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
+#    );
+#  }
+
+  my $x_cust = scalar_sql($r, \@param,
+    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur)
+     $fromwhere AND $nottax AND tax = 'Y' "
+  );
 
   $exempt_cust += $x_cust;
   $regions{$label}->{'exempt_cust'} += $x_cust;
+  
+  ## calculate package-exemption for this region
 
-  ## calculate monthly exemption (texas tax) for this region
+  my $x_pkg = scalar_sql($r, \@param,
+    "SELECT SUM(
+                 ( CASE WHEN part_pkg.setuptax = 'Y'
+                        THEN cust_bill_pkg.setup
+                        ELSE 0
+                   END
+                 )
+                 +
+                 ( CASE WHEN part_pkg.recurtax = 'Y'
+                        THEN cust_bill_pkg.recur
+                        ELSE 0
+                   END
+                 )
+               )
+       $fromwhere
+       AND $nottax
+       AND (
+                ( part_pkg.setuptax = 'Y' AND cust_bill_pkg.setup > 0 )
+             OR ( part_pkg.recurtax = 'Y' AND cust_bill_pkg.recur > 0 )
+           )
+       AND ( tax != 'Y' OR tax IS NULL )
+    "
+  );
+  $exempt_pkg += $x_pkg;
+  $regions{$label}->{'exempt_pkg'} += $x_pkg;
 
-  my($sday,$smon,$syear) = (localtime($beginning) )[ 3, 4, 5 ];
-  $monthly_exempt_warning=1 if $sday != 1 && $beginning;
-  $smon++; $syear+=1900;
+  ## calculate monthly exemption (texas tax) for this region
 
-  my $eending = ( $ending == 4294967295 ) ? time : $ending;
-  my($eday,$emon,$eyear) = (localtime($eending) )[ 3, 4, 5 ];
-  $emon++; $eyear+=1900;
+  # count up all the cust_tax_exempt_pkg records associated with
+  # the actual line items.
 
-  my $x_monthly = scalar_sql($r, [ 'taxnum' ],
-    "SELECT SUM(amount) FROM cust_tax_exempt where taxnum = ? ".
-    "  AND ( year > $syear OR ( year = $syear and month >= $smon ) )".
-    "  AND ( year < $eyear OR ( year = $eyear and month <= $emon ) )"
+  my $x_monthly = scalar_sql($r, \@param,
+    "SELECT SUM(amount)
+       FROM cust_tax_exempt_pkg
+       JOIN cust_bill_pkg USING ( billpkgnum )
+       $join_cust $join_pkg
+     $mywhere"
   );
-  if ( $x_monthly ) {
-    warn $r->taxnum(). ": $x_monthly\n";
-    $taxable -= $x_monthly;
-  }
+#  if ( $x_monthly ) {
+#    #warn $r->taxnum(). ": $x_monthly\n";
+#    $taxable -= $x_monthly;
+#  }
 
   $exempt_monthly += $x_monthly;
   $regions{$label}->{'exempt_monthly'} += $x_monthly;
 
+  my $taxable = $t - $x_cust - $x_pkg - $x_monthly;
+
   $tot_taxable += $taxable;
   $regions{$label}->{'taxable'} += $taxable;
 
@@ -149,7 +174,7 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
 
 }
 
-my $taxwhere = "$from_join_cust $where";
+my $taxwhere = "$from_join_cust $where AND payby != 'COMP' ";
 my @taxparam = @base_param;
 my %base_regions = ();
 #foreach my $label ( keys %regions ) {
@@ -165,7 +190,7 @@ foreach my $r (
 
   my $label = getlabel($r);
 
-  my $fromwhere = $join_pkg. $where;
+  my $fromwhere = $join_pkg. $where. " AND payby != 'COMP' ";
   my @param = @base_param; 
 
   #match itemdesc if necessary!
@@ -246,7 +271,7 @@ sub getlabel {
     $label = "$label (". $r->taxclass. ")"
       if $r->taxclass
       && $cgi->param('show_taxclasses')
-      && ! $opt{'no_taxclasses'};
+      && ! $opt{'no_taxclass'};
     #$label = $r->taxname. " ($label)" if $r->taxname;
   }
   return $label;
@@ -266,14 +291,19 @@ sub scalar_sql {
 %>
 
 <%
-
-my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
-
+my $dateagentlink = "begin=$beginning;end=$ending";
+$dateagentlink .= ';agentnum='. $cgi->param('agentnum')
+  if length($agentname);
+my $baselink   = $p. "search/cust_bill_pkg.cgi?$dateagentlink";
+my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink";
 %>
 
-
 <%= header( "$agentname Sales Tax Report - ".
-              time2str('%h %o %Y through ', $beginning ).
+              ( $beginning
+                  ? time2str('%h %o %Y ', $beginning )
+                  : ''
+              ).
+              'through '.
               ( $ending == 4294967295
                   ? 'now'
                   : time2str('%h %o %Y', $ending )
@@ -320,32 +350,36 @@ my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
          $bgcolor = $bgcolor1;
        }
 
-       my $link = $baselink;
+       my $link = '';
        if ( $region->{'label'} ne 'Total' ) {
          if ( $region->{'label'} eq $out ) {
-           $link .= ';out=1';
+           $link = ';out=1';
          } else {
-           $link .= ';'. $region->{'url_param'};
+           $link = ';'. $region->{'url_param'};
          }
        }
+
+
+
+
   %>
 
     <TR>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $region->{'label'} %></TD>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <A HREF="<%= $link %>;nottax=1"><%= $money_char %><%= sprintf('%.2f', $region->{'total'} ) %></A>
+        <A HREF="<%= $baselink. $link %>;nottax=1"><%= $money_char %><%= sprintf('%.2f', $region->{'total'} ) %></A>
       </TD>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><FONT SIZE="+1"><B> - </B></FONT></TD>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <A HREF="<%= $link %>;nottax=1;cust_tax=Y"><%= $money_char %><%= sprintf('%.2f', $region->{'exempt_cust'} ) %></A>
+        <A HREF="<%= $baselink. $link %>;nottax=1;cust_tax=Y"><%= $money_char %><%= sprintf('%.2f', $region->{'exempt_cust'} ) %></A>
       </TD>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><FONT SIZE="+1"><B> - </B></FONT></TD>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <A HREF="<%= $link %>;nottax=1;pkg_tax=Y"><%= $money_char %><%= sprintf('%.2f', $region->{'exempt_pkg'} ) %></A>
+        <A HREF="<%= $baselink. $link %>;nottax=1;pkg_tax=Y"><%= $money_char %><%= sprintf('%.2f', $region->{'exempt_pkg'} ) %></A>
       </TD>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><FONT SIZE="+1"><B> - </B></FONT></TD>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <%= $money_char %><%= sprintf('%.2f', $region->{'exempt_monthly'} ) %></A>
+        <A HREF="<%= $exemptlink. $link %>"><%= $money_char %><%= sprintf('%.2f', $region->{'exempt_monthly'} ) %></A>
         </TD>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><FONT SIZE="+1"><B> = </B></FONT></TD>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
@@ -359,7 +393,7 @@ my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
       </TD>
       <% unless ( $cgi->param('show_taxclasses') ) { %>
         <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-          <A HREF="<%= $link %>;istax=1"><%= $money_char %><%= sprintf('%.2f', $region->{'tax'} ) %></A>
+          <A HREF="<%= $baselink. $link %>;istax=1"><%= $money_char %><%= sprintf('%.2f', $region->{'tax'} ) %></A>
         </TD>
       <% } %>
     </TR>
@@ -387,12 +421,12 @@ my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
          $bgcolor = $bgcolor1;
        }
 
-       my $link = $baselink;
+       my $link = '';
        #if ( $region->{'label'} ne 'Total' ) {
          if ( $region->{'label'} eq $out ) {
-           $link .= ';out=1';
+           $link = ';out=1';
          } else {
-           $link .= ';'. $region->{'url_param'};
+           $link = ';'. $region->{'url_param'};
          }
        #}
   %>
@@ -400,7 +434,7 @@ my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
     <TR>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $region->{'label'} %></TD>
       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <A HREF="<%= $link %>;istax=1"><%= $money_char %><%= sprintf('%.2f', $region->{'tax'} ) %></A>
+        <A HREF="<%= $baselink. $link %>;istax=1"><%= $money_char %><%= sprintf('%.2f', $region->{'tax'} ) %></A>
       </TD>
     </TR>
 
@@ -417,15 +451,6 @@ my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
 
 <% } %>
 
-
-<% if ( $monthly_exempt_warning ) { %>
-  <BR>
-  Partial-month tax reports (except for current month) may not be correct due
-  to month-granularity tax exemption (usually "texas tax").  For an accurate
-  report, start on the first of a month and end on the last day of a month (or
-  leave blank for to now).
-<% } %>
-
 </BODY>
 </HTML>
 
diff --git a/httemplate/search/report_tax.html b/httemplate/search/report_tax.html
index eeaccc1ab..7a8ecd4f0 100755
--- a/httemplate/search/report_tax.html
+++ b/httemplate/search/report_tax.html
@@ -5,18 +5,36 @@
   <BODY BGCOLOR="#e8e8e8">
     <H1>Tax Report Criteria</H1>
     <FORM ACTION="report_tax.cgi" METHOD="GET">
+
     <TABLE>
+
      <%= include( '/elements/tr-select-agent.html' ) %>
+
      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-     <TR>
-       <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_taxclasses" VALUE="1"></TD>
-       <TD>Show tax classes</TD>
-     </TR>
-    </TABLE>
 
-      <BR><INPUT TYPE="submit" VALUE="Get Report">
+     <% my $conf = new FS::Conf;
+        if ( $conf->exists('enable_taxclasses') ) {
+     %>
+       <TR>
+         <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_taxclasses" VALUE="1"></TD>
+         <TD>Show tax classes</TD>
+       </TR>
+     <% } %>
 
+     <% my @pkg_class = qsearch('pkg_class', {});
+        if ( @pkg_class ) {
+     %>
+       <TR>
+         <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_pkgclasses" VALUE="1"></TD>
+         <TD>Show package classes</TD>
+       </TR>
+     <% } %>
+
+    </TABLE>
+
+    <BR><INPUT TYPE="submit" VALUE="Get Report">
     </FORM>
+
   </BODY>
 </HTML>
 
-- 
cgit v1.2.1


From b5ecccfac56fc5d4eaa617a8c08dd168ffb74bac Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Jan 2006 01:33:57 +0000
Subject: on tax exemption report, show more info on the specific line item and
 invoice

---
 httemplate/search/cust_tax_exempt_pkg.cgi | 67 +++++++++++++++++--------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/httemplate/search/cust_tax_exempt_pkg.cgi b/httemplate/search/cust_tax_exempt_pkg.cgi
index bc1e743b2..e61947b7d 100644
--- a/httemplate/search/cust_tax_exempt_pkg.cgi
+++ b/httemplate/search/cust_tax_exempt_pkg.cgi
@@ -71,9 +71,9 @@ my $query = {
   'hashref'   => {},
   'select'    => join(', ',
                    'cust_tax_exempt_pkg.*',
-                   #'cust_bill_pkg.*',
-                   #'cust_bill._date',
-                   #'part_pkg.pkg',
+                   'cust_bill_pkg.*',
+                   'cust_bill.*',
+                   'part_pkg.pkg',
                    'cust_main.custnum',
                    FS::UI::Web::cust_sql_fields(),
                  ),
@@ -94,32 +94,42 @@ my $money_char = $conf->config('money_char') || '$';
                  'count_addl'  => [ $money_char. '%.2f total', ],
                  'header'      => [
                    '#',
-                   'Date',
+                   'Month',
                    'Amount',
-
-                   #'Description',
-                   #'Setup charge',
-                   #'Recurring charge',
-                   #'Invoice',
-                   #'Date',
-
+                   'Line item',
+                   'Invoice',
+                   'Date',
                    FS::UI::Web::cust_header(),
                  ],
                  'fields'      => [
                    'exemptpkgnum',
                    sub { $_[0]->month. '/'. $_[0]->year; },
-                   'amount',
-
-                   #sub { $_[0]->pkgnum > 0
-                   #        ? $_[0]->get('pkg')
-                   #        : $_[0]->get('itemdesc')
-                   #    },
-                   ##strikethrough or "N/A ($amount)" or something these when
-                   ## they're not applicable to pkg_tax search
-                   #sub { sprintf($money_char.'%.2f', shift->setup ) },
-                   #sub { sprintf($money_char.'%.2f', shift->recur ) },
-                   #'invnum',
-                   #sub { time2str('%b %d %Y', shift->_date ) },
+                   sub { $money_char. $_[0]->amount; },
+
+                   sub {
+                     $_[0]->billpkgnum. ': '.
+                     ( $_[0]->pkgnum > 0
+                         ? $_[0]->get('pkg')
+                         : $_[0]->get('itemdesc')
+                     ).
+                     ' ('.
+                     ( $_[0]->setup > 0
+                         ? $money_char. $_[0]->setup. ' setup'
+                         : ''
+                     ).
+                     ( $_[0]->setup > 0 && $_[0]->recur > 0
+                       ? ' / '
+                       : ''
+                     ).
+                     ( $_[0]->recur > 0
+                         ? $money_char. $_[0]->recur. ' recur'
+                         : ''
+                     ).
+                     ')';
+                   },
+
+                   'invnum',
+                   sub { time2str('%b %d %Y', shift->_date ) },
 
                    \&FS::UI::Web::cust_fields,
                  ],
@@ -128,16 +138,13 @@ my $money_char = $conf->config('money_char') || '$';
                    '',
                    '',
 
-                   #'',
-                   #'',
-                   #'',
-                   #'',
-                   #$ilink,
-                   #$ilink,
+                   '',
+                   $ilink,
+                   $ilink,
 
                    ( map { $clink } FS::UI::Web::cust_header() ),
                  ],
-                 'align' => 'rrr', # 'rlrrrc',
+                 'align' => 'rrrlrc', # 'rlrrrc',
            )
 %>
 
-- 
cgit v1.2.1


From 0a4a314b33a22b314ac5c4c85840a4bbff49cdf3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Jan 2006 07:34:17 +0000
Subject: small visual fix to alternating row colors when show_taxclasses is on

---
 httemplate/search/report_tax.cgi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index b1c6d3809..61ed26fac 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -413,6 +413,8 @@ my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink";
   </TR>
 
   <% #some false laziness w/above
+     $bgcolor1 = '#eeeeee';
+     $bgcolor2 = '#ffffff';
      foreach my $region ( @base_regions ) {
 
        if ( $bgcolor eq $bgcolor1 ) {
@@ -440,6 +442,14 @@ my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink";
 
   <% } %>
 
+  <%
+     if ( $bgcolor eq $bgcolor1 ) {
+       $bgcolor = $bgcolor2;
+     } else {
+       $bgcolor = $bgcolor1;
+     }
+  %>
+
   <TR>
    <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">Total</TD>
     <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-- 
cgit v1.2.1


From 7066204f45124e0100d5330cce63584ff9e4bacb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 31 Jan 2006 02:59:59 +0000
Subject: fix "table not found" dbdef error message to recommend
 freeside-upgrade instead create + dbdef-create

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 19da3d181..4a0fe3fd2 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -250,7 +250,7 @@ sub qsearch {
   my $table = $cache ? $cache->table : $stable;
   my $dbdef_table = dbdef->table($table)
     or die "No schema for table $table found - ".
-           "do you need to create it or run dbdef-create?";
+           "do you need to run freeside-upgrade?";
   my $pkey = $dbdef_table->primary_key;
 
   my @real_fields = grep exists($record->{$_}), real_fields($table);
-- 
cgit v1.2.1


From c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 31 Jan 2006 04:26:54 +0000
Subject: move header() to include(/elements/header.html) so it can be changed
 in one place, thanks to Scott Edwards

---
 httemplate/browse/addr_block.cgi                     | 2 +-
 httemplate/browse/agent.cgi                          | 2 +-
 httemplate/browse/agent_type.cgi                     | 2 +-
 httemplate/browse/cust_pay_batch.cgi                 | 2 +-
 httemplate/browse/part_bill_event.cgi                | 2 +-
 httemplate/browse/part_export.cgi                    | 2 +-
 httemplate/browse/part_pkg.cgi                       | 2 +-
 httemplate/browse/part_referral.cgi                  | 2 +-
 httemplate/browse/part_svc.cgi                       | 2 +-
 httemplate/browse/part_virtual_field.cgi             | 2 +-
 httemplate/browse/payment_gateway.html               | 2 +-
 httemplate/browse/queue.cgi                          | 2 +-
 httemplate/browse/rate.cgi                           | 2 +-
 httemplate/browse/router.cgi                         | 2 +-
 httemplate/browse/svc_acct_pop.cgi                   | 2 +-
 httemplate/config/config-view.cgi                    | 2 +-
 httemplate/config/config.cgi                         | 2 +-
 httemplate/edit/REAL_cust_pkg.cgi                    | 2 +-
 httemplate/edit/agent.cgi                            | 2 +-
 httemplate/edit/agent_payment_gateway.html           | 2 +-
 httemplate/edit/agent_type.cgi                       | 2 +-
 httemplate/edit/bulk-cust_svc.html                   | 2 +-
 httemplate/edit/cust_pay.cgi                         | 2 +-
 httemplate/edit/part_export.cgi                      | 2 +-
 httemplate/edit/part_pkg.cgi                         | 2 +-
 httemplate/edit/part_svc.cgi                         | 2 +-
 httemplate/edit/payment_gateway.html                 | 2 +-
 httemplate/edit/prepay_credit.cgi                    | 2 +-
 httemplate/edit/process/prepay_credit.cgi            | 2 +-
 httemplate/edit/process/reg_code.cgi                 | 2 +-
 httemplate/edit/rate.cgi                             | 2 +-
 httemplate/edit/rate_region.cgi                      | 2 +-
 httemplate/edit/reg_code.cgi                         | 2 +-
 httemplate/edit/svc_acct.cgi                         | 2 +-
 httemplate/edit/svc_broadband.cgi                    | 2 +-
 httemplate/edit/svc_forward.cgi                      | 2 +-
 httemplate/misc/batch-cust_pay.html                  | 2 +-
 httemplate/misc/cust_main-import.cgi                 | 2 +-
 httemplate/misc/cust_main-import_charges.cgi         | 2 +-
 httemplate/misc/expire_pkg.cgi                       | 2 +-
 httemplate/misc/link.cgi                             | 2 +-
 httemplate/misc/meta-import.cgi                      | 2 +-
 httemplate/misc/process/cust_main-import.cgi         | 2 +-
 httemplate/misc/process/cust_main-import_charges.cgi | 2 +-
 httemplate/misc/process/meta-import.cgi              | 2 +-
 httemplate/misc/upload-batch.cgi                     | 2 +-
 httemplate/misc/whois.cgi                            | 2 +-
 httemplate/search/report_prepaid_income.cgi          | 2 +-
 httemplate/search/report_tax.cgi                     | 2 +-
 httemplate/search/svc_external.cgi                   | 2 +-
 httemplate/view/cust_bill.cgi                        | 2 +-
 httemplate/view/cust_main.cgi                        | 2 +-
 httemplate/view/svc_acct.cgi                         | 4 ++--
 httemplate/view/svc_broadband.cgi                    | 2 +-
 httemplate/view/svc_domain.cgi                       | 2 +-
 httemplate/view/svc_external.cgi                     | 2 +-
 56 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi
index 06ac556cf..d453adf8e 100644
--- a/httemplate/browse/addr_block.cgi
+++ b/httemplate/browse/addr_block.cgi
@@ -1,4 +1,4 @@
-<%= header('Address Blocks', menubar('Main Menu'   => $p)) %>
+<%= include("/elements/header.html",'Address Blocks', menubar('Main Menu'   => $p)) %>
 <%
 
 use NetAddr::IP;
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 05300d0bd..17cc8bd40 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -11,7 +11,7 @@
   my $conf = new FS::Conf;
 
 %>
-<%= header('Agent Listing', menubar(
+<%= include("/elements/header.html",'Agent Listing', menubar(
   'Main Menu'   => $p,
   'Agent Types' => $p. 'browse/agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index 5473804e8..2e1bdad42 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Agent Type Listing", menubar(
+<%= include("/elements/header.html","Agent Type Listing", menubar(
   'Main Menu' => $p,
   'Agents'    => $p. 'browse/agent.cgi',
 )) %>
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 3420e97b6..0f05ecb25 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Pending credit card batch", menubar( 'Main Menu' => $p,)) %>
+<%= include("/elements/header.html","Pending credit card batch", menubar( 'Main Menu' => $p,)) %>
 
 <FORM ACTION="<%=$p%>misc/download-batch.cgi" METHOD="POST">
 Download batch in format <SELECT NAME="format">
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index 670474d48..5a89516df 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -12,7 +12,7 @@ my @part_bill_event = qsearch('part_bill_event', \%search );
 my $total = scalar(@part_bill_event);
 
 %>
-<%= header('Invoice Event Listing', menubar( 'Main Menu' => $p) ) %>
+<%= include("/elements/header.html",'Invoice Event Listing', menubar( 'Main Menu' => $p) ) %>
 
     Invoice events are actions taken on overdue invoices.<BR><BR>
 <A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new invoice event</I></A>
diff --git a/httemplate/browse/part_export.cgi b/httemplate/browse/part_export.cgi
index 79c57aefc..25a49cd20 100755
--- a/httemplate/browse/part_export.cgi
+++ b/httemplate/browse/part_export.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Export Listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
+<%= include("/elements/header.html","Export Listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
 Provisioning services to external machines, databases and APIs.<BR><BR>
 <A HREF="<%= $p %>edit/part_export.cgi"><I>Add a new export</I></A><BR><BR>
 <SCRIPT>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 8d5b55451..e6454639f 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -48,7 +48,7 @@ my $conf = new FS::Conf;
 my $taxclasses = $conf->exists('enable_taxclasses');
 
 %>
-<%= header("Package Definition Listing",menubar( 'Main Menu' => $p )) %>
+<%= include("/elements/header.html","Package Definition Listing",menubar( 'Main Menu' => $p )) %>
 <% unless ( $cgi->param('active') ) { %>
   One or more service definitions are grouped together into a package 
   definition and given pricing information.  Customers purchase packages
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 581e01bb6..238ddace7 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Advertising source Listing", menubar(
+<%= include("/elements/header.html","Advertising source Listing", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )) %>
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index a725dc051..eef2676c0 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -28,7 +28,7 @@ if ( $cgi->param('orderby') eq 'active' ) {
 }
 
 %>
-<%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
+<%= include("/elements/header.html",'Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
 <SCRIPT>
 function part_export_areyousure(href) {
diff --git a/httemplate/browse/part_virtual_field.cgi b/httemplate/browse/part_virtual_field.cgi
index a0009dabd..555798818 100644
--- a/httemplate/browse/part_virtual_field.cgi
+++ b/httemplate/browse/part_virtual_field.cgi
@@ -1,4 +1,4 @@
-<%= header('Virtual field definitions', menubar('Main Menu'   => $p)) %>
+<%= include("/elements/header.html",'Virtual field definitions', menubar('Main Menu'   => $p)) %>
 <%
 
 my %pvfs;
diff --git a/httemplate/browse/payment_gateway.html b/httemplate/browse/payment_gateway.html
index bb7f31514..002932ccd 100644
--- a/httemplate/browse/payment_gateway.html
+++ b/httemplate/browse/payment_gateway.html
@@ -8,7 +8,7 @@
   }
 
 %>
-<%= header('Payment gateways', menubar(
+<%= include("/elements/header.html",'Payment gateways', menubar(
   'Main Menu' => $p,
   'Agents'    => $p. 'browse/agent.cgi',
 )) %>
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 0afdd48d7..b865b1c30 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Job Queue", menubar( 'Main Menu' => $p, )) %>
+<%= include("/elements/header.html","Job Queue", menubar( 'Main Menu' => $p, )) %>
 <%= joblisting({}) %>
 </BODY>
 </HTML>
diff --git a/httemplate/browse/rate.cgi b/httemplate/browse/rate.cgi
index c31260166..4718b7147 100644
--- a/httemplate/browse/rate.cgi
+++ b/httemplate/browse/rate.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Rate plan listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
+<%= include("/elements/header.html","Rate plan listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
 Rate plans, regions and prefixes for VoIP and call billing.<BR><BR>
 <A HREF="<%=$p%>edit/rate.cgi"><I>Add a rate plan</I></A>
 | <A HREF="<%=$p%>edit/rate_region.cgi"><I>Add a region</I></A>
diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index 149db4903..410037d41 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -1,4 +1,4 @@
-<%= header('Routers', menubar('Main Menu'   => $p)) %>
+<%= include("/elements/header.html",'Routers', menubar('Main Menu'   => $p)) %>
 <%
 
 my @router = qsearch('router', {});
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 44cda81ad..73de6accc 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -4,7 +4,7 @@
                                      WHERE popnum = ?           ")
     or die dbh->errstr;
 %>
-<%= header('Access Number Listing', menubar( 'Main Menu' => $p )) %>
+<%= include("/elements/header.html",'Access Number Listing', menubar( 'Main Menu' => $p )) %>
 Points of Presence<BR><BR>
 <A HREF="<%= $p %>edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A><BR><BR>
 <%= table() %>
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 8011e7697..bf51f1509 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('View Configuration', menubar( 'Main Menu' => $p,
+<%= include("/elements/header.html",'View Configuration', menubar( 'Main Menu' => $p,
                                      'Edit Configuration' => 'config.cgi' ) ) %>
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index ff29d8578..21f79a9dc 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
+<%= include("/elements/header.html",'Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
 <SCRIPT>
 var gSafeOnload = new Array();
 var gSafeOnsubmit = new Array();
diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 78dd0fafa..1eefcfea0 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -33,7 +33,7 @@ if ( $error ) {
 #my $custnum = $cust_pkg->getfield('custnum');
 %>
 
-<%= header('Customer package - Edit dates') %>
+<%= include("/elements/header.html",'Customer package - Edit dates') %>
 <%
 #, menubar(
 #  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index cb64ad8cd..40115a932 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -19,7 +19,7 @@ my $conf = new FS::Conf;
 
 %>
 
-<%= header("$action Agent", menubar(
+<%= include("/elements/header.html","$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
 )) %>
diff --git a/httemplate/edit/agent_payment_gateway.html b/httemplate/edit/agent_payment_gateway.html
index 61d29e0e9..db4331b84 100644
--- a/httemplate/edit/agent_payment_gateway.html
+++ b/httemplate/edit/agent_payment_gateway.html
@@ -12,7 +12,7 @@ my $action = 'Add';
 
 %>
 
-<%= header("$action payment gateway override for ". $agent->agent,  menubar(
+<%= include("/elements/header.html","$action payment gateway override for ". $agent->agent,  menubar(
   'Main Menu' => $p,
   #'View all payment gateways' => $p. 'browse/payment_gateway.html',
   'View all agents' => $p. 'browse/agent.html',
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 5addbbd4c..944ddd0d0 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -16,7 +16,7 @@ my $action = $agent_type->typenum ? 'Edit' : 'Add';
 
 %>
 
-<%= header("$action Agent Type", menubar(
+<%= include("/elements/header.html","$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
 ))
diff --git a/httemplate/edit/bulk-cust_svc.html b/httemplate/edit/bulk-cust_svc.html
index 332b5b67c..be247ba4e 100644
--- a/httemplate/edit/bulk-cust_svc.html
+++ b/httemplate/edit/bulk-cust_svc.html
@@ -1,4 +1,4 @@
-<%= header( 'Bulk customer service change',
+<%= include("/elements/header.html", 'Bulk customer service change',
             menubar(
                      'Main Menu' => $p,
                    ),
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 0370ab726..94fd06ca5 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -45,7 +45,7 @@ $title .= " against Invoice #$linknum" if $link eq 'invnum';
 
 %>
 
-<%=  header($title, '') %>
+<%=  include("/elements/header.html",$title, '') %>
 
 <% if ( $cgi->param('error') ) { %>
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index b3d42bd96..6a8a0deb6 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -100,7 +100,7 @@ my $widget = new HTML::Widgets::SelectLayers(
 );
 
 %>
-<%= header("$action Export", menubar(
+<%= include("/elements/header.html","$action Export", menubar(
   'Main Menu' => popurl(2),
 ), ' onLoad="visualize()"')
 %>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 60365f628..61e4086be 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -48,7 +48,7 @@ my $hashref = $part_pkg->hashref;
 
 %>
 
-<%= header("$action Package Definition", menubar(
+<%= include("/elements/header.html","$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
 )) %>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 9749fc12d..c5fff25e0 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -23,7 +23,7 @@ my $hashref = $part_svc->hashref;
 
            #" onLoad=\"visualize()\""
 %>
-<%= header("$action Service Definition",
+<%= include("/elements/header.html","$action Service Definition",
            menubar( 'Main Menu'         => $p,
                     'View all service definitions' => "${p}browse/part_svc.cgi"
                   ),
diff --git a/httemplate/edit/payment_gateway.html b/httemplate/edit/payment_gateway.html
index 33cc236d0..cf825df00 100644
--- a/httemplate/edit/payment_gateway.html
+++ b/httemplate/edit/payment_gateway.html
@@ -17,7 +17,7 @@ my $action = $payment_gateway->gatewaynum ? 'Edit' : 'Add';
 
 %>
 
-<%= header("$action Payment gateway", menubar(
+<%= include("/elements/header.html","$action Payment gateway", menubar(
   'Main Menu' => $p,
   'View all payment gateways' => $p. 'browse/payment_gateway.html',
 )) %>
diff --git a/httemplate/edit/prepay_credit.cgi b/httemplate/edit/prepay_credit.cgi
index 9cf0fc6e1..253edb94b 100644
--- a/httemplate/edit/prepay_credit.cgi
+++ b/httemplate/edit/prepay_credit.cgi
@@ -15,7 +15,7 @@ $cgi->param('multiplier', '60') unless $cgi->param('multiplier');
 
 %>
 
-<%= header('Generate prepaid cards'. ($agent ? ' for '. $agent->agent : ''),
+<%= include("/elements/header.html",'Generate prepaid cards'. ($agent ? ' for '. $agent->agent : ''),
            menubar( 'Main Menu' => $p, ))
 %>
 
diff --git a/httemplate/edit/process/prepay_credit.cgi b/httemplate/edit/process/prepay_credit.cgi
index 25ecbe079..ca7472432 100644
--- a/httemplate/edit/process/prepay_credit.cgi
+++ b/httemplate/edit/process/prepay_credit.cgi
@@ -29,7 +29,7 @@ unless ( ref($error) ) {
   $cgi->redirect(popurl(3). "edit/prepay_credit.cgi?". $cgi->query_string )
 %><% } else { %>
 
-<%= header( "$num prepaid cards generated".
+<%= include("/elements/header.html", "$num prepaid cards generated".
               ( $agent ? ' for '.$agent->agent : '' ),
             menubar( 'Main menu' => popurl(3) )
           )
diff --git a/httemplate/edit/process/reg_code.cgi b/httemplate/edit/process/reg_code.cgi
index 4658257f3..a86c7383a 100644
--- a/httemplate/edit/process/reg_code.cgi
+++ b/httemplate/edit/process/reg_code.cgi
@@ -28,7 +28,7 @@ unless ( ref($error) ) {
   $cgi->redirect(popurl(3). "edit/reg_code.cgi?". $cgi->query_string )
 %><% } else { %>
 
-<%= header("$num registration codes generated for ". $agent->agent, menubar(
+<%= include("/elements/header.html","$num registration codes generated for ". $agent->agent, menubar(
   'Main menu'       => popurl(3),
   'View all agents' => popurl(3). 'browse/agent.cgi',
 ) ) %>
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 1771f0105..f8f67f6c4 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -26,7 +26,7 @@ my %granularity = (
 
 %>
 
-<%= header("$action Rate plan", menubar(
+<%= include("/elements/header.html","$action Rate plan", menubar(
       'Main Menu' => $p,
       'View all rate plans' => "${p}browse/rate.cgi",
     ))
diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi
index cc14dd37d..934fe8035 100644
--- a/httemplate/edit/rate_region.cgi
+++ b/httemplate/edit/rate_region.cgi
@@ -34,7 +34,7 @@ if ( @rate_prefix ) {
 
 %>
 
-<%= header("$action Region", menubar(
+<%= include("/elements/header.html","$action Region", menubar(
       'Main Menu' => $p,
       #'View all regions' => "${p}browse/rate_region.cgi",
     ))
diff --git a/httemplate/edit/reg_code.cgi b/httemplate/edit/reg_code.cgi
index 899d1ec45..2fba39e00 100644
--- a/httemplate/edit/reg_code.cgi
+++ b/httemplate/edit/reg_code.cgi
@@ -6,7 +6,7 @@ my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
 
 %>
 
-<%= header('Generate registration codes for '. $agent->agent, menubar(
+<%= include("/elements/header.html",'Generate registration codes for '. $agent->agent, menubar(
       'Main Menu' => $p,
     ))
 %>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index e74d84d53..1e87c67ad 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -119,7 +119,7 @@ my $p1 = popurl(1);
 
 %>
 
-<%= header("$action $svc account") %>
+<%= include("/elements/header.html","$action $svc account") %>
 
 <% if ( $cgi->param('error') ) { %>
   <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index 9e064c5c8..cbd0c2c3a 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -82,7 +82,7 @@ my ($ip_addr, $speed_up, $speed_down, $blocknum) =
 
 %>
 
-<%=header("Broadband Service $action", '')%>
+<%=include("/elements/header.html","Broadband Service $action", '')%>
 
 <% if ($cgi->param('error')) { %>
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT><BR>
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 2b9d35ad1..c1b90a9bd 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -110,7 +110,7 @@ my $src = $svc_forward->dbdef_table->column('src') ? $svc_forward->src : '';
 
 %>
 
-<%= header("Mail Forward $action") %>
+<%= include("/elements/header.html","Mail Forward $action") %>
 
 <% if ( $cgi->param('error') ) { %>
   <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
diff --git a/httemplate/misc/batch-cust_pay.html b/httemplate/misc/batch-cust_pay.html
index 20cc89045..b40869476 100644
--- a/httemplate/misc/batch-cust_pay.html
+++ b/httemplate/misc/batch-cust_pay.html
@@ -1,4 +1,4 @@
-<%= header( 'Quick payment entry',
+<%= include("/elements/header.html", 'Quick payment entry',
             menubar(
                      'Main Menu' => $p, #popurl(1),
                      'Old-style quick payment entry' =>
diff --git a/httemplate/misc/cust_main-import.cgi b/httemplate/misc/cust_main-import.cgi
index 6b36f478d..484855005 100644
--- a/httemplate/misc/cust_main-import.cgi
+++ b/httemplate/misc/cust_main-import.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Batch Customer Import') %>
+<%= include("/elements/header.html",'Batch Customer Import') %>
 <FORM ACTION="process/cust_main-import.cgi" METHOD="post" ENCTYPE="multipart/form-data">
 Import a CSV file containing customer records.<BR><BR>
 Default file format is CSV, with the following field order: <i>cust_pkg.setup, dayphone, first, last, address1, address2, city, state, zip, comments</i><BR><BR>
diff --git a/httemplate/misc/cust_main-import_charges.cgi b/httemplate/misc/cust_main-import_charges.cgi
index 0822b9eb6..8402386d5 100644
--- a/httemplate/misc/cust_main-import_charges.cgi
+++ b/httemplate/misc/cust_main-import_charges.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Batch Customer Charge') %>
+<%= include("/elements/header.html",'Batch Customer Charge') %>
 <FORM ACTION="process/cust_main-import_charges.cgi" METHOD="post" ENCTYPE="multipart/form-data">
 Import a CSV file containing customer charges.<BR><BR>
 Default file format is CSV, with the following field order: <i>custnum, amount, description</i><BR><BR>
diff --git a/httemplate/misc/expire_pkg.cgi b/httemplate/misc/expire_pkg.cgi
index b59674a69..f8f69dafd 100755
--- a/httemplate/misc/expire_pkg.cgi
+++ b/httemplate/misc/expire_pkg.cgi
@@ -16,7 +16,7 @@ my $date = $cust_pkg->expire ? time2str('%D', $cust_pkg->expire) : '';
 
 %>
 
-<%= header('Expire package', menubar(
+<%= include("/elements/header.html",'Expire package', menubar(
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
   'Main Menu' => popurl(2)
 )) %>
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index 18cd378d3..e2bdda7d5 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -31,7 +31,7 @@ my $link_field2 = $link_field2{$svcdb};
 
 %>
 
-<%= header("Link to existing $svc") %>
+<%= include("/elements/header.html","Link to existing $svc") %>
 <FORM ACTION="<%= popurl(1) %>process/link.cgi" METHOD=POST>
 
 <% if ( $link_field ) { %>
diff --git a/httemplate/misc/meta-import.cgi b/httemplate/misc/meta-import.cgi
index 2f3b7380d..b2fcfe450 100644
--- a/httemplate/misc/meta-import.cgi
+++ b/httemplate/misc/meta-import.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Import') %>
+<%= include("/elements/header.html",'Import') %>
 <FORM ACTION="process/meta-import.cgi" METHOD="post" ENCTYPE="multipart/form-data">
 Import data from a DBI data source<BR><BR>
 
diff --git a/httemplate/misc/process/cust_main-import.cgi b/httemplate/misc/process/cust_main-import.cgi
index 9e1adce54..2348ef680 100644
--- a/httemplate/misc/process/cust_main-import.cgi
+++ b/httemplate/misc/process/cust_main-import.cgi
@@ -25,6 +25,6 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= header('Import sucessful') %> <%
+    <%= include("/elements/header.html",'Import sucessful') %> <%
   }
 %>
diff --git a/httemplate/misc/process/cust_main-import_charges.cgi b/httemplate/misc/process/cust_main-import_charges.cgi
index 14df1bd8d..c14228cf4 100644
--- a/httemplate/misc/process/cust_main-import_charges.cgi
+++ b/httemplate/misc/process/cust_main-import_charges.cgi
@@ -21,6 +21,6 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= header('Import sucessful') %> <%
+    <%= include("/elements/header.html",'Import sucessful') %> <%
   }
 %>
diff --git a/httemplate/misc/process/meta-import.cgi b/httemplate/misc/process/meta-import.cgi
index 59d236f64..4cdecafc4 100644
--- a/httemplate/misc/process/meta-import.cgi
+++ b/httemplate/misc/process/meta-import.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Map tables') %>
+<%= include("/elements/header.html",'Map tables') %>
 
 <SCRIPT>
 var gSafeOnload = new Array();
diff --git a/httemplate/misc/upload-batch.cgi b/httemplate/misc/upload-batch.cgi
index 5d0150177..24d7cf15c 100644
--- a/httemplate/misc/upload-batch.cgi
+++ b/httemplate/misc/upload-batch.cgi
@@ -24,7 +24,7 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= header('Batch results upload sucessful') %> <%
+    <%= include("/elements/header.html",'Batch results upload sucessful') %> <%
   }
 %>
 
diff --git a/httemplate/misc/whois.cgi b/httemplate/misc/whois.cgi
index dd7851dc2..919add42a 100644
--- a/httemplate/misc/whois.cgi
+++ b/httemplate/misc/whois.cgi
@@ -4,7 +4,7 @@
   my $domain = $cgi->param('domain');
 
 %>
-<%= header("Whois $domain", menubar(
+<%= include("/elements/header.html","Whois $domain", menubar(
   ( $custnum
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index 1677591a3..f18224fd1 100644
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -59,7 +59,7 @@
 
 %>
 
-<%= header( 'Prepaid Income (Unearned Revenue) Report',
+<%= include("/elements/header.html", 'Prepaid Income (Unearned Revenue) Report',
             menubar( 'Main Menu'=>$p, ) )               %>
 <%= table() %>
   <TR>
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 61ed26fac..0f33c4676 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -298,7 +298,7 @@ my $baselink   = $p. "search/cust_bill_pkg.cgi?$dateagentlink";
 my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink";
 %>
 
-<%= header( "$agentname Sales Tax Report - ".
+<%= include("/elements/header.html", "$agentname Sales Tax Report - ".
               ( $beginning
                   ? time2str('%h %o %Y ', $beginning )
                   : ''
diff --git a/httemplate/search/svc_external.cgi b/httemplate/search/svc_external.cgi
index c5ac13498..8dbb949c8 100755
--- a/httemplate/search/svc_external.cgi
+++ b/httemplate/search/svc_external.cgi
@@ -48,7 +48,7 @@ if ( scalar(@svc_external) == 1 ) {
 } else {
 %>
 <!-- mason kludge -->
-<%= header("External Search Results",'') %>
+<%= include("/elements/header.html","External Search Results",'') %>
 
     <%= scalar(@svc_external) %> matching external services found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 56c0c1736..45e19d436 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -23,7 +23,7 @@ my $custnum = $cust_bill->getfield('custnum');
 my $link = $templatename ? "$templatename-$invnum" : $invnum;
 
 %>
-<%= header('Invoice View', menubar(
+<%= include("/elements/header.html",'Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
 )) %>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 59c1a4b73..4975c52fd 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -12,7 +12,7 @@ foreach my $part_svc ( qsearch('part_svc',{}) ) {
 
 %>
 
-<%= header("Customer View", menubar(
+<%= include("/elements/header.html","Customer View", menubar(
   'Main Menu' => $p,
 )) %>
 
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index b42362d91..f4f39084c 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -37,7 +37,7 @@ my $domain = $svc_domain->domain;
 
 <% if ( $custnum ) { %>
 
-  <%= header("View $svc account", menubar(
+  <%= include("/elements/header.html","View $svc account", menubar(
     "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
     "Main menu" => $p,
   )) %>
@@ -54,7 +54,7 @@ my $domain = $svc_domain->domain;
   }
   </SCRIPT>
   
-  <%= header('Account View', menubar(
+  <%= include("/elements/header.html",'Account View', menubar(
     "Cancel this (unaudited) account" =>
             "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
     "Main menu" => $p,
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index f381b5ad3..263fd70f5 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -44,7 +44,7 @@ my (
    );
 %>
 
-<%=header('Broadband Service View', menubar(
+<%=include("/elements/header.html",'Broadband Service View', menubar(
   ( ( $custnum )
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 428f3e9bf..f39663094 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -32,7 +32,7 @@ my $domain = $svc_domain->domain;
 
 %>
 
-<%= header('Domain View', menubar(
+<%= include("/elements/header.html",'Domain View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
diff --git a/httemplate/view/svc_external.cgi b/httemplate/view/svc_external.cgi
index 49183cd95..2acc3f9cf 100644
--- a/httemplate/view/svc_external.cgi
+++ b/httemplate/view/svc_external.cgi
@@ -25,7 +25,7 @@ if ($pkgnum) {
 
 %>
 
-<%= header('External Service View', menubar(
+<%= include("/elements/header.html",'External Service View', menubar(
   ( ( $custnum )
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
-- 
cgit v1.2.1


From a5a4afbb77bbdffc25ae94d10b645b0bcc76e859 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 31 Jan 2006 11:02:54 +0000
Subject: *** empty log message ***

---
 FS/FS/Schema.pm                       |   1 +
 FS/FS/payby.pm                        | 125 ++++++++++++++++++++++++++++++++
 FS/MANIFEST                           |   2 +
 FS/t/payby.t                          |   5 ++
 htetc/handler.pl                      |   1 +
 httemplate/browse/part_bill_event.cgi | 133 +++++++++++++++++++++++-----------
 httemplate/edit/part_bill_event.cgi   | 126 ++++++++++++++++++++++----------
 7 files changed, 309 insertions(+), 84 deletions(-)
 create mode 100644 FS/FS/payby.pm
 create mode 100644 FS/t/payby.t

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index a0637f50c..33d0fd6d8 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -307,6 +307,7 @@ sub tables_hashref {
     'part_bill_event' => {
       'columns' => [
         'eventpart',    'serial',  '', '',
+        'freq',        'varchar',       'NULL',     $char_d,
         'payby',       'char',  '', 4,
         'event',       'varchar',           '',     $char_d,
         'eventcode',    @perl_type,
diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
new file mode 100644
index 000000000..3d43dff60
--- /dev/null
+++ b/FS/FS/payby.pm
@@ -0,0 +1,125 @@
+package FS::payby;
+
+use strict;
+use vars qw(%hash);
+use Tie::IxHash;
+
+=head1 NAME
+
+FS::payby - Object methods for payment type records
+
+=head1 SYNOPSIS
+
+  use FS::payby;
+
+  #for now...
+
+  my @payby = FS::payby->payby;
+
+  tie my %payby, 'Tie::IxHash', FS::payby->payby2longname
+
+  my @cust_payby = FS::payby->cust_payby;
+
+  tie my %payby, 'Tie::IxHash', FS::payby->cust_payby2longname
+
+=head1 DESCRIPTION
+
+Payment types.
+
+=head1 METHODS
+
+=over 4 
+
+=item
+
+=cut
+
+tie %hash, 'Tie::IxHash',
+  'CARD' => {
+    tinyname  => 'card',
+    shortname => 'Credit card',
+    longname  => 'Credit card (automatic)',
+  },
+  'DCRD' => {
+    tinyname  => 'card',
+    shortname => 'Credit card',
+    longname  => 'Credit card (on-demand)',
+    cust_pay  => 'CARD', #this is a customer type only, payments are CARD...
+  },
+  'CHEK' => {
+    tinyname  => 'check',
+    shortname => 'Electronic check',
+    longname  => 'Electronic check (automatic)',
+  },
+  'DCHK' => {
+    tinyname  => 'check',
+    shortname => 'Electronic check',
+    longname  => 'Electronic check (on-demand)',
+    cust_pay  => 'CHEK', #this is a customer type only, payments are CHEK...
+  },
+  'LECB' => {
+    tinyname  => 'phone bill',
+    shortname => 'Phone bill billing',
+    longname  => 'Phone bill billing',
+  },
+  'BILL' => {
+    tinyname  => 'billing',
+    shortname => 'Billing',
+    longname  => 'Billing',
+  },
+  'CASH' => {
+    tinyname  => 'cash',
+    shortname => 'Cash', # initial payment, then billing
+    longname  => 'Cash',
+    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+  },
+  'WEST' => {
+    tinyname  => 'western union',
+    shortname => 'Western Union', # initial payment, then billing
+    longname  => 'Western Union',
+    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+  },
+  'MCRD' => { #not the same as DCRD
+    tinyname  => 'card',
+    shortname => 'Manual credit card', # initial payment, then billing
+    longname  => 'Manual credit card', 
+    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+  },
+  'COMP' => {
+    tinyname  => 'comp',
+    shortname => 'Complimentary',
+    longname  => 'Complimentary',
+  },
+;
+
+sub payby {
+  keys %hash;
+}
+
+sub payby2longname {
+  my $self = shift;
+  map { $_ => $hash{$_}->{longname} } $self->payby;
+}
+
+sub cust_payby {
+  my $self = shift;
+  grep { ! exists $hash{$_}->{cust_main} } self->payby;
+}
+
+sub cust_payby2longname {
+  my $self = shift;
+  map { $_ => $hash{$_}->{longname} } $self->cust_payby;
+}
+
+=back
+
+=head1 BUGS
+
+This should eventually be an actual database table.
+
+=head1 SEE ALSO
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index c8f10f291..d8adfb9e0 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -125,6 +125,7 @@ FS/part_svc.pm
 FS/part_svc_column.pm
 FS/part_svc_router.pm
 FS/part_virtual_field.pm
+FS/payby.pm
 FS/pkg_class.pm
 FS/pkg_svc.pm
 FS/rate.pm
@@ -259,6 +260,7 @@ t/part_pop_local.t
 t/part_referral.t
 t/part_svc.t
 t/part_svc_column.t
+t/payby.t
 t/pkg_class.t
 t/pkg_svc.t
 t/port.t
diff --git a/FS/t/payby.t b/FS/t/payby.t
new file mode 100644
index 000000000..7430bc8e5
--- /dev/null
+++ b/FS/t/payby.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::payby;
+$loaded=1;
+print "ok 1\n";
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 2f2b0af4a..06060b20a 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -171,6 +171,7 @@ sub handler
       use FS::payment_gateway;
       use FS::agent_payment_gateway;
       use FS::XMLRPC;
+      use FS::payby;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index 5a89516df..0b6d0cb2b 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -1,6 +1,4 @@
-<!-- mason kludge -->
 <% 
-
 my %search;
 if ( $cgi->param('showdisabled') ) {
   %search = ();
@@ -10,13 +8,15 @@ if ( $cgi->param('showdisabled') ) {
 
 my @part_bill_event = qsearch('part_bill_event', \%search );
 my $total = scalar(@part_bill_event);
-
 %>
+
 <%= include("/elements/header.html",'Invoice Event Listing', menubar( 'Main Menu' => $p) ) %>
 
-    Invoice events are actions taken on overdue invoices.<BR><BR>
+    Invoice events are actions taken on open invoices.<BR><BR>
+
 <A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new invoice event</I></A>
 <BR><BR>
+
 <%= $total %> events
 <%= $cgi->param('showdisabled')
       ? do { $cgi->param('showdisabled', 0);
@@ -24,48 +24,93 @@ my $total = scalar(@part_bill_event);
       : do { $cgi->param('showdisabled', 1);
              '( <a href="'. $cgi->self_url. '">show disabled events</a> )'; }
 %>
-<%= table() %>
-  <TR>
-    <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Event</TH>
-    <TH>Payby</TH>
-    <TH>After</TH>
-    <TH>Action</TH>
-    <TH>Options</TH>
-    <TH>Code</TH>
-  </TR>
+<BR><BR>
+
+<% tie my %payby, 'Tie::IxHash', FS::payby->cust_payby2longname;
+   tie my %freq, 'Tie::IxHash', '1d' => 'daily', '1m' => 'monthly';
+   foreach my $payby ( keys %payby ) {
+     my $oldfreq = '';
+
+     my @payby_part_bill_event =  grep { $payby eq $_->payby }
+                                  sort {    $a->seconds   <=> $b->seconds
+                                         || $a->weight    <=> $b->weight
+                                         || $a->eventpart <=> $b->eventpart
+                                       }
+                                  @part_bill_event;
 
-<% foreach my $part_bill_event ( sort {    $a->payby     cmp $b->payby
-                                        || $a->seconds   <=> $b->seconds
-                                        || $a->weight    <=> $b->weight
-                                        || $a->eventpart <=> $b->eventpart
-                                      } @part_bill_event ) {
-     my $url = "${p}edit/part_bill_event.cgi?". $part_bill_event->eventpart;
-     use Time::Duration;
-     my $delay = duration_exact($part_bill_event->seconds);
-     my $plandata = $part_bill_event->plandata;
-     $plandata =~ s/\n/<BR>/go;
 %>
-  <TR>
-    <TD><A HREF="<%= $url %>">
-      <%= $part_bill_event->eventpart %></A></TD>
-<% unless ( $cgi->param('showdisabled') ) { %>
-    <TD>
-      <%= $part_bill_event->disabled ? 'DISABLED' : '' %></TD>
-<% } %>
-    <TD><A HREF="<%= $url %>">
-      <%= $part_bill_event->event %></A></TD>
-    <TD>
-      <%= $part_bill_event->payby %></TD>
-    <TD>
-      <%= $delay %></TD>
-    <TD>
-      <%= $part_bill_event->plan %></TD>
-    <TD>
-      <%= $plandata %></TD>
-    <TD><FONT SIZE="-1">
-      <%= $part_bill_event->eventcode %></FONT></TD>
-  </TR>
+
+  <% if ( @payby_part_bill_event ) { %>
+
+    <%= include('/elements/table-grid.html') %>
+  
+    <% my $bgcolor1 = '#eeeeee';
+       my $bgcolor2 = '#ffffff';
+       my $bgcolor;
+    %>
+  
+    <%
+       foreach my $part_bill_event ( @payby_part_bill_event ) {
+         my $url = "${p}edit/part_bill_event.cgi?". $part_bill_event->eventpart;
+         my $delay = duration_exact($part_bill_event->seconds);
+         ( my $plandata = $part_bill_event->plandata ) =~ s/\n/<BR>/go;
+         my $freq = $part_bill_event->freq || '1d';
+    %>
+  
+      <% if ( $oldfreq ne $freq ) { %>
+  
+        <TR>
+          <TH CLASS="grid" BGCOLOR="#999999" COLSPAN=<%= $cgi->param('showdisabled') ? 7 : 8 %>><%= ucfirst($freq{$freq}) %> event tests for <FONT SIZE="+1"><I><%= $payby{$payby} %> customers</I></FONT></TH>
+        </TR>
+      
+        <TR>
+          <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Event</TH>
+          <TH CLASS="grid" BGCOLOR="#cccccc">After</TH>
+          <TH CLASS="grid" BGCOLOR="#cccccc">Action</TH>
+          <TH CLASS="grid" BGCOLOR="#cccccc">Options</TH>
+          <TH CLASS="grid" BGCOLOR="#cccccc">Code</TH>
+        </TR>
+  
+        <%
+           $oldfreq = $freq;
+           $bgcolor = '';
+        %>
+  
+      <% } %>
+  
+      <%
+         if ( $bgcolor eq $bgcolor1 ) {
+            $bgcolor = $bgcolor2;
+          } else {
+            $bgcolor = $bgcolor1;
+          }
+      %>
+  
+      <TR>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF="<%= $url %>">
+          <%= $part_bill_event->eventpart %></A></TD>
+    <% unless ( $cgi->param('showdisabled') ) { %>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+          <%= $part_bill_event->disabled ? 'DISABLED' : '' %></TD>
+    <% } %>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF="<%= $url %>">
+          <%= $part_bill_event->event %></A></TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+          <%= $delay %></TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+          <%= $part_bill_event->plan %></TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+          <%= $plandata %></TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><FONT SIZE="-1">
+          <%= $part_bill_event->eventcode %></FONT></TD>
+      </TR>
+    <% } %>
+    </TABLE>
+    <BR><BR>
+
+  <% } %>
+
 <% } %>
-</TABLE>
+
 </BODY>
 </HTML>
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 32ca47af4..57eedbc71 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- mason kludge -->
+<!--mason kludge-->
 <%
 
 if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) {
@@ -23,48 +23,86 @@ if ( $query && $query =~ /^(\d+)$/ ) {
 $action ||= $part_bill_event->eventpart ? 'Edit' : 'Add';
 my $hashref = $part_bill_event->hashref;
 
-print header("$action Invoice Event Definition", menubar(
-  'Main Menu' => popurl(2),
-  'View all invoice events' => popurl(2). 'browse/part_bill_event.cgi',
-));
+%>
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+<%= include('/elements/header.html',
+      "$action Invoice Event Definition",
+      menubar(
+        'Main Menu' => popurl(2),
+        'View all invoice events' => popurl(2). 'browse/part_bill_event.cgi',
+      )
+    )
+%>
 
-print '<FORM ACTION="', popurl(1), 'process/part_bill_event.cgi" METHOD=POST>'.
-      '<INPUT TYPE="hidden" NAME="eventpart" VALUE="'.
-      $part_bill_event->eventpart  .'">';
-print "Invoice Event #", $hashref->{eventpart} ? $hashref->{eventpart} : "(NEW)";
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
 
-print ntable("#cccccc",2), <<END;
-<TR><TD ALIGN="right">Payby</TD><TD><SELECT NAME="payby">
-END
+<FORM ACTION="<%= popurl(1) %>process/part_bill_event.cgi" METHOD=POST>
+<INPUT TYPE="hidden" NAME="eventpart" VALUE="<%= $part_bill_event->eventpart %>">
+Invoice Event #<%= $hashref->{eventpart} ? $hashref->{eventpart} : "(NEW)" %>
 
-for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) {
-  print qq!<OPTION VALUE="$_"!;
-  if ($part_bill_event->payby eq $_) {
-    print " SELECTED>$_</OPTION>";
-  } else {
-    print ">$_</OPTION>";
-  }
-}
+<%=  ntable("#cccccc",2) %>
 
-my $days = $hashref->{seconds}/86400;
+  <TR>
+    <TD ALIGN="right">Event name </TD>
+    <TD><INPUT TYPE="text" NAME="event" VALUE="<%= $hashref->{event} %>"></TD>
+  </TR>
 
-print <<END;
-</SELECT></TD></TR>
-<TR><TD ALIGN="right">Event</TD><TD><INPUT TYPE="text" NAME="event" VALUE="$hashref->{event}"></TD></TR>
-<TR><TD ALIGN="right">After</TD><TD><INPUT TYPE="text" NAME="days" VALUE="$days"> days</TD></TR>
-END
+  <TR>
+    <TD ALIGN="right">For </TD>
+    <TD>
+      <SELECT NAME="payby">
+
+        <% tie my %payby, 'Tie::IxHash', FS::payby->cust_payby2longname;
+           foreach my $payby ( keys %payby ) {
+        %>
+
+          <OPTION VALUE="<%= $payby %>"<%= ($part_bill_event->payby eq $payby) ? ' SELECTED' : '' %>><%= $payby{$payby} %></OPTION>
+
+        <% } %>
+
+      </SELECT> customers
+    </TD>
+  </TR>
+
+  <% my $days = $hashref->{seconds}/86400; %>
 
-print '<TR><TD ALIGN="right">Disabled</TD><TD>';
-print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
-print ' CHECKED' if $hashref->{disabled} eq "Y";
-print '>';
-print '</TD></TR>';
+  <TR>
+    <TD ALIGN="right">After</TD>
+    <TD><INPUT TYPE="text" NAME="days" VALUE="<%= $days %>"> days</TD>
+  </TR>
 
-print '<TR><TD ALIGN="right">Action</TD><TD>';
+  <TR>
+    <TD ALIGN="right">Test event</TD>
+    <TD>
+      <SELECT NAME="freq">
+
+        <% tie my %freq, 'Tie::IxHash', '1d' => 'daily', '1m' => 'monthly';
+           foreach my $freq ( keys %freq ) {
+        %>
+
+          <OPTION VALUE="<%= $freq %>"<%= ($part_bill_event->freq eq $freq) ? ' SELECTED' : '' %>><%= $freq{$freq} %></OPTION>
+
+        <% } %>
+
+      </SELECT>
+    </TD>
+  </TR>
+
+
+  <TR>
+    <TD ALIGN="right">Disabled</TD>
+    <TD>
+      <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>>
+    </TD>
+  </TR>
+
+  <TR>
+    <TD VALIGN="top" ALIGN="right">Action</TD>
+    <TD>
+
+<%
 
 #print ntable();
 
@@ -113,7 +151,7 @@ tie my %events, 'Tie::IxHash',
     'code'   => '$cust_main->suspend();',
     'weight' => 10,
   },
-  'suspend' => {
+  'suspend-if-balance' => {
     'name'   => 'Suspend if balance (this invoice and previous) over',
     'code'   => '$cust_bill->cust_suspend_if_balance_over( %%%balanceover%%% );',
     'html'   => " $money_char ". '<INPUT TYPE="text" SIZE="7" NAME="balanceover" VALUE="%%%balanceover%%%">',
@@ -174,13 +212,13 @@ tie my %events, 'Tie::IxHash',
   },
 
   'send' => {
-    'name' => 'Send invoice (email/print)',
+    'name' => 'Send invoice (email/print/fax)',
     'code' => '$cust_bill->send();',
     'weight' => 50,
   },
 
   'send_alternate' => {
-    'name' => 'Send invoice (email/print) with alternate template',
+    'name' => 'Send invoice (email/print/fax) with alternate template',
     'code' => '$cust_bill->send(\'%%%templatename%%%\');',
     'html' =>
         '<INPUT TYPE="text" NAME="templatename" VALUE="%%%templatename%%%">',
@@ -188,7 +226,7 @@ tie my %events, 'Tie::IxHash',
   },
 
   'send_if_newest' => {
-    'name' => 'Send invoice (email/print) with alternate template, if it is still the newest invoice (useful for late notices - set to 31 days or later)',
+    'name' => 'Send invoice (email/print/fax) with alternate template, if it is still the newest invoice (useful for late notices - set to 31 days or later)',
     'code' => '$cust_bill->send_if_newest(\'%%%if_newest_templatename%%%\');',
     'html' =>
         '<INPUT TYPE="text" NAME="if_newest_templatename" VALUE="%%%if_newest_templatename%%%">',
@@ -196,7 +234,7 @@ tie my %events, 'Tie::IxHash',
   },
 
   'send_agent' => {
-    'name' => 'Send invoice (email/print) ',
+    'name' => 'Send invoice (email/print/fax) ',
     'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', [ %%%agentnum%%% ], \'%%%agent_invoice_from%%%\');',
     'html' => sub {
         '<TABLE BORDER=0>
@@ -263,6 +301,7 @@ tie my %events, 'Tie::IxHash',
     'code' => '$cust_bill->spool_csv(
                  \'format\' => \'%%%spoolformat%%%\',
                  \'dest\'   => \'%%%spooldest%%%\',
+                 \'balanceover\' => \'%%%spoolbalanceover%%%\',
                  \'agent_spools\' => \'%%%spoolagent_spools%%%\',
                );',
     'html' => sub {
@@ -303,6 +342,13 @@ tie my %events, 'Tie::IxHash',
        $html .=
            '</SELECT>'.
          '</TD></TR>'.
+
+       '<TR>'.
+         '<TD ALIGN="right">if balance (this invoice and previous) over </TD>'.
+         '<TD>'.
+           "$money_char ".
+           '<INPUT TYPE="text" SIZE="7" NAME="spoolbalanceover" VALUE="%%%spoolbalanceover%%%">'.
+         '</TD>'.
        '<TR><TD ALIGN="right">Individual per-agent spools? </TD>'.
          '<TD><INPUT TYPE="checkbox" NAME="spoolagent_spools" VALUE="1" '.
            ( $plandata->{'spoolagent_spools'} ? 'CHECKED' : '' ).
-- 
cgit v1.2.1


From 87d6769f31ddd6826211db1a9784ca8dc2297391 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 31 Jan 2006 15:01:41 +0000
Subject: oops, forgot $

---
 FS/FS/payby.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 3d43dff60..4425df040 100644
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -103,7 +103,7 @@ sub payby2longname {
 
 sub cust_payby {
   my $self = shift;
-  grep { ! exists $hash{$_}->{cust_main} } self->payby;
+  grep { ! exists $hash{$_}->{cust_main} } $self->payby;
 }
 
 sub cust_payby2longname {
-- 
cgit v1.2.1


From 56d54e6cb3d973558e3cb10d8673762b2fa19e67 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Feb 2006 07:58:09 +0000
Subject: HEAD isn't 1.5.8 anymore

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2c5abf9c9..dae5f23b4 100644
--- a/Makefile
+++ b/Makefile
@@ -102,8 +102,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.7/
 
-VERSION=1.5.8cvs
-TAG=freeside_1_5_8
+VERSION=1.7.0cvs
+TAG=freeside_1_7_0
 
 help:
 	@echo "supported targets:"
-- 
cgit v1.2.1


From a9c8414692c1777da3ff78b83a1e6bbb0729f6eb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Feb 2006 23:13:48 +0000
Subject: finish adding freeside-monthly and monthly events

---
 FS/FS/Cron/backup.pm                  |  43 +++++++++
 FS/FS/Cron/bill.pm                    | 119 +++++++++++++++++++++++++
 FS/FS/Cron/vacuum.pm                  |  23 +++++
 FS/FS/cust_bill.pm                    |   7 ++
 FS/FS/cust_main.pm                    |  31 ++++---
 FS/MANIFEST                           |   6 ++
 FS/bin/freeside-daily                 | 160 ++++------------------------------
 FS/bin/freeside-monthly               |  91 +++++++++++++++++++
 FS/t/Cron-backup.t                    |   5 ++
 FS/t/Cron-bill.t                      |   5 ++
 FS/t/Cron-vacuum.t                    |   5 ++
 httemplate/browse/part_bill_event.cgi |   3 +-
 12 files changed, 340 insertions(+), 158 deletions(-)
 create mode 100644 FS/FS/Cron/backup.pm
 create mode 100644 FS/FS/Cron/bill.pm
 create mode 100644 FS/FS/Cron/vacuum.pm
 create mode 100755 FS/bin/freeside-monthly
 create mode 100644 FS/t/Cron-backup.t
 create mode 100644 FS/t/Cron-bill.t
 create mode 100644 FS/t/Cron-vacuum.t

diff --git a/FS/FS/Cron/backup.pm b/FS/FS/Cron/backup.pm
new file mode 100644
index 000000000..204069a12
--- /dev/null
+++ b/FS/FS/Cron/backup.pm
@@ -0,0 +1,43 @@
+package FS::Cron::backup;
+
+use strict;
+use vars qw( @ISA @EXPORT_OK );
+use Exporter;
+use FS::UID qw(driver_name datasrc);
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( backup_scp );
+
+sub backup_scp {
+  my $conf = new FS::Conf;
+  my $dest = $conf->config('dump-scpdest');
+  if ( $dest ) {
+    datasrc =~ /dbname=([\w\.]+)$/ or die "unparsable datasrc ". datasrc;
+    my $database = $1;
+    eval "use Net::SCP qw(scp);";
+    die $@ if $@;
+    if ( driver_name eq 'Pg' ) {
+      system("pg_dump $database >/var/tmp/$database.sql")
+    } else {
+      die "database dumps not yet supported for ". driver_name;
+    }
+    if ( $conf->config('dump-pgpid') ) {
+      eval 'use GnuPG;';
+      die $@ if $@;
+      my $gpg = new GnuPG;
+      $gpg->encrypt( plaintext => "/var/tmp/$database.sql",
+                     output    => "/var/tmp/$database.gpg",
+                     recipient => $conf->config('dump-pgpid'),
+                   );
+      chmod 0600, '/var/tmp/$database.gpg';
+      scp("/var/tmp/$database.gpg", $dest);
+      unlink "/var/tmp/$database.gpg" or die $!;
+    } else {
+      chmod 0600, '/var/tmp/$database.sql';
+      scp("/var/tmp/$database.sql", $dest);
+    }
+    unlink "/var/tmp/$database.sql" or die $!;
+  }
+}
+
+1;
diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
new file mode 100644
index 000000000..774bf3006
--- /dev/null
+++ b/FS/FS/Cron/bill.pm
@@ -0,0 +1,119 @@
+package FS::Cron::bill;
+
+use strict;
+use vars qw( @ISA @EXPORT_OK );
+use Exporter;
+use Date::Parse;
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main;
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw ( bill );
+
+sub bill {
+
+  my %opt = @_;
+
+  $FS::cust_main::DEBUG = 1 if $opt{'v'};
+  
+  my %search = ();
+  $search{'payby'}    = $opt{'p'} if $opt{'p'};
+  $search{'agentnum'} = $opt{'a'} if $opt{'a'};
+  
+  #we're at now now (and later).
+  my($time)= $opt{'d'} ? str2time($opt{'d'}) : $^T;
+  $time += $opt{'y'} * 86400 if $opt{'y'};
+
+  # select * from cust_main where
+  my $where_pkg = <<"END";
+    0 < ( select count(*) from cust_pkg
+            where cust_main.custnum = cust_pkg.custnum
+              and ( cancel is null or cancel = 0 )
+              and (    setup is null or setup =  0
+                    or bill  is null or bill  <= $time 
+                    or ( expire is not null and expire <= $^T )
+                  )
+        )
+END
+  
+  # or
+  my $where_bill_event = <<"END";
+    0 < ( select count(*) from cust_bill
+            where cust_main.custnum = cust_bill.custnum
+              and 0 < charged
+                      - coalesce(
+                                  ( select sum(amount) from cust_bill_pay
+                                      where cust_bill.invnum = cust_bill_pay.invnum )
+                                  ,0
+                                )
+                      - coalesce(
+                                  ( select sum(amount) from cust_credit_bill
+                                      where cust_bill.invnum = cust_credit_bill.invnum )
+                                  ,0
+                                )
+              and 0 < ( select count(*) from part_bill_event
+                          where payby = cust_main.payby
+                            and ( disabled is null or disabled = '' )
+                            and seconds <= $time - cust_bill._date
+                            and 0 = ( select count(*) from cust_bill_event
+                                       where cust_bill.invnum = cust_bill_event.invnum
+                                         and part_bill_event.eventpart = cust_bill_event.eventpart
+                                         and status = 'done'
+                                    )
+  
+                      )
+        )
+END
+  
+  my $extra_sql = ( scalar(%search) ? ' AND ' : ' WHERE ' ). "( $where_pkg OR $where_bill_event )";
+  
+  my @cust_main;
+  if ( @ARGV ) {
+    @cust_main = map { qsearchs('cust_main', { custnum => $_, %search } ) } @ARGV
+  } else {
+    @cust_main = qsearch('cust_main', \%search, '', $extra_sql );
+  }
+  ;
+  
+  my($cust_main,%saw);
+  foreach $cust_main ( @cust_main ) {
+  
+    # $^T not $time because -d is for pre-printing invoices
+    foreach my $cust_pkg (
+      grep { $_->expire && $_->expire <= $^T } $cust_main->ncancelled_pkgs
+    ) {
+      my $error = $cust_pkg->cancel;
+      warn "Error cancelling expired pkg ". $cust_pkg->pkgnum. " for custnum ".
+           $cust_main->custnum. ": $error"
+        if $error;
+    }
+    # $^T not $time because -d is for pre-printing invoices
+    foreach my $cust_pkg (
+      grep { $_->part_pkg->is_prepaid
+             && $_->bill && $_->bill < $^T && ! $_->susp
+           }
+           $cust_main->ncancelled_pkgs
+    ) {
+      my $error = $cust_pkg->suspend;
+      warn "Error suspending package ". $cust_pkg->pkgnum.
+           " for custnum ". $cust_main->custnum.
+           ": $error"
+        if $error;
+    }
+  
+    my $error = $cust_main->bill( 'time'    => $time,
+                                  'resetup' => $opt{'s'},
+                                );
+    warn "Error billing, custnum ". $cust_main->custnum. ": $error" if $error;
+  
+    $cust_main->apply_payments;
+    $cust_main->apply_credits;
+  
+    $error = $cust_main->collect( 'invoice_time' => $time,
+                                  'freq'         => $opt{'freq'},
+                                );
+    warn "Error collecting, custnum". $cust_main->custnum. ": $error" if $error;
+  
+  }
+
+}
diff --git a/FS/FS/Cron/vacuum.pm b/FS/FS/Cron/vacuum.pm
new file mode 100644
index 000000000..075572d50
--- /dev/null
+++ b/FS/FS/Cron/vacuum.pm
@@ -0,0 +1,23 @@
+package FS::Cron::vacuum;
+
+use vars qw( @ISA @EXPORT_OK);
+use Exporter;
+use FS::UID qw(driver_name dbh);
+use FS::Schema qw(dbdef);
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( vacuum );
+
+sub vacuum {
+
+  if ( driver_name eq 'Pg' ) {
+    dbh->{AutoCommit} = 1; #so we can vacuum
+    foreach my $table ( dbdef->tables ) {
+      my $sth = dbh->prepare("VACUUM ANALYZE $table") or die dbh->errstr;
+      $sth->execute or die $sth->errstr;
+    }
+  }
+
+}
+
+1;
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 159c9e405..cce028b2c 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -836,6 +836,8 @@ Options are:
 
 =item agent_spools - if set to a true value, will spool to per-agent files rather than a single global file
 
+=item balanceover - if set, only spools the invoice if the total amount owed on this invoice and all older invoices is greater than the specified amount.
+
 =back
 
 =cut
@@ -852,6 +854,11 @@ sub spool_csv {
                      || ! keys %invoicing_list;
   }
 
+  if ( $opt{'balanceover'} ) {
+    return 'N/A'
+      if $cust_main->total_owed_date($self->_date) < $opt{'balanceover'};
+  }
+
   my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/cust_bill";
   mkdir $spooldir, 0700 unless -d $spooldir;
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b5ccf5a3f..973fe7c81 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -118,8 +118,6 @@ FS::cust_main - Object methods for cust_main records
   $error = $record->collect;
   $error = $record->collect %options;
   $error = $record->collect 'invoice_time'   => $time,
-                            'batch_card'     => 'yes',
-                            'report_badcard' => 'yes',
                           ;
 
 =head1 DESCRIPTION
@@ -1886,7 +1884,7 @@ sub bill {
                   $dbh->rollback if $oldAutoCommit;
                   return "fatal: can't lookup exising exemption: ". dbh->errstr;
                 };
-                my $existing_exemption = $sth->fetchrow_arrayref->[0];
+                my $existing_exemption = $sth->fetchrow_arrayref->[0] || 0;
                 
                 my $remaining_exemption =
                   $tax->exempt_amount - $existing_exemption;
@@ -2001,17 +1999,11 @@ for conversion functions.
 retry - Retry card/echeck/LEC transactions even when not scheduled by invoice
 events.
 
-retry_card - Deprecated alias for 'retry'
-
-batch_card - This option is deprecated.  See the invoice events web interface
-to control whether cards are batched or run against a realtime gateway.
-
-report_badcard - This option is deprecated.
-
-force_print - This option is deprecated; see the invoice events web interface.
-
 quiet - set true to surpress email card/ACH decline notices.
 
+freq - "1d" for the traditional, daily events (the default), or "1m" for the
+new monthly events
+
 =cut
 
 sub collect {
@@ -2052,6 +2044,13 @@ sub collect {
     }
   }
 
+  my $extra_sql = '';
+  if ( defined $options{'freq'} && $options{'freq'} eq '1m' ) {
+    $extra_sql = " AND freq = '1m' ";
+  } else {
+    $extra_sql = " AND ( freq = '1d' OR freq IS NULL OR freq = '' ) ";
+  }
+
   foreach my $cust_bill ( $self->open_cust_bill ) {
 
     # don't try to charge for the same invoice if it's already in a batch
@@ -2073,8 +2072,12 @@ sub collect {
                                 'status'    => 'done',
                                                                    } )
              }
-          qsearch('part_bill_event', { 'payby'    => $self->payby,
-                                       'disabled' => '',           } )
+          qsearch( {
+            'table'     => 'part_bill_event',
+            'hashref'   => { 'payby'    => $self->payby,
+                             'disabled' => '',           },
+            'extra_sql' => $extra_sql,
+          } )
     ) {
 
       last if $cust_bill->owed <= 0  # don't run subsequent events if owed<=0
diff --git a/FS/MANIFEST b/FS/MANIFEST
index d8adfb9e0..452041e35 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -33,6 +33,9 @@ FS/ClientAPI/passwd.pm
 FS/ClientAPI/MyAccount.pm
 FS/Conf.pm
 FS/ConfItem.pm
+FS/Cron/backup.pm
+FS/Cron/bill.pm
+FS/Cron/vacuum.pm
 FS/Daemon.pm
 FS/Misc.pm
 FS/Record.pm
@@ -167,6 +170,9 @@ t/ClientAPI.t
 t/ClientAPI_SessionCache.t
 t/Conf.t
 t/ConfItem.t
+t/Cron-backup.t
+t/Cron-bill.t
+t/Cron-vacuum.t
 t/Daemon.t
 t/Misc.t
 t/Record.t
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 603da12b8..b9742c4d1 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -1,157 +1,29 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Fcntl qw(:flock);
-use Date::Parse;
 use Getopt::Std;
-use FS::UID qw(adminsuidsetup driver_name dbh datasrc);
-use FS::Record qw(qsearch qsearchs dbdef);
-use FS::Conf;
-use FS::cust_main;
+use FS::UID qw(adminsuidsetup);
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_d $opt_v $opt_p $opt_a $opt_s $opt_y);
-getopts("p:a:d:vsy:");
-my $user = shift or die &usage;
+#use vars qw($opt_d $opt_v $opt_p $opt_a $opt_s $opt_y);
+use vars qw(%opt);
+getopts("p:a:d:vsy:", \%opt);
 
+my $user = shift or die &usage;
 adminsuidsetup $user;
 
-$FS::cust_main::DEBUG = 1 if $opt_v;
-
-my %search = ();
-$search{'payby'}    = $opt_p if $opt_p;
-$search{'agentnum'} = $opt_a if $opt_a;
-
-#we're at now now (and later).
-my($time)= $opt_d ? str2time($opt_d) : $^T;
-$time += $opt_y * 86400 if $opt_y;
-
-# select * from cust_main where
-my $where_pkg = <<"END";
-  0 < ( select count(*) from cust_pkg
-          where cust_main.custnum = cust_pkg.custnum
-            and ( cancel is null or cancel = 0 )
-            and (    setup is null or setup =  0
-                  or bill  is null or bill  <= $time 
-                  or ( expire is not null and expire <= $^T )
-                )
-      )
-END
-
-# or
-my $where_bill_event = <<"END";
-  0 < ( select count(*) from cust_bill
-          where cust_main.custnum = cust_bill.custnum
-            and 0 < charged
-                    - coalesce(
-                                ( select sum(amount) from cust_bill_pay
-                                    where cust_bill.invnum = cust_bill_pay.invnum )
-                                ,0
-                              )
-                    - coalesce(
-                                ( select sum(amount) from cust_credit_bill
-                                    where cust_bill.invnum = cust_credit_bill.invnum )
-                                ,0
-                              )
-            and 0 < ( select count(*) from part_bill_event
-                        where payby = cust_main.payby
-                          and ( disabled is null or disabled = '' )
-                          and seconds <= $time - cust_bill._date
-                          and 0 = ( select count(*) from cust_bill_event
-                                     where cust_bill.invnum = cust_bill_event.invnum
-                                       and part_bill_event.eventpart = cust_bill_event.eventpart
-                                       and status = 'done'
-                                  )
-
-                    )
-      )
-END
-
-my $extra_sql = ( scalar(%search) ? ' AND ' : ' WHERE ' ). "( $where_pkg OR $where_bill_event )";
-
-my @cust_main;
-if ( @ARGV ) {
-  @cust_main = map { qsearchs('cust_main', { custnum => $_, %search } ) } @ARGV
-} else {
-  @cust_main = qsearch('cust_main', \%search, '', $extra_sql );
-}
-;
-
-my($cust_main,%saw);
-foreach $cust_main ( @cust_main ) {
-
-  # $^T not $time because -d is for pre-printing invoices
-  foreach my $cust_pkg (
-    grep { $_->expire && $_->expire <= $^T } $cust_main->ncancelled_pkgs
-  ) {
-    my $error = $cust_pkg->cancel;
-    warn "Error cancelling expired pkg ". $cust_pkg->pkgnum. " for custnum ".
-         $cust_main->custnum. ": $error"
-      if $error;
-  }
-  # $^T not $time because -d is for pre-printing invoices
-  foreach my $cust_pkg (
-    grep { $_->part_pkg->is_prepaid
-           && $_->bill && $_->bill < $^T && ! $_->susp
-         }
-         $cust_main->ncancelled_pkgs
-  ) {
-    my $error = $cust_pkg->suspend;
-    warn "Error suspending package ". $cust_pkg->pkgnum.
-         " for custnum ". $cust_main->custnum.
-         ": $error"
-      if $error;
-  }
+use FS::Cron::bill qw(bill);
+bill(%opt);
 
-  my $error = $cust_main->bill( 'time'    => $time,
-                                'resetup' => $opt_s, );
-  warn "Error billing, custnum ". $cust_main->custnum. ": $error" if $error;
+use FS::Cron::vacuum qw(vacuum);
+vacuum();
 
-  $cust_main->apply_payments;
-  $cust_main->apply_credits;
-
-  $error = $cust_main->collect( 'invoice_time' => $time );
-  warn "Error collecting, custnum". $cust_main->custnum. ": $error" if $error;
-
-}
-
-if ( driver_name eq 'Pg' ) {
-  dbh->{AutoCommit} = 1; #so we can vacuum
-  foreach my $table ( dbdef->tables ) {
-    my $sth = dbh->prepare("VACUUM ANALYZE $table") or die dbh->errstr;
-    $sth->execute or die $sth->errstr;
-  }
-}
-
-my $conf = new FS::Conf;
-my $dest = $conf->config('dump-scpdest');
-if ( $dest ) {
-  datasrc =~ /dbname=([\w\.]+)$/ or die "unparsable datasrc ". datasrc;
-  my $database = $1;
-  eval "use Net::SCP qw(scp);";
-  if ( driver_name eq 'Pg' ) {
-    system("pg_dump $database >/var/tmp/$database.sql")
-  } else {
-    die "database dumps not yet supported for ". driver_name;
-  }
-  if ( $conf->config('dump-pgpid') ) {
-    eval 'use GnuPG';
-    my $gpg = new GnuPG;
-    $gpg->encrypt( plaintext => "/var/tmp/$database.sql",
-                   output    => "/var/tmp/$database.gpg",
-                   recipient => $conf->config('dump-pgpid'),
-                 );
-    chmod 0600, '/var/tmp/$database.gpg';
-    scp("/var/tmp/$database.gpg", $dest);
-    unlink "/var/tmp/$database.gpg" or die $!;
-  } else {
-    chmod 0600, '/var/tmp/$database.sql';
-    scp("/var/tmp/$database.sql", $dest);
-  }
-  unlink "/var/tmp/$database.sql" or die $!;
-}
+use FS::Cron::backup qw(backup_scp);
+backup_scp();
 
+###
 # subroutines
+###
 
 sub untaint_argv {
   foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
@@ -166,6 +38,10 @@ sub usage {
   die "Usage:\n\n  freeside-daily [ -d 'date' ] user [ custnum custnum ... ]\n";
 }
 
+###
+# documentation
+###
+
 =head1 NAME
 
 freeside-daily - Run daily billing and invoice collection events.
@@ -179,8 +55,6 @@ freeside-daily - Run daily billing and invoice collection events.
 Bills customers and runs invoice collection events.  Should be run from
 crontab daily.
 
-This script replaces freeside-bill from 1.3.1.
-
 Bills customers.  Searches for customers who are due for billing and calls
 the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
diff --git a/FS/bin/freeside-monthly b/FS/bin/freeside-monthly
new file mode 100755
index 000000000..a6c75e715
--- /dev/null
+++ b/FS/bin/freeside-monthly
@@ -0,0 +1,91 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Getopt::Std;
+use FS::UID qw(adminsuidsetup);
+
+&untaint_argv;	#what it sounds like  (eww)
+#use vars qw($opt_d $opt_v $opt_p $opt_a $opt_s $opt_y);
+use vars qw(%opt);
+getopts("p:a:d:vsy:", \%opt);
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+use FS::Cron::bill qw(bill);
+bill(%opt, 'freq'=>'1m' );
+
+###
+# subroutines
+###
+
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    #$ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    # Date::Parse
+    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-monthly [ -d 'date' ] user [ custnum custnum ... ]\n";
+}
+
+###
+# documentation
+###
+
+=head1 NAME
+
+freeside-monthly - Run monthly billing and invoice collection events.
+
+=head1 SYNOPSIS
+
+  freeside-monthly [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] user [ custnum custnum ... ]
+
+=head1 DESCRIPTION
+
+Bills customers and runs invoice collection events, for the alternate monthly
+event chain.  If you have defined monthly event checks, should be run from
+crontab monthly.
+
+Bills customers.  Searches for customers who are due for billing and calls
+the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
+
+  -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
+      but be careful.
+
+  -y: In addition to -d, which specifies an absolute date, the -y switch
+      specifies an offset, in days.  For example, "-y 15" would increment the
+      "pretend date" 15 days from whatever was specified by the -d switch
+      (or now, if no -d switch was given).
+
+  -p: Only process customers with the specified payby (I<CARD>, I<DCRD>, I<CHEK>, I<DCHK>, I<BILL>, I<COMP>, I<LECB>)
+
+  -a: Only process customers with the specified agentnum
+
+  -s: re-charge setup fees
+
+  -v: enable debugging
+
+user: From the mapsecrets file - see config.html from the base documentation
+
+custnum: if one or more customer numbers are specified, only bills those
+customers.  Otherwise, bills all customers.
+
+=head1 NOTE
+
+In most cases, you would use freeside-daily only and not freeside-monthly.
+freeside-monthly would only be used in cases where you have events that can
+only be run once each month, for example, batching invoices to a third-party
+print/mail provider.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<freeside-daily>, L<FS::cust_main>, config.html from the base documentation
+
+=cut
+
diff --git a/FS/t/Cron-backup.t b/FS/t/Cron-backup.t
new file mode 100644
index 000000000..847d41aed
--- /dev/null
+++ b/FS/t/Cron-backup.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::Cron::backup;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/Cron-bill.t b/FS/t/Cron-bill.t
new file mode 100644
index 000000000..42c7b4f9e
--- /dev/null
+++ b/FS/t/Cron-bill.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::Cron::bill;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/Cron-vacuum.t b/FS/t/Cron-vacuum.t
new file mode 100644
index 000000000..eaa6b762a
--- /dev/null
+++ b/FS/t/Cron-vacuum.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::Cron::vacuum;
+$loaded=1;
+print "ok 1\n";
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index 0b6d0cb2b..380e4d78b 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -32,7 +32,8 @@ my $total = scalar(@part_bill_event);
      my $oldfreq = '';
 
      my @payby_part_bill_event =  grep { $payby eq $_->payby }
-                                  sort {    $a->seconds   <=> $b->seconds
+                                  sort {    $a->freq      cmp $b->freq # for now
+                                         || $a->seconds   <=> $b->seconds
                                          || $a->weight    <=> $b->weight
                                          || $a->eventpart <=> $b->eventpart
                                        }
-- 
cgit v1.2.1


From 860e628d3d0d2ba432d401de5c9d4784c918be54 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 5 Feb 2006 12:27:20 +0000
Subject: payment gateway editing

---
 FS/FS/option_Common.pm                       |   2 +-
 httemplate/browse/payment_gateway.html       |  11 +--
 httemplate/edit/payment_gateway.html         | 103 ++++++++++++++++-----------
 httemplate/edit/process/payment_gateway.html |   2 +-
 4 files changed, 70 insertions(+), 48 deletions(-)

diff --git a/FS/FS/option_Common.pm b/FS/FS/option_Common.pm
index f258fa1d6..ad3c26958 100644
--- a/FS/FS/option_Common.pm
+++ b/FS/FS/option_Common.pm
@@ -140,7 +140,7 @@ sub delete {
 
 }
 
-=item replace [ HASHREF | OPTION => VALUE ... ]
+=item replace OLD_RECORD [ HASHREF | OPTION => VALUE ... ]
 
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
diff --git a/httemplate/browse/payment_gateway.html b/httemplate/browse/payment_gateway.html
index 002932ccd..791906b78 100644
--- a/httemplate/browse/payment_gateway.html
+++ b/httemplate/browse/payment_gateway.html
@@ -40,10 +40,13 @@
       <TD><%= $payment_gateway->disabled ? 'DISABLED' : '' %></TD>
     <% } %>
     <TD><%= $payment_gateway->gateway_module %>
-      <%= !$payment_gateway->disabled 
-            ? '<FONT SIZE="-1"> <A HREF="misc/disable-payment_gateway.cgi?'. $payment_gateway->gatewaynum.'">(disable)</A></FONT>'
-            : ''
-      %>
+      <FONT SIZE="-1">
+        <A HREF="<%=$p%>edit/payment_gateway.html?<%= $payment_gateway->gatewaynum %>">(edit)</A>
+        <%= !$payment_gateway->disabled 
+              ? '<A HREF="'. $p. 'misc/disable-payment_gateway.cgi?'. $payment_gateway->gatewaynum.'">(disable)</A>'
+              : ''
+        %>
+      </FONT>
     </TD>
     <TD><%= $payment_gateway->gateway_username %></TD>
     <TD> - </TD>
diff --git a/httemplate/edit/payment_gateway.html b/httemplate/edit/payment_gateway.html
index cf825df00..1eda11249 100644
--- a/httemplate/edit/payment_gateway.html
+++ b/httemplate/edit/payment_gateway.html
@@ -34,70 +34,89 @@ Gateway #<%= $payment_gateway->gatewaynum || "(NEW)" %>
 
 <TR>
   <TH ALIGN="right">Gateway: </TH>
-  <TD><SELECT NAME="gateway_module" SIZE=1>
-    <% foreach my $module ( qw(
-         2CheckOut
-         AuthorizeNet
-         BankOfAmerica
-         Beanstream
-         Capstone
-         Cardstream
-         CashCow
-         CyberSource
-         eSec
-         eSelectPlus
-         Exact
-         iAuthorizer
-         IPaymentTPG
-         Jettis
-         LinkPoint
-         MerchantCommerce
-         Network1Financial
-         OCV
-         OpenECHO
-         PayConnect
-         PayflowPro
-         PaymentsGateway
-         PXPost
-         SecureHostingUPG
-         Skipjack
-         StGeorge
-         SurePay
-         TCLink
-         TransactionCentral
-         VirtualNet
-       ) ) {
-    %>
-      <OPTION VALUE="<%= $module %>"><%= $module %>
+  <TD>
+
+    <% if ( $payment_gateway->gatewaynum ) { %>
+
+      <%= $payment_gateway->gateway_module %>
+      <INPUT TYPE="hidden" NAME="gateway_module" VALUE="<%= $payment_gateway->gateway_module %>">
+
+    <% } else { %>
+
+      <SELECT NAME="gateway_module" SIZE=1>
+        <% foreach my $module ( qw(
+             2CheckOut
+             AuthorizeNet
+             BankOfAmerica
+             Beanstream
+             Capstone
+             Cardstream
+             CashCow
+             CyberSource
+             eSec
+             eSelectPlus
+             Exact
+             iAuthorizer
+             IPaymentTPG
+             Jettis
+             LinkPoint
+             MerchantCommerce
+             Network1Financial
+             OCV
+             OpenECHO
+             PayConnect
+             PayflowPro
+             PaymentsGateway
+             PXPost
+             SecureHostingUPG
+             Skipjack
+             StGeorge
+             SurePay
+             TCLink
+             TransactionCentral
+             VirtualNet
+           ) ) {
+        %>
+          <OPTION VALUE="<%= $module %>"><%= $module %>
+        <% } %>
+      </SELECT>
+
     <% } %>
-    </SELECT>
+
   </TD>
 </TR>
 
 <TR>
   <TH ALIGN="right">Username: </TH>
-  <TD><INPUT TYPE="text" NAME="gateway_username"></TD>
+  <TD><INPUT TYPE="text" NAME="gateway_username" VALUE="<%= $payment_gateway->gateway_username %>"></TD>
 </TR>
 
 <TR>
   <TH ALIGN="right">Password: </TH>
-  <TD><INPUT TYPE="text" NAME="gateway_password"></TD>
+  <TD><INPUT TYPE="text" NAME="gateway_password" VALUE="<%= $payment_gateway->gateway_password %>"></TD>
 </TR>
 
 <TR>
   <TH ALIGN="right">Action: </TH>
   <TD>
     <SELECT NAME="gateway_action" SIZE=1>
-      <OPTION VALUE="Normal Authorization">Normal Authorization
-      <OPTION VALUE="Authorization Only">Authorization Only
-      <OPTION VALUE="Authorization Only, Post Authorization">Authorization Only, Post Authorization
+      <% foreach my $action ( 
+                              'Normal Authorization',
+                              'Authorization Only',
+                              'Authorization Only, Post Authorization',
+                            ) {
+      %>
+        <OPTION VALUE="<%= $action %>"<%= $action eq $payment_gateway->gateway_action ? ' SELECTED' : '' %>><%= $action %>
+      <% } %>
     </SELECT>
   </TD>
 </TR>
 
 <TR>
   <TH ALIGN="right">Options: </TH>
-  <TD><TEXTAREA ROWS="5" NAME="gateway_options"></TEXTAREA></TD>
+  <TD>
+    <TEXTAREA ROWS="5" NAME="gateway_options"><%= join("\r", $payment_gateway->options ) %></TEXTAREA>
+  </TD>
 </TR>
 
 </TABLE>
diff --git a/httemplate/edit/process/payment_gateway.html b/httemplate/edit/process/payment_gateway.html
index b9e4d47da..42205a02d 100644
--- a/httemplate/edit/process/payment_gateway.html
+++ b/httemplate/edit/process/payment_gateway.html
@@ -17,7 +17,7 @@ my %options = @options;
 
 my $error;
 if ( $gatewaynum ) {
-  $error=$new->replace($old);
+  $error=$new->replace($old, \%options);
 } else {
   $error=$new->insert(\%options);
   $gatewaynum=$new->getfield('gatewaynum');
-- 
cgit v1.2.1


From 1acbcf55d8cd4675408f8ad3406f431623918c8d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Feb 2006 11:12:29 +0000
Subject: remove inadvertant extra table statement preventing page from showing
 up in konq

---
 httemplate/edit/cust_pay.cgi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 94fd06ca5..a03a245eb 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -52,8 +52,6 @@ $title .= " against Invoice #$linknum" if $link eq 'invnum';
 <BR><BR>
 <% } %>
 
-<%= ntable("#cccccc",2) %>
-
 <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-- 
cgit v1.2.1


From b5bf46cd466f032971095ace1d26af0b98921ada Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Feb 2006 13:49:44 +0000
Subject: well, it was already fatal.  at least now the error message is
 better.

---
 FS/FS/svc_acct.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c1851d3ce..759d7372e 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1077,7 +1077,10 @@ sub radius_check {
   my $password = $self->_password;
   my $pw_attrib = length($password) <= 12 ? $radius_password : 'Crypt-Password';  $check{$pw_attrib} = $password;
 
-  my $cust_pkg = $self->cust_svc->cust_pkg;
+  my $cust_svc = $self->cust_svc;
+  die "FATAL: no cust_svc record for svc_acct.svcnum ". $self->svcnum. "\n"
+    unless $cust_svc;
+  my $cust_pkg = $cust_svc->cust_pkg;
   if ( $cust_pkg && $cust_pkg->part_pkg->is_prepaid && $cust_pkg->bill ) {
     $check{'Expiration'} = time2str('%B %e %Y %T', $cust_pkg->bill ); #http://lists.cistron.nl/pipermail/freeradius-users/2005-January/040184.html
   }
-- 
cgit v1.2.1


From 7279a60bfb12751895e06dfa4bad60e32a7d7376 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Feb 2006 02:26:23 +0000
Subject: update error message when secrets file cannot be found

---
 FS/FS/UID.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index c0c9f7af4..83b652b0f 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -262,7 +262,7 @@ sub getsecrets {
   $secrets = $1;
   die "Illegal mapsecrets line for user?!" unless $secrets;
   ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
-    or die "Can't get secrets: $!";
+    or die "Can't get secrets: $secrets: $!\n";
   $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
   undef $driver_name;
   ($datasrc, $db_user, $db_pass);
-- 
cgit v1.2.1


From 4c9e6e4863e2045d984933ab0e229b5dd500e1f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Feb 2006 03:50:42 +0000
Subject: slightly html-ize the 1.5.8 upgrade instructions

---
 httemplate/docs/index.html     |   4 +-
 httemplate/docs/upgrade10.html | 116 +++++++++++++++++++++++------------------
 2 files changed, 66 insertions(+), 54 deletions(-)

diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index 7254d76f3..bec62e34a 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -8,11 +8,9 @@
 <ul>
   <li><a href="install.html">New Installation</a>
   <li><a href="install-rt.html">Installing integrated RT ticketing</a>
-  <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="upgrade-1.4.2.html">Upgrading from 1.4.1 to 1.4.2</a>
-  <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2) to 1.5.7</a>
+  <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2) to 1.5.8</a>
 </ul>
 <h3>Configuration and setup</h3>
 <ul>
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index ac2c6238d..8d90ab7a2 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,76 +1,86 @@
-<pre>
-this is incomplete
-
-NOTE: Version numbering has been simplified.  1.5.7 is the version after
-1.5.0pre6.  It is still a development version - releases with odd numbered 
-middle parts (NN in x.NN.x) are development versions, like Perl or Linux.
-
-If migrating from 1.5.7, see README.1.5.8 instead
-
-If migrating from 1.5.0pre6, see README.1.5.7 instead
-
-install DBD::Pg 1.32, 1.41 or later (not 1.40) (or, if you're using a Perl version before 5.6, you could try installing DBD::Pg 1.22 with <a href="http://420.am/~ivan/DBD-Pg-1.22-fixvercmp.patch">this patch</a> and commenting out the "use DBD::Pg 1.32" at the top of DBIx/DBSchema/DBD/Pg.pm)
-install DBIx::DBSchema 0.27 (or later)
-  (if you are running Pg version 7.2.x or earlier, install at least
-   DBIx::DBSchema 0.29)
-install Net::SSH 0.08
-install HTML::Widgets::SelectLayers 0.05
-install Business::CreditCard 0.28
-
-- If using Apache::ASP, add PerlSetVar RequestBinaryRead Off and PerlSetVar IncludesDir /your/freeside/document/root/ to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55.
-- In httpd.conf, change &lt;Files ~ \.cgi&gt; to  &lt;Files ~ (\.cgi|\.html)&gt;
-- In httpd.conf, change <b>AddHandler perl-script .cgi</b> or <b>SetHandler perl-script</b> to <b>AddHandler perl-script .cgi .html</b>
-
-install NetAddr::IP, Chart::Base, Locale::SubCountry, Text::CSV_XS, 
+<head>
+  <title>Upgrading to 1.5.8</title>
+</head>
+<body>
+<h1>Upgrading to 1.5.8 from 1.4.1 or 1.4.2</h1
+
+<table bgcolor="#dddddd">
+<tr><td>
+<i><b>Note:</b> Version numbering has been simplified.  1.5.7 and 1.5.8 are the
+versions following 1.5.0pre6.  They are still development versions - releases
+with odd numbered middle parts (NN in x.NN.x) are development versions, like
+Perl or Linux.
+</td></tr>
+</table>
+<br>
+
+<ul>
+  <li>If migrating from 1.5.0pre6, see README.1.5.7 instead
+  <li>If migrating from 1.5.7, see README.1.5.8 instead
+  <li> install DBD::Pg 1.32, 1.41 or later (not 1.40) (or, if you're using a Perl version before 5.6, you could try installing DBD::Pg 1.22 with <a href="http://420.am/~ivan/DBD-Pg-1.22-fixvercmp.patch">this patch</a> and commenting out the "use DBD::Pg 1.32" at the top of DBIx/DBSchema/DBD/Pg.pm)
+  <li> install DBIx::DBSchema 0.27 (or later) (if you are running Pg version 7.2.x or earlier, install at least DBIx::DBSchema 0.29)
+  <li> install Net::SSH 0.08 or later
+  <li> install HTML::Widgets::SelectLayers 0.05 or later
+  <li> install Business::CreditCard 0.28 or later
+
+  <li>If using Apache::ASP, add PerlSetVar RequestBinaryRead Off and PerlSetVar IncludesDir /your/freeside/document/root/ to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55.
+    <ul>
+      <li>In httpd.conf, change &lt;Files ~ \.cgi&gt; to  &lt;Files ~ (\.cgi|\.html)&gt;
+      <li>In httpd.conf, change <b>AddHandler perl-script .cgi</b> or <b>SetHandler perl-script</b> to <b>AddHandler perl-script .cgi .html</b>
+    </ul>
+  <li>install NetAddr::IP, Chart::Base, Locale::SubCountry, Text::CSV_XS, 
 Spreadsheet::WriteExcel, IO-stringy (IO::Scalar), Frontier::RPC
 (Frontier::RPC2), MIME::Entity (MIME-tools), IPC::Run3, Net::Whois::Raw,
 JSON and Term::ReadKey
 <!-- and Crypt::YAPassGen-->
 
+  <li>Apply the following changes to your database:
+<pre>
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 20, 'svc_external-id', 'en_US', 'External ID' );
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 21, 'svc_external-title', 'en_US', 'Title' );
 
 DROP INDEX cust_bill_pkg1;
+</pre>
 
-On recent Pg versions:
-
+  <li>On recent Pg versions:
+<pre>
 ALTER TABLE cust_main ALTER COLUMN payinfo varchar(512) NULL;
 ALTER TABLE h_cust_main ALTER COLUMN payinfo varchar(512) NULL;
+</pre>
+On older Pg versions that don't support altering columns directly, you will need to dump the database, edit the schema definitions in the dump file, and reload.
 
-Or on older Pg versions that don't support altering columns directly:
-(dump database, edit & reload)
-
-On recent Pg versions:
-
+  <li>On recent Pg versions:
+<pre>
 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;
-
+</pre>
 Or on Pg versions that don't support DROP NOT NULL (tested on 7.1 and 7.2 so far):
+<pre>
 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' ) );
+</pre>
 
-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
-- cust_main and h_cust_main: change ss from char(11) to varchar(11) ( "character(11)" to "character varying(11)" )
-- cust_credit and h_cust_credit: increase otaker from 8 to 32
-- cust_pkg and h_cust_pkg: increase otaker from 8 to 32
-- cust_refund and h_cust_refund: increase otaker from 8 to 32
-- domain_record and h_domain_record: increase reczone from 80 to 255
-- domain_record and h_domain_record: change rectype from char to varchar ( "character(5)" to "character varying(5)" )
-- domain_record and h_domain_record: increase recdata from 80 to 255
-then reload
-
-mandatory again:
-
-make install-perl-modules to install the new libraries and CLI utilities
-run "freeside-upgrade username" to create the remaining new tables and columns
-
-optionally:
-
+  <li> If you created your database with a version before 1.4.2, dump database, edit the following, then reload:
+    <ul>
+      <li>cust_main and h_cust_main: increase otaker from 8 to 32
+      <li>cust_main and h_cust_main: change ss from char(11) to varchar(11) ( "character(11)" to "character varying(11)" )
+      <li>cust_credit and h_cust_credit: increase otaker from 8 to 32
+      <li>cust_pkg and h_cust_pkg: increase otaker from 8 to 32
+      <li>cust_refund and h_cust_refund: increase otaker from 8 to 32
+      <li>domain_record and h_domain_record: increase reczone from 80 to 255
+      <li>domain_record and h_domain_record: change rectype from char to varchar ( "character(5)" to "character varying(5)" )
+      <li>domain_record and h_domain_record: increase recdata from 80 to 255
+    </ul>
+
+<li>make install-perl-modules to install the new libraries and CLI utilities
+<li>run "freeside-upgrade username" to create the remaining new tables and columns
+
+<li>optionally:
+<pre>
 CREATE INDEX cust_main4 ON cust_main ( daytime );
 CREATE INDEX cust_main5 ON cust_main ( night );
 CREATE INDEX cust_main6 ON cust_main ( fax );
@@ -89,5 +99,9 @@ CREATE INDEX cust_pay4 ON cust_pay (_date);
 CREATE INDEX part_referral1 ON part_referral ( disabled );
 CREATE INDEX part_pkg2 ON part_pkg ( promo_code );
 CREATE INDEX h_part_pkg2 ON h_part_pkg ( promo_code );
-
 </pre>
+
+</ul>
+
+</body>
+</html>
-- 
cgit v1.2.1


From eb035e51ad8df6b3301c81679a9f4b51b6ea4c4d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Feb 2006 03:50:53 +0000
Subject: remove ancient upgrade instructions

---
 httemplate/docs/upgrade7.html |  24 ---
 httemplate/docs/upgrade8.html | 394 ------------------------------------------
 2 files changed, 418 deletions(-)
 delete mode 100644 httemplate/docs/upgrade7.html
 delete mode 100644 httemplate/docs/upgrade8.html

diff --git a/httemplate/docs/upgrade7.html b/httemplate/docs/upgrade7.html
deleted file mode 100644
index d9dcfe2ae..000000000
--- a/httemplate/docs/upgrade7.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<head>
-  <title>Upgrading to 1.3.1</title>
-</head>
-<body>
-<h1>Upgrading to 1.3.1 from 1.3.0</h1>
-<ul>
-  <li>If migrating from 1.0.0, see these <a href="upgrade.html">instructions</a> first.
-  <li>If migrating from less than 1.1.4, see these <a href="upgrade2.html">instructions</a> first.
-  <li>If migrating from less than 1.2.0, see these <a href="upgrade3.html">instructions</a> first.
-  <li>If migrating from less than 1.2.2, see these <a href="upgrade4.html">instructions</a> first.
-  <li>If migrating from less than 1.2.3, see these <a href="upgrade5.html">instructions</a> first.
-  <li>If migrating from less than 1.3.0, see these <a href="upgrade6.html">instructions</a> first.
-  <li>Back up your data and current Freeside installation.
-  <li>Copy or symlink htdocs to the new copy.
-  <li>Change to the FS directory in the new tarball, and build and install the
-      Perl modules:
-    <pre>
-$ cd FS/
-$ perl Makefile.PL
-$ make
-$ su
-# make install UNINST=1</pre>
-  <li>Run bin/dbdef-create.
-</body>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
deleted file mode 100644
index 9ca7cb7b9..000000000
--- a/httemplate/docs/upgrade8.html
+++ /dev/null
@@ -1,394 +0,0 @@
-<head>
-  <title>Upgrading to 1.4.0</title>
-</head>
-<body>
-<h1>Upgrading to 1.4.0 from 1.3.1</h1>
-<ul>
-  <li>If migrating from less than 1.3.1, see these <a href="upgrade7.html">instructions</a> first.
-  <li><font size="+2" color="#ff0000">Backup your database and current Freeside installation.</font> (with&nbsp;<a href="http://www.ca.postgresql.org/devel-corner/docs/postgres/backup.html">PostgreSQL</a>) (with&nbsp;<a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Backup">MySQL</a>)
-  <li><a href="http://perl.apache.org/">mod_perl</a> is now required.
-  <li>Install <a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>, <a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a> and <a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a> (minimum version 0.02).
-  <li>Install <a href="http://www.apache-asp.org/">Apache::ASP</a> or <a href="http://www.masonhq.com/">HTML::Mason</a> (use version 1.0x - Freeside is not yet compatible with version 1.1x).
-  <li>Install <a href="http://rsync.samba.org/">rsync</a>
-</ul>
-<table>
-  <tr>
-    <th>Apache::ASP</th><th>Mason</th>
-  </tr>
-  <tr>
-    <td><ul>
-      <li>Run <tt>make aspdocs</tt>
-      <li>Copy <tt>aspdocs/</tt> to your web server's document space.
-      <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>
-      <li>Copy <tt>htetc/global.asa</tt> to the Global directory.
-      <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example:
-<font size="-1"><pre>
-&lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
-&lt;Files ~ (\.cgi)&gt;
-AddHandler perl-script .cgi
-PerlHandler Apache::ASP
-&lt;/Files&gt;
-&lt;Perl&gt;
-$MLDBM::RemoveTaint = 1;
-&lt;/Perl&gt;
-PerlSetVar Global /usr/local/etc/freeside/asp-global/
-&lt;/Directory&gt;
-</pre></font>
-    </ul></td>
-    <td><ul>
-      <li>(use version 1.0x - Freeside is not yet compatible with version 1.1x)
-      <li>Run <tt>make masondocs</tt>
-      <li>Copy <tt>masondocs/</tt> to your web server's document space.
-      <li>Copy <tt>htetc/handler.pl</tt> to your web server's configuration directory.
-      <li>Edit <tt>handler.pl</tt> and set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/mason-data</tt>
-      <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example:
-<font size="-1"><pre>
-&lt;Directory /usr/local/apache/htdocs/freeside-mason&gt;
-&lt;Files ~ (\.cgi)&gt;
-AddHandler perl-script .cgi
-PerlHandler HTML::Mason
-&lt;/Files&gt;
-&lt;Perl&gt;
-require "/usr/local/apache/conf/handler.pl";
-&lt;/Perl&gt;
-&lt;/Directory&gt;
-</pre></font>
-    </ul></td>
-  </tr>
-</table>
-<ul>
-  <li>Build and install the Perl modules:
-    <pre>
-$ su
-# make install-perl-modules</pre>
-   <li>Apply the following changes to your database:
-<pre>
-CREATE TABLE svc_forward (
-  svcnum int NOT NULL,
-  srcsvc int NOT NULL,
-  dstsvc int NOT NULL,
-  dst varchar(80),
-  PRIMARY KEY (svcnum)
-);
-ALTER TABLE part_svc ADD svc_forward__srcsvc varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_forward__srcsvc_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_forward__dstsvc varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_forward__dstsvc_flag char(1) NULL;
-ALTER TABLE part_svc ADD svc_forward__dst varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_forward__dst_flag char(1) NULL;
-
-CREATE TABLE cust_credit_bill (
-  creditbillnum int primary key,
-  crednum int not null,
-  invnum int not null,
-  _date int not null,
-  amount decimal(10,2) not null
-);
-
-CREATE TABLE cust_bill_pay (
-  billpaynum int primary key,
-  invnum int not null,
-  paynum int not null,
-  _date int not null,
-  amount decimal(10,2) not null
-);
-
-CREATE TABLE cust_credit_refund (
-  creditrefundnum int primary key,
-  crednum int not null,
-  refundnum int not null,
-  _date int not null,
-  amount decimal(10,2) not null
-);
-
-CREATE TABLE part_svc_column (
-  columnnum int primary key,
-  svcpart int not null,
-  columnname varchar(64) not null,
-  columnvalue varchar(80) null,
-  columnflag char(1) null
-);
-
-CREATE TABLE queue (
-  jobnum int primary key,
-  job text not null,
-  _date int not null,
-  status varchar(80) not null,
-  statustext text null,
-  svcnum int null
-);
-CREATE INDEX queue1 ON queue ( svcnum );
-CREATE INDEX queue2 ON queue ( status );
-
-CREATE TABLE queue_arg (
-  argnum int primary key,
-  jobnum int not null,
-  arg text null
-);
-CREATE INDEX queue_arg1 ON queue_arg ( jobnum );
-
-CREATE TABLE queue_depend (
-  dependnum int primary key,
-  jobnum int not null,
-  depend_jobnum int not null
-);
-CREATE INDEX queue_depend1 ON queue_depend ( jobnum );
-CREATE INDEX queue_depend2 ON queue_depend ( depend_jobnum );
-
-CREATE TABLE part_pop_local (
-  localnum int primary key,
-  popnum int not null,
-  city varchar(80) null,
-  state char(2) null,
-  npa char(3) not null,
-  nxx char(3) not null
-);
-CREATE UNIQUE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
-
-CREATE TABLE cust_bill_event (
-  eventnum int primary key,
-  invnum int not null,
-  eventpart int not null,
-  _date int not null,
-  status varchar(80) not null, 
-  statustext text
-);
-CREATE UNIQUE INDEX cust_bill_event1 ON cust_bill_event ( eventpart, invnum );
-CREATE INDEX cust_bill_event2 ON cust_bill_event ( invnum );
-
-CREATE TABLE part_bill_event (
-  eventpart int primary key,
-  payby char(4) not null,
-  event varchar(80) not null,
-  eventcode text null,
-  seconds int null,
-  weight int not null,
-  plan varchar(80) null,
-  plandata text null,
-  disabled char(1) null
-);
-CREATE INDEX part_bill_event1 ON part_bill_event ( payby );
-
-CREATE TABLE export_svc (
-  exportsvcnum int primary key,
-  exportnum int not null,
-  svcpart int not null
-);
-CREATE UNIQUE INDEX export_svc1 ON export_svc ( exportnum, svcpart );
-CREATE INDEX export_svc2 ON export_svc ( exportnum );
-CREATE INDEX export_svc3 ON export_svc ( svcpart );
-
-CREATE TABLE part_export (
-  exportnum int primary key,
-  machine varchar(80) not null,
-  exporttype varchar(80) not null,
-  nodomain char(1) NULL
-);
-CREATE INDEX part_export1 ON part_export ( machine );
-CREATE INDEX part_export2 ON part_export ( exporttype );
-
-CREATE TABLE part_export_option (
-  optionnum int primary key,
-  exportnum int not null,
-  optionname varchar(80) not null,
-  optionvalue text NULL
-);
-CREATE INDEX part_export_option1 ON part_export_option ( exportnum );
-CREATE INDEX part_export_option2 ON part_export_option ( optionname );
-
-CREATE TABLE radius_usergroup (
-  usergroupnum int primary key,
-  svcnum int not null,
-  groupname varchar(80) not null
-);
-CREATE INDEX radius_usergroup1 ON radius_usergroup ( svcnum );
-CREATE INDEX radius_usergroup2 ON radius_usergroup ( groupname );
-
-CREATE TABLE msgcat (
-  msgnum int primary key,
-  msgcode varchar(80) not null,
-  locale varchar(16) not null,
-  msg text not null
-);
-CREATE INDEX msgcat1 ON msgcat ( msgcode, locale );
-
-CREATE TABLE cust_tax_exempt (
-  exemptnum int primary key,
-  custnum int not null,
-  taxnum int not null,
-  year int not null,
-  month int not null,
-  amount decimal(10,2)
-);
-CREATE UNIQUE INDEX cust_tax_exempt1 ON cust_tax_exempt ( taxnum, year, month );
-
-ALTER TABLE svc_acct ADD domsvc integer NULL;
-ALTER TABLE part_svc ADD svc_acct__domsvc varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_acct__domsvc_flag char(1) NULL;
-ALTER TABLE svc_domain ADD catchall integer NULL;
-ALTER TABLE cust_main ADD referral_custnum integer NULL;
-ALTER TABLE cust_main ADD comments text NULL;
-ALTER TABLE cust_pay ADD custnum integer;
-ALTER TABLE cust_pay_batch ADD paybatchnum integer;
-ALTER TABLE cust_refund ADD custnum integer;
-ALTER TABLE cust_pkg ADD manual_flag char(1) NULL;
-ALTER TABLE part_pkg ADD plan varchar(80) NULL;
-ALTER TABLE part_pkg ADD plandata text NULL;
-ALTER TABLE part_pkg ADD setuptax char(1) NULL;
-ALTER TABLE part_pkg ADD recurtax char(1) NULL;
-ALTER TABLE part_pkg ADD disabled char(1) NULL;
-ALTER TABLE part_svc ADD disabled char(1) NULL;
-ALTER TABLE cust_bill ADD closed char(1) NULL;
-ALTER TABLE cust_pay ADD closed char(1) NULL;
-ALTER TABLE cust_credit ADD closed char(1) NULL;
-ALTER TABLE cust_refund ADD closed char(1) NULL;
-ALTER TABLE cust_bill_event ADD status varchar(80);
-ALTER TABLE cust_bill_event ADD statustext text NULL;
-ALTER TABLE svc_acct ADD sec_phrase varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_acct__sec_phrase varchar(80) NULL;
-ALTER TABLE part_svc ADD svc_acct__sec_phrase_flag char(1) NULL;
-ALTER TABLE part_pkg ADD taxclass varchar(80) NULL;
-ALTER TABLE cust_main_county ADD taxclass varchar(80) NULL;
-ALTER TABLE cust_main_county ADD exempt_amount decimal(10,2);
-CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
-CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
-CREATE INDEX cust_credit_bill2 ON cust_credit_bill ( invnum );
-CREATE INDEX cust_bill_pay1 ON cust_bill_pay ( invnum );
-CREATE INDEX cust_bill_pay2 ON cust_bill_pay ( paynum );
-CREATE INDEX cust_credit_refund1 ON cust_credit_refund ( crednum );
-CREATE INDEX cust_credit_refund2 ON cust_credit_refund ( refundnum );
-CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );
-CREATE UNIQUE INDEX part_svc_column1 ON part_svc_column ( svcpart, columnname );
-CREATE INDEX cust_pay2 ON cust_pay ( paynum );
-CREATE INDEX cust_pay3 ON cust_pay ( custnum );
-CREATE INDEX cust_pay4 ON cust_pay ( paybatch );
-</pre>
-
-  <li>If you are using PostgreSQL, apply the following changes to your database:
-<pre>
-CREATE UNIQUE INDEX agent_pkey ON agent ( agentnum );
-CREATE UNIQUE INDEX agent_type_pkey ON agent_type ( typenum );
-CREATE UNIQUE INDEX cust_bill_pkey ON cust_bill ( invnum );
-CREATE UNIQUE INDEX cust_credit_pkey ON cust_credit ( crednum );
-CREATE UNIQUE INDEX cust_main_pkey ON cust_main ( custnum );
-CREATE UNIQUE INDEX cust_main_county_pkey ON cust_main_county ( taxnum );
-CREATE UNIQUE INDEX cust_main_invoice_pkey ON cust_main_invoice ( destnum );
-CREATE UNIQUE INDEX cust_pay_pkey ON cust_pay ( paynum );
-CREATE UNIQUE INDEX cust_pkg_pkey ON cust_pkg ( pkgnum );
-CREATE UNIQUE INDEX cust_refund_pkey ON cust_refund ( refundnum );
-CREATE UNIQUE INDEX cust_svc_pkey ON cust_svc ( svcnum );
-CREATE UNIQUE INDEX domain_record_pkey ON domain_record ( recnum );
-CREATE UNIQUE INDEX nas_pkey ON nas ( nasnum );
-CREATE UNIQUE INDEX part_pkg_pkey ON part_pkg ( pkgpart );
-CREATE UNIQUE INDEX part_referral_pkey ON part_referral ( refnum );
-CREATE UNIQUE INDEX part_svc_pkey ON part_svc ( svcpart );
-CREATE UNIQUE INDEX port_pkey ON port ( portnum );
-CREATE UNIQUE INDEX prepay_credit_pkey ON prepay_credit ( prepaynum );
-CREATE UNIQUE INDEX session_pkey ON session ( sessionnum );
-CREATE UNIQUE INDEX svc_acct_pkey ON svc_acct ( svcnum );
-CREATE UNIQUE INDEX svc_acct_pop_pkey ON svc_acct_pop ( popnum );
-CREATE UNIQUE INDEX svc_acct_sm_pkey ON svc_acct_sm ( svcnum );
-CREATE UNIQUE INDEX svc_domain_pkey ON svc_domain ( svcnum );
-CREATE UNIQUE INDEX svc_www_pkey ON svc_www ( svcnum );
-</pre>
-  <li>If you wish to enable service/shipping addresses, apply the following
-      changes to your database:
-<pre>
-ALTER TABLE cust_main ADD COLUMN ship_last varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_first varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_company varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_address1 varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_address2 varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_city varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_county varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_state varchar(80) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_zip varchar(10) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_country char(2) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_daytime varchar(20) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_night varchar(20) NULL;
-ALTER TABLE cust_main ADD COLUMN ship_fax varchar(12) NULL;
-CREATE INDEX cust_main4 ON cust_main ( ship_last );
-CREATE INDEX cust_main5 ON cust_main ( ship_company );
-</pre>
-  <li>If you are using the signup server, reinstall it according to the <a href="signup.html">instructions</a>.  The 1.3.x signup server is not compatible with 1.4.x.
-  <li>Run <tt>bin/dbdef-create <i>username</i></tt>
-  <li>If you have svc_acct_sm records or service definitions:
-    <ul>
-      <li>Create a service definition with table svc_forward
-      <li>Run <tt>bin/fs-migrate-svc_acct_sm <i>username</i></tt>
-    </ul>
-  <li>Or if you just have svc_acct records:
-    <ul>
-      <li>Order and provision a package for your default domain and note down the <b>Service #</b> or <i>svcnum</i>.
-      <li><tt>UPDATE svc_acct SET domsvc = </tt><i>svcnum</i>
-      <li>Update your service definitions to have default (or fixed) <b>domsvc</b>.
-    </ul>
-  <li>Run <tt>bin/fs-migrate-payref<i>username</i></tt>
-  <li>Run <tt>bin/fs-migrate-part_svc<i>username</i></tt>
-  <li><b>After running bin/fs-migrate-payref</b>, apply the following changes to your database:
-  <table border><tr><th>PostgreSQL</th><th>MySQL, others</th></tr>
-<tr><td>
-<font size=-1><pre>
-CREATE TABLE cust_pay_temp (
-  paynum int primary key,
-  custnum int not null,
-  paid decimal(10,2) not null,
-  _date int null,
-  payby char(4) not null,
-  payinfo varchar(16) null,
-  paybatch varchar(80) null,
-  closed char(1) null
-);
-INSERT INTO cust_pay_temp SELECT paynum, custnum, paid, _date, payby, payinfo, paybatch, closed FROM cust_pay;
-DROP TABLE cust_pay;
-ALTER TABLE cust_pay_temp RENAME TO cust_pay;
-CREATE UNIQUE INDEX cust_pay1 ON cust_pay (paynum);
-CREATE TABLE cust_refund_temp (
-  refundnum int primary key,
-  custnum int not null,
-  _date int null,
-  refund decimal(10,2) not null,
-  otaker varchar(8) not null,
-  reason varchar(80) not null,
-  payby char(4) not null,
-  payinfo varchar(16) null,
-  paybatch varchar(80) null,
-  closed char(1) null
-);
-INSERT INTO cust_refund_temp SELECT refundnum, custnum, _date, refund, otaker, reason, payby, payinfo, '', closed from cust_refund;
-DROP TABLE cust_refund;
-ALTER TABLE cust_refund_temp RENAME TO cust_refund;
-CREATE UNIQUE INDEX cust_refund1 ON cust_refund (refundnum);
-</pre></font>
-</td><td>
-<font size=-1><pre>
-ALTER TABLE cust_pay DROP COLUMN invnum;
-ALTER TABLE cust_refund DROP COLUMN crednum;
-</pre></font>
-</td></tr></table>
-  <li><b>IMPORTANT: After applying the second set of database changes</b>, run <tt>bin/dbdef-create <i>username</i></tt> again.
-  <li><b>IMPORTANT</b>: run <tt>bin/create-history-tables <i>username</i></tt>
-  <li><b>IMPORTANT: After running bin/create-history-tables</b>, run <tt>bin/dbdef-create <i>username</i></tt> again.
-  <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <i>username</i></tt
-> to populate the message catalog
-<!--  <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site. -->
-  <li>set the <a href="../config/config.cgi#locale">locale configuration value</a> to en_US.
-  <li>the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Set the <a href="../config/config.cgi#defaultrecords">defaultrecords configuration value</a> instead.
-  <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
-      (owned by the freeside user).
-  <li>freeside-queued was installed with the Perl modules.  Start it now and ensure that is run upon system startup.
-  <li>Set appropriate <a href="../browse/part_bill_event.cgi">invoice events</a> for your site.  At the very least, you'll want to set some invoice events "<i>After 0 days</i>": a <i>BILL</i> invoice event to print invoices, a <i>CARD</i> invoice event to batch or run cards real-time, and a <i>COMP</i> invoice event to "pay" complimentary customers.  If you were using the <i>-i</i> option to <a href="man/bin/freeside-bill.html">freeside-bill</a> it should be removed.
-  <li>Use <a href="man/bin/freeside-daily.html">freeside-daily</a> instead of <a href="man/bin/freeside-bill.html">freeside-bill</a>.
-  <li>If you would like Freeside to notify your customers when their credit
-  cards and other billing arrangements are about to expire, arrange for
-  <b>freeside-expiration-alerter</b> to be run daily by cron or similar
-  facility.  The message it sends can be configured from the
-  <u>Configuration</u> choice of the main menu as <u>alerter_template</u>.
-  <li>Export has been rewritten.  If you were using the icradiusmachines,
-  icradius_mysqldest, icradius_mysqlsource, or icradius_secrets files, add
-  an appropriate "sqlradius" export to all relevant Service Definitions
-  instead.  Use <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Replication">MySQL replication</a> or
-  point the "sqlradius" export directly at your external ICRADIUS or FreeRADIUS
-  database (or through an SSL-necrypting proxy...)
-</ul>
-</body>
-- 
cgit v1.2.1


From 37220994fec0ec4f8913be99f66aa082c78897a4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Feb 2006 22:53:18 +0000
Subject: don't leave ssh zombies around either

---
 FS/bin/freeside-selfservice-server | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index c73349a60..6026fd18f 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw( $Debug %kids $kids $max_kids $ssh_pid $keepalives );
+use vars qw( $Debug %kids $kids $max_kids $ssh_pid %old_ssh_pid $keepalives );
 use subs qw( lock_write unlock_write myshutdown usage );
 use Fcntl qw(:flock);
 use POSIX qw(:sys_wait_h);
@@ -102,6 +102,7 @@ while (1) {
       if ( $ssh_pid ) {
         warn "sending TERM signal to ssh process $ssh_pid\n" if $Debug;
         kill 'TERM', $ssh_pid;
+        $old_ssh_pid{$ssh_pid} = 1;
         $ssh_pid = 0;
       }
       last;
@@ -180,6 +181,10 @@ sub reap_kids {
       delete $kids{$kid};
     }
   }
+
+  foreach my $pid ( keys %old_ssh_pid ) {
+    waitpid($pid, WNOHANG) and delete $old_ssh_pid{$pid};
+  }
   #warn "done reaping\n";
 }
 
-- 
cgit v1.2.1


From c8a6843a92a556315b85e6b3f4ed1bebdfd2e35d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 Feb 2006 07:18:08 +0000
Subject: update jscalendar

---
 httemplate/elements/calendar-en.js       |  10 +-
 httemplate/elements/calendar-setup.js    |  45 ++-
 httemplate/elements/calendar-win2k-2.css |   1 +
 httemplate/elements/calendar.js          | 653 ++++++++++++++++++-------------
 httemplate/elements/calendar_stripped.js |  12 +-
 5 files changed, 419 insertions(+), 302 deletions(-)

diff --git a/httemplate/elements/calendar-en.js b/httemplate/elements/calendar-en.js
index e9d6a222e..0dbde793d 100644
--- a/httemplate/elements/calendar-en.js
+++ b/httemplate/elements/calendar-en.js
@@ -1,7 +1,7 @@
 // ** I18N
 
 // Calendar EN language
-// Author: Mihai Bazon, <mishoo@infoiasi.ro>
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
 // Encoding: any
 // Distributed under the same terms as the calendar itself.
 
@@ -43,6 +43,10 @@ Calendar._SDN = new Array
  "Sat",
  "Sun");
 
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
 // full month names
 Calendar._MN = new Array
 ("January",
@@ -79,8 +83,8 @@ Calendar._TT["INFO"] = "About the calendar";
 
 Calendar._TT["ABOUT"] =
 "DHTML Date/Time Selector\n" +
-"(c) dynarch.com 2002-2003\n" + // don't translate this this ;-)
-"For latest version visit: http://dynarch.com/mishoo/calendar.epl\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
 "Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
 "\n\n" +
 "Date selection:\n" +
diff --git a/httemplate/elements/calendar-setup.js b/httemplate/elements/calendar-setup.js
index 55e22b933..b27d9bed0 100644
--- a/httemplate/elements/calendar-setup.js
+++ b/httemplate/elements/calendar-setup.js
@@ -19,7 +19,7 @@
  * than modifying calendar.js itself).
  */
 
-// $Id: calendar-setup.js,v 1.4 2004-09-22 11:04:41 ivan Exp $
+// $Id: calendar-setup.js,v 1.5 2006-02-09 07:18:08 ivan Exp $
 
 /**
  *  This function "patches" an input field (or other element) to use a calendar
@@ -71,7 +71,8 @@ Calendar.setup = function (params) {
 	param_default("singleClick",    true);
 	param_default("disableFunc",    null);
 	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
-	param_default("firstDay",       0); // defaults to "Sunday" first
+	param_default("dateText",       null);
+	param_default("firstDay",       null);
 	param_default("align",          "Br");
 	param_default("range",          [1900, 2999]);
 	param_default("weekNumbers",    true);
@@ -88,6 +89,7 @@ Calendar.setup = function (params) {
 	param_default("position",       null);
 	param_default("cache",          false);
 	param_default("showOthers",     false);
+	param_default("multiple",       null);
 
 	var tmp = ["inputField", "displayArea", "button"];
 	for (var i in tmp) {
@@ -95,7 +97,7 @@ Calendar.setup = function (params) {
 			params[tmp[i]] = document.getElementById(params[tmp[i]]);
 		}
 	}
-	if (!(params.flat || params.inputField || params.displayArea || params.button)) {
+	if (!(params.flat || params.multiple || params.inputField || params.displayArea || params.button)) {
 		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
 		return false;
 	}
@@ -103,13 +105,6 @@ Calendar.setup = function (params) {
 	function onSelect(cal) {
 		var p = cal.params;
 		var update = (cal.dateClicked || p.electric);
-		if (update && p.flat) {
-			if (typeof p.flatCallback == "function")
-				p.flatCallback(cal);
-			else
-				alert("No flatCallback given -- doing nothing.");
-			return false;
-		}
 		if (update && p.inputField) {
 			p.inputField.value = cal.date.print(p.ifFormat);
 			if (typeof p.inputField.onchange == "function")
@@ -117,10 +112,14 @@ Calendar.setup = function (params) {
 		}
 		if (update && p.displayArea)
 			p.displayArea.innerHTML = cal.date.print(p.daFormat);
-		if (update && p.singleClick && cal.dateClicked)
-			cal.callCloseHandler();
 		if (update && typeof p.onUpdate == "function")
 			p.onUpdate(cal);
+		if (update && p.flat) {
+			if (typeof p.flatCallback == "function")
+				p.flatCallback(cal);
+		}
+		if (update && p.singleClick && cal.dateClicked)
+			cal.callCloseHandler();
 	};
 
 	if (params.flat != null) {
@@ -131,12 +130,20 @@ Calendar.setup = function (params) {
 			return false;
 		}
 		var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
+		cal.showsOtherMonths = params.showOthers;
 		cal.showsTime = params.showsTime;
 		cal.time24 = (params.timeFormat == "24");
 		cal.params = params;
 		cal.weekNumbers = params.weekNumbers;
 		cal.setRange(params.range[0], params.range[1]);
 		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.getDateText = params.dateText;
+		if (params.ifFormat) {
+			cal.setDateFormat(params.ifFormat);
+		}
+		if (params.inputField && typeof params.inputField.value == "string") {
+			cal.parseDate(params.inputField.value);
+		}
 		cal.create(params.flat);
 		cal.show();
 		return false;
@@ -148,6 +155,8 @@ Calendar.setup = function (params) {
 		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
 		var mustCreate = false;
 		var cal = window.calendar;
+		if (dateEl)
+			params.date = Date.parseDate(dateEl.value || dateEl.innerHTML, dateFmt);
 		if (!(cal && params.cache)) {
 			window.calendar = cal = new Calendar(params.firstDay,
 							     params.date,
@@ -162,15 +171,23 @@ Calendar.setup = function (params) {
 				cal.setDate(params.date);
 			cal.hide();
 		}
+		if (params.multiple) {
+			cal.multiple = {};
+			for (var i = params.multiple.length; --i >= 0;) {
+				var d = params.multiple[i];
+				var ds = d.print("%Y%m%d");
+				cal.multiple[ds] = d;
+			}
+		}
 		cal.showsOtherMonths = params.showOthers;
 		cal.yearStep = params.step;
 		cal.setRange(params.range[0], params.range[1]);
 		cal.params = params;
 		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.getDateText = params.dateText;
 		cal.setDateFormat(dateFmt);
 		if (mustCreate)
 			cal.create();
-		cal.parseDate(dateEl.value || dateEl.innerHTML);
 		cal.refresh();
 		if (!params.position)
 			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
@@ -178,4 +195,6 @@ Calendar.setup = function (params) {
 			cal.showAt(params.position[0], params.position[1]);
 		return false;
 	};
+
+	return cal;
 };
diff --git a/httemplate/elements/calendar-win2k-2.css b/httemplate/elements/calendar-win2k-2.css
index 6001cfaa4..6f37b7dcd 100644
--- a/httemplate/elements/calendar-win2k-2.css
+++ b/httemplate/elements/calendar-win2k-2.css
@@ -206,6 +206,7 @@
   background: #e4d8e0;
   font-size: 90%;
   padding: 1px;
+  z-index: 100;
 }
 
 .calendar .combo .label,
diff --git a/httemplate/elements/calendar.js b/httemplate/elements/calendar.js
index ec18d80ce..f5c74f608 100644
--- a/httemplate/elements/calendar.js
+++ b/httemplate/elements/calendar.js
@@ -1,16 +1,18 @@
-/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
- * ------------------------------------------------------------------
+/*  Copyright Mihai Bazon, 2002-2005  |  www.bazon.net/mishoo
+ * -----------------------------------------------------------
  *
- * The DHTML Calendar, version 0.9.6 "Keep cool but don't freeze"
+ * The DHTML Calendar, version 1.0 "It is happening again"
  *
  * Details and latest version at:
- * http://dynarch.com/mishoo/calendar.epl
+ * www.dynarch.com/projects/calendar
+ *
+ * This script is developed by Dynarch.com.  Visit us at www.dynarch.com.
  *
  * This script is distributed under the GNU Lesser General Public License.
  * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
  */
 
-// $Id: calendar.js,v 1.4 2004-09-22 11:04:41 ivan Exp $
+// $Id: calendar.js,v 1.5 2006-02-09 07:18:08 ivan Exp $
 
 /** The Calendar object constructor. */
 Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
@@ -18,6 +20,8 @@ Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
 	this.activeDiv = null;
 	this.currentDateEl = null;
 	this.getDateStatus = null;
+	this.getDateToolTip = null;
+	this.getDateText = null;
 	this.timeout = null;
 	this.onSelected = onSelected || null;
 	this.onClose = onClose || null;
@@ -29,13 +33,15 @@ Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
 	this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
 	this.isPopup = true;
 	this.weekNumbers = true;
-	this.firstDayOfWeek = firstDayOfWeek; // 0 for Sunday, 1 for Monday, etc.
+	this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : Calendar._FD; // 0 for Sunday, 1 for Monday, etc.
 	this.showsOtherMonths = false;
 	this.dateStr = dateStr;
 	this.ar_days = null;
 	this.showsTime = false;
 	this.time24 = true;
 	this.yearStep = 2;
+	this.hiliteToday = true;
+	this.multiple = null;
 	// HTML elements
 	this.table = null;
 	this.element = null;
@@ -146,20 +152,19 @@ Calendar.addClass = function(el, className) {
 	el.className += " " + className;
 };
 
+// FIXME: the following 2 functions totally suck, are useless and should be replaced immediately.
 Calendar.getElement = function(ev) {
-	if (Calendar.is_ie) {
-		return window.event.srcElement;
-	} else {
-		return ev.currentTarget;
-	}
+	var f = Calendar.is_ie ? window.event.srcElement : ev.currentTarget;
+	while (f.nodeType != 1 || /^div$/i.test(f.tagName))
+		f = f.parentNode;
+	return f;
 };
 
 Calendar.getTargetElement = function(ev) {
-	if (Calendar.is_ie) {
-		return window.event.srcElement;
-	} else {
-		return ev.target;
-	}
+	var f = Calendar.is_ie ? window.event.srcElement : ev.target;
+	while (f.nodeType != 1)
+		f = f.parentNode;
+	return f;
 };
 
 Calendar.stopEvent = function(ev) {
@@ -295,7 +300,7 @@ Calendar.showYearsCombo = function (fwd) {
 	var show = false;
 	for (var i = 12; i > 0; --i) {
 		if (Y >= cal.minYear && Y <= cal.maxYear) {
-			yr.firstChild.data = Y;
+			yr.innerHTML = Y;
 			yr.year = Y;
 			yr.style.display = "block";
 			show = true;
@@ -416,7 +421,7 @@ Calendar.tableMouseOver = function (ev) {
 			} else if ( ++i >= range.length )
 				i = 0;
 		var newval = range[i];
-		el.firstChild.data = newval;
+		el.innerHTML = newval;
 
 		cal.onUpdateTime();
 	}
@@ -504,7 +509,7 @@ Calendar.dayMouseDown = function(ev) {
 	Calendar._C = cal;
 	if (el.navtype != 300) with (Calendar) {
 		if (el.navtype == 50) {
-			el._current = el.firstChild.data;
+			el._current = el.innerHTML;
 			addEvent(document, "mousemove", tableMouseOver);
 		} else
 			addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
@@ -541,7 +546,7 @@ Calendar.dayMouseOver = function(ev) {
 		if (el.ttip.substr(0, 1) == "_") {
 			el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
 		}
-		el.calendar.tooltips.firstChild.data = el.ttip;
+		el.calendar.tooltips.innerHTML = el.ttip;
 	}
 	if (el.navtype != 300) {
 		Calendar.addClass(el, "hilite");
@@ -555,14 +560,13 @@ Calendar.dayMouseOver = function(ev) {
 Calendar.dayMouseOut = function(ev) {
 	with (Calendar) {
 		var el = getElement(ev);
-		if (isRelated(el, ev) || _C || el.disabled) {
+		if (isRelated(el, ev) || _C || el.disabled)
 			return false;
-		}
 		removeClass(el, "hilite");
-		if (el.caldate) {
+		if (el.caldate)
 			removeClass(el.parentNode, "rowhilite");
-		}
-		el.calendar.tooltips.firstChild.data = _TT["SEL_DATE"];
+		if (el.calendar)
+			el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
 		return stopEvent(ev);
 	}
 };
@@ -577,17 +581,23 @@ Calendar.cellClick = function(el, ev) {
 	var newdate = false;
 	var date = null;
 	if (typeof el.navtype == "undefined") {
-		Calendar.removeClass(cal.currentDateEl, "selected");
-		Calendar.addClass(el, "selected");
-		closing = (cal.currentDateEl == el);
-		if (!closing) {
-			cal.currentDateEl = el;
+		if (cal.currentDateEl) {
+			Calendar.removeClass(cal.currentDateEl, "selected");
+			Calendar.addClass(el, "selected");
+			closing = (cal.currentDateEl == el);
+			if (!closing) {
+				cal.currentDateEl = el;
+			}
 		}
-		cal.date = new Date(el.caldate);
+		cal.date.setDateOnly(el.caldate);
 		date = cal.date;
-		newdate = true;
+		var other_month = !(cal.dateClicked = !el.otherMonth);
+		if (!other_month && !cal.currentDateEl)
+			cal._toggleMultipleDate(new Date(date));
+		else
+			newdate = !el.disabled;
 		// a date was clicked
-		if (!(cal.dateClicked = !el.otherMonth))
+		if (other_month)
 			cal._init(cal.firstDayOfWeek, date);
 	} else {
 		if (el.navtype == 200) {
@@ -595,7 +605,9 @@ Calendar.cellClick = function(el, ev) {
 			cal.callCloseHandler();
 			return;
 		}
-		date = (el.navtype == 0) ? new Date() : new Date(cal.date);
+		date = new Date(cal.date);
+		if (el.navtype == 0)
+			date.setDateOnly(new Date()); // TODAY
 		// unless "today" was clicked, we assume no date was clicked so
 		// the selected handler will know not to close the calenar when
 		// in single-click mode.
@@ -622,7 +634,7 @@ Calendar.cellClick = function(el, ev) {
 				text = "Help and about box text is not translated into this language.\n" +
 					"If you know this language and you feel generous please update\n" +
 					"the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
-					"and send it back to <mishoo@infoiasi.ro> to get it into the distribution  ;-)\n\n" +
+					"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n" +
 					"Thank you!\n" +
 					"http://dynarch.com/mishoo/calendar.epl\n";
 			}
@@ -659,7 +671,7 @@ Calendar.cellClick = function(el, ev) {
 			return;
 		    case 50:
 			var range = el._range;
-			var current = el.firstChild.data;
+			var current = el.innerHTML;
 			for (var i = range.length; --i >= 0;)
 				if (range[i] == current)
 					break;
@@ -669,15 +681,13 @@ Calendar.cellClick = function(el, ev) {
 			} else if ( ++i >= range.length )
 				i = 0;
 			var newval = range[i];
-			el.firstChild.data = newval;
+			el.innerHTML = newval;
 			cal.onUpdateTime();
 			return;
 		    case 0:
 			// TODAY will bring us here
-			if ((typeof cal.getDateStatus == "function") && cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
-				// remember, "date" was previously set to new
-				// Date() if TODAY was clicked; thus, it
-				// contains today date.
+			if ((typeof cal.getDateStatus == "function") &&
+			    cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
 				return false;
 			}
 			break;
@@ -685,14 +695,15 @@ Calendar.cellClick = function(el, ev) {
 		if (!date.equalsTo(cal.date)) {
 			cal.setDate(date);
 			newdate = true;
-		}
+		} else if (el.navtype == 0)
+			newdate = closing = true;
 	}
 	if (newdate) {
-		cal.callHandler();
+		ev && cal.callHandler();
 	}
 	if (closing) {
 		Calendar.removeClass(el, "hilite");
-		cal.callCloseHandler();
+		ev && cal.callCloseHandler();
 	}
 };
 
@@ -749,13 +760,7 @@ Calendar.prototype.create = function (_par) {
 		Calendar._add_evs(cell);
 		cell.calendar = cal;
 		cell.navtype = navtype;
-		if (text.substr(0, 1) != "&") {
-			cell.appendChild(document.createTextNode(text));
-		}
-		else {
-			// FIXME: dirty hack for entities
-			cell.innerHTML = text;
-		}
+		cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
 		return cell;
 	};
 
@@ -797,11 +802,10 @@ Calendar.prototype.create = function (_par) {
 	if (this.weekNumbers) {
 		cell = Calendar.createElement("td", row);
 		cell.className = "name wn";
-		cell.appendChild(document.createTextNode(Calendar._TT["WK"]));
+		cell.innerHTML = Calendar._TT["WK"];
 	}
 	for (var i = 7; i > 0; --i) {
 		cell = Calendar.createElement("td", row);
-		cell.appendChild(document.createTextNode(""));
 		if (!i) {
 			cell.navtype = 100;
 			cell.calendar = this;
@@ -818,11 +822,9 @@ Calendar.prototype.create = function (_par) {
 		row = Calendar.createElement("tr", tbody);
 		if (this.weekNumbers) {
 			cell = Calendar.createElement("td", row);
-			cell.appendChild(document.createTextNode(""));
 		}
 		for (var j = 7; j > 0; --j) {
 			cell = Calendar.createElement("td", row);
-			cell.appendChild(document.createTextNode(""));
 			cell.calendar = this;
 			Calendar._add_evs(cell);
 		}
@@ -845,7 +847,7 @@ Calendar.prototype.create = function (_par) {
 			function makeTimePart(className, init, range_start, range_end) {
 				var part = Calendar.createElement("span", cell);
 				part.className = className;
-				part.appendChild(document.createTextNode(init));
+				part.innerHTML = init;
 				part.calendar = cal;
 				part.ttip = Calendar._TT["TIME_PART"];
 				part.navtype = 50;
@@ -870,7 +872,7 @@ Calendar.prototype.create = function (_par) {
 			if (t12 && pm) hrs -= 12;
 			var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
 			var span = Calendar.createElement("span", cell);
-			span.appendChild(document.createTextNode(":"));
+			span.innerHTML = ":";
 			span.className = "colon";
 			var M = makeTimePart("minute", mins, 0, 59);
 			var AP = null;
@@ -883,30 +885,32 @@ Calendar.prototype.create = function (_par) {
 				cell.innerHTML = "&nbsp;";
 
 			cal.onSetTime = function() {
-				var hrs = this.date.getHours();
-				var mins = this.date.getMinutes();
-				var pm = (hrs > 12);
-				if (pm && t12) hrs -= 12;
-				H.firstChild.data = (hrs < 10) ? ("0" + hrs) : hrs;
-				M.firstChild.data = (mins < 10) ? ("0" + mins) : mins;
-				if (t12)
-					AP.firstChild.data = pm ? "pm" : "am";
+				var pm, hrs = this.date.getHours(),
+					mins = this.date.getMinutes();
+				if (t12) {
+					pm = (hrs >= 12);
+					if (pm) hrs -= 12;
+					if (hrs == 0) hrs = 12;
+					AP.innerHTML = pm ? "pm" : "am";
+				}
+				H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
+				M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
 			};
 
 			cal.onUpdateTime = function() {
 				var date = this.date;
-				var h = parseInt(H.firstChild.data, 10);
+				var h = parseInt(H.innerHTML, 10);
 				if (t12) {
-					if (/pm/i.test(AP.firstChild.data) && h < 12)
+					if (/pm/i.test(AP.innerHTML) && h < 12)
 						h += 12;
-					else if (/am/i.test(AP.firstChild.data) && h == 12)
+					else if (/am/i.test(AP.innerHTML) && h == 12)
 						h = 0;
 				}
 				var d = date.getDate();
 				var m = date.getMonth();
 				var y = date.getFullYear();
 				date.setHours(h);
-				date.setMinutes(parseInt(M.firstChild.data, 10));
+				date.setMinutes(parseInt(M.innerHTML, 10));
 				date.setFullYear(y);
 				date.setMonth(m);
 				date.setDate(d);
@@ -938,7 +942,7 @@ Calendar.prototype.create = function (_par) {
 		var mn = Calendar.createElement("div");
 		mn.className = Calendar.is_ie ? "label-IEfix" : "label";
 		mn.month = i;
-		mn.appendChild(document.createTextNode(Calendar._SMN[i]));
+		mn.innerHTML = Calendar._SMN[i];
 		div.appendChild(mn);
 	}
 
@@ -948,7 +952,6 @@ Calendar.prototype.create = function (_par) {
 	for (i = 12; i > 0; --i) {
 		var yr = Calendar.createElement("div");
 		yr.className = Calendar.is_ie ? "label-IEfix" : "label";
-		yr.appendChild(document.createTextNode(""));
 		div.appendChild(yr);
 	}
 
@@ -958,14 +961,14 @@ Calendar.prototype.create = function (_par) {
 
 /** keyboard navigation, only for popup calendars */
 Calendar._keyEvent = function(ev) {
-	if (!window.calendar) {
+	var cal = window._dynarch_popupCalendar;
+	if (!cal || cal.multiple)
 		return false;
-	}
 	(Calendar.is_ie) && (ev = window.event);
-	var cal = window.calendar;
-	var act = (Calendar.is_ie || ev.type == "keypress");
+	var act = (Calendar.is_ie || ev.type == "keypress"),
+		K = ev.keyCode;
 	if (ev.ctrlKey) {
-		switch (ev.keyCode) {
+		switch (K) {
 		    case 37: // KEY left
 			act && Calendar.cellClick(cal._nav_pm);
 			break;
@@ -981,7 +984,7 @@ Calendar._keyEvent = function(ev) {
 		    default:
 			return false;
 		}
-	} else switch (ev.keyCode) {
+	} else switch (K) {
 	    case 32: // KEY space (now)
 		Calendar.cellClick(cal._nav_now);
 		break;
@@ -993,48 +996,78 @@ Calendar._keyEvent = function(ev) {
 	    case 39: // KEY right
 	    case 40: // KEY down
 		if (act) {
-			var date = cal.date.getDate() - 1;
-			var el = cal.currentDateEl;
-			var ne = null;
-			var prev = (ev.keyCode == 37) || (ev.keyCode == 38);
-			switch (ev.keyCode) {
-			    case 37: // KEY left
-				(--date >= 0) && (ne = cal.ar_days[date]);
-				break;
-			    case 38: // KEY up
-				date -= 7;
-				(date >= 0) && (ne = cal.ar_days[date]);
-				break;
-			    case 39: // KEY right
-				(++date < cal.ar_days.length) && (ne = cal.ar_days[date]);
-				break;
-			    case 40: // KEY down
-				date += 7;
-				(date < cal.ar_days.length) && (ne = cal.ar_days[date]);
+			var prev, x, y, ne, el, step;
+			prev = K == 37 || K == 38;
+			step = (K == 37 || K == 39) ? 1 : 7;
+			function setVars() {
+				el = cal.currentDateEl;
+				var p = el.pos;
+				x = p & 15;
+				y = p >> 4;
+				ne = cal.ar_days[y][x];
+			};setVars();
+			function prevMonth() {
+				var date = new Date(cal.date);
+				date.setDate(date.getDate() - step);
+				cal.setDate(date);
+			};
+			function nextMonth() {
+				var date = new Date(cal.date);
+				date.setDate(date.getDate() + step);
+				cal.setDate(date);
+			};
+			while (1) {
+				switch (K) {
+				    case 37: // KEY left
+					if (--x >= 0)
+						ne = cal.ar_days[y][x];
+					else {
+						x = 6;
+						K = 38;
+						continue;
+					}
+					break;
+				    case 38: // KEY up
+					if (--y >= 0)
+						ne = cal.ar_days[y][x];
+					else {
+						prevMonth();
+						setVars();
+					}
+					break;
+				    case 39: // KEY right
+					if (++x < 7)
+						ne = cal.ar_days[y][x];
+					else {
+						x = 0;
+						K = 40;
+						continue;
+					}
+					break;
+				    case 40: // KEY down
+					if (++y < cal.ar_days.length)
+						ne = cal.ar_days[y][x];
+					else {
+						nextMonth();
+						setVars();
+					}
+					break;
+				}
 				break;
 			}
-			if (!ne) {
-				if (prev) {
-					Calendar.cellClick(cal._nav_pm);
-				} else {
-					Calendar.cellClick(cal._nav_nm);
-				}
-				date = (prev) ? cal.date.getMonthDays() : 1;
-				el = cal.currentDateEl;
-				ne = cal.ar_days[date - 1];
+			if (ne) {
+				if (!ne.disabled)
+					Calendar.cellClick(ne);
+				else if (prev)
+					prevMonth();
+				else
+					nextMonth();
 			}
-			Calendar.removeClass(el, "selected");
-			Calendar.addClass(ne, "selected");
-			cal.date = new Date(ne.caldate);
-			cal.callHandler();
-			cal.currentDateEl = ne;
 		}
 		break;
 	    case 13: // KEY enter
-		if (act) {
-			cal.callHandler();
-			cal.hide();
-		}
+		if (act)
+			Calendar.cellClick(cal.currentDateEl, ev);
 		break;
 	    default:
 		return false;
@@ -1046,7 +1079,10 @@ Calendar._keyEvent = function(ev) {
  *  (RE)Initializes the calendar to the given date and firstDayOfWeek
  */
 Calendar.prototype._init = function (firstDayOfWeek, date) {
-	var today = new Date();
+	var today = new Date(),
+		TY = today.getFullYear(),
+		TM = today.getMonth(),
+		TD = today.getDate();
 	this.table.style.visibility = "hidden";
 	var year = date.getFullYear();
 	if (year < this.minYear) {
@@ -1074,21 +1110,24 @@ Calendar.prototype._init = function (firstDayOfWeek, date) {
 
 	var row = this.tbody.firstChild;
 	var MN = Calendar._SMN[month];
-	var ar_days = new Array();
+	var ar_days = this.ar_days = new Array();
 	var weekend = Calendar._TT["WEEKEND"];
+	var dates = this.multiple ? (this.datesCells = {}) : null;
 	for (var i = 0; i < 6; ++i, row = row.nextSibling) {
 		var cell = row.firstChild;
 		if (this.weekNumbers) {
 			cell.className = "day wn";
-			cell.firstChild.data = date.getWeekNumber();
+			cell.innerHTML = date.getWeekNumber();
 			cell = cell.nextSibling;
 		}
 		row.className = "daysrow";
-		var hasdays = false;
-		for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(date.getDate() + 1)) {
-			var iday = date.getDate();
+		var hasdays = false, iday, dpos = ar_days[i] = [];
+		for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
+			iday = date.getDate();
 			var wday = date.getDay();
 			cell.className = "day";
+			cell.pos = i << 4 | j;
+			dpos[j] = cell;
 			var current_month = (date.getMonth() == month);
 			if (!current_month) {
 				if (this.showsOtherMonths) {
@@ -1105,9 +1144,16 @@ Calendar.prototype._init = function (firstDayOfWeek, date) {
 				hasdays = true;
 			}
 			cell.disabled = false;
-			cell.firstChild.data = iday;
-			if (typeof this.getDateStatus == "function") {
+			cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
+			if (dates)
+				dates[date.print("%Y%m%d")] = cell;
+			if (this.getDateStatus) {
 				var status = this.getDateStatus(date, year, month, iday);
+				if (this.getDateToolTip) {
+					var toolTip = this.getDateToolTip(date, year, month, iday);
+					if (toolTip)
+						cell.title = toolTip;
+				}
 				if (status === true) {
 					cell.className += " disabled";
 					cell.disabled = true;
@@ -1118,33 +1164,66 @@ Calendar.prototype._init = function (firstDayOfWeek, date) {
 				}
 			}
 			if (!cell.disabled) {
-				ar_days[ar_days.length] = cell;
 				cell.caldate = new Date(date);
 				cell.ttip = "_";
-				if (current_month && iday == mday) {
+				if (!this.multiple && current_month
+				    && iday == mday && this.hiliteToday) {
 					cell.className += " selected";
 					this.currentDateEl = cell;
 				}
-				if (date.getFullYear() == today.getFullYear() &&
-				    date.getMonth() == today.getMonth() &&
-				    iday == today.getDate()) {
+				if (date.getFullYear() == TY &&
+				    date.getMonth() == TM &&
+				    iday == TD) {
 					cell.className += " today";
 					cell.ttip += Calendar._TT["PART_TODAY"];
 				}
-				if (weekend.indexOf(wday.toString()) != -1) {
+				if (weekend.indexOf(wday.toString()) != -1)
 					cell.className += cell.otherMonth ? " oweekend" : " weekend";
-				}
 			}
 		}
 		if (!(hasdays || this.showsOtherMonths))
 			row.className = "emptyrow";
 	}
-	this.ar_days = ar_days;
-	this.title.firstChild.data = Calendar._MN[month] + ", " + year;
+	this.title.innerHTML = Calendar._MN[month] + ", " + year;
 	this.onSetTime();
 	this.table.style.visibility = "visible";
+	this._initMultipleDates();
 	// PROFILE
-	// this.tooltips.firstChild.data = "Generated in " + ((new Date()) - today) + " ms";
+	// this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
+};
+
+Calendar.prototype._initMultipleDates = function() {
+	if (this.multiple) {
+		for (var i in this.multiple) {
+			var cell = this.datesCells[i];
+			var d = this.multiple[i];
+			if (!d)
+				continue;
+			if (cell)
+				cell.className += " selected";
+		}
+	}
+};
+
+Calendar.prototype._toggleMultipleDate = function(date) {
+	if (this.multiple) {
+		var ds = date.print("%Y%m%d");
+		var cell = this.datesCells[ds];
+		if (cell) {
+			var d = this.multiple[ds];
+			if (!d) {
+				Calendar.addClass(cell, "selected");
+				this.multiple[ds] = date;
+			} else {
+				Calendar.removeClass(cell, "selected");
+				delete this.multiple[ds];
+			}
+		}
+	}
+};
+
+Calendar.prototype.setDateToolTipHandler = function (unaryFunction) {
+	this.getDateToolTip = unaryFunction;
 };
 
 /**
@@ -1209,7 +1288,7 @@ Calendar.prototype.destroy = function () {
 	var el = this.element.parentNode;
 	el.removeChild(this.element);
 	Calendar._C = null;
-	window.calendar = null;
+	window._dynarch_popupCalendar = null;
 };
 
 /**
@@ -1226,14 +1305,15 @@ Calendar.prototype.reparent = function (new_parent) {
 // document, if the calendar is shown.  If the click was outside the open
 // calendar this function closes it.
 Calendar._checkCalendar = function(ev) {
-	if (!window.calendar) {
+	var calendar = window._dynarch_popupCalendar;
+	if (!calendar) {
 		return false;
 	}
 	var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
 	for (; el != null && el != calendar.element; el = el.parentNode);
 	if (el == null) {
 		// calls closeHandler which should hide the calendar.
-		window.calendar.callCloseHandler();
+		window._dynarch_popupCalendar.callCloseHandler();
 		return Calendar.stopEvent(ev);
 	}
 };
@@ -1254,7 +1334,7 @@ Calendar.prototype.show = function () {
 	this.element.style.display = "block";
 	this.hidden = false;
 	if (this.isPopup) {
-		window.calendar = this;
+		window._dynarch_popupCalendar = this;
 		Calendar.addEvent(document, "keydown", Calendar._keyEvent);
 		Calendar.addEvent(document, "keypress", Calendar._keyEvent);
 		Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
@@ -1344,8 +1424,8 @@ Calendar.prototype.showAtElement = function (el, opts) {
 		    case "L": p.x -= w; break;
 		    case "R": p.x += el.offsetWidth; break;
 		    case "C": p.x += (el.offsetWidth - w) / 2; break;
-		    case "r": p.x += el.offsetWidth - w; break;
-		    case "l": break; // already there
+		    case "l": p.x += el.offsetWidth - w; break;
+		    case "r": break; // already there
 		}
 		p.width = w;
 		p.height = h + 40;
@@ -1373,14 +1453,140 @@ Calendar.prototype.setTtDateFormat = function (str) {
  *  Tries to identify the date represented in a string.  If successful it also
  *  calls this.setDate which moves the calendar to the given date.
  */
-Calendar.prototype.parseDate = function (str, fmt) {
+Calendar.prototype.parseDate = function(str, fmt) {
+	if (!fmt)
+		fmt = this.dateFormat;
+	this.setDate(Date.parseDate(str, fmt));
+};
+
+Calendar.prototype.hideShowCovered = function () {
+	if (!Calendar.is_ie && !Calendar.is_opera)
+		return;
+	function getVisib(obj){
+		var value = obj.style.visibility;
+		if (!value) {
+			if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
+				if (!Calendar.is_khtml)
+					value = document.defaultView.
+						getComputedStyle(obj, "").getPropertyValue("visibility");
+				else
+					value = '';
+			} else if (obj.currentStyle) { // IE
+				value = obj.currentStyle.visibility;
+			} else
+				value = '';
+		}
+		return value;
+	};
+
+	var tags = new Array("applet", "iframe", "select");
+	var el = this.element;
+
+	var p = Calendar.getAbsolutePos(el);
+	var EX1 = p.x;
+	var EX2 = el.offsetWidth + EX1;
+	var EY1 = p.y;
+	var EY2 = el.offsetHeight + EY1;
+
+	for (var k = tags.length; k > 0; ) {
+		var ar = document.getElementsByTagName(tags[--k]);
+		var cc = null;
+
+		for (var i = ar.length; i > 0;) {
+			cc = ar[--i];
+
+			p = Calendar.getAbsolutePos(cc);
+			var CX1 = p.x;
+			var CX2 = cc.offsetWidth + CX1;
+			var CY1 = p.y;
+			var CY2 = cc.offsetHeight + CY1;
+
+			if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getVisib(cc);
+				}
+				cc.style.visibility = cc.__msh_save_visibility;
+			} else {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getVisib(cc);
+				}
+				cc.style.visibility = "hidden";
+			}
+		}
+	}
+};
+
+/** Internal function; it displays the bar with the names of the weekday. */
+Calendar.prototype._displayWeekdays = function () {
+	var fdow = this.firstDayOfWeek;
+	var cell = this.firstdayname;
+	var weekend = Calendar._TT["WEEKEND"];
+	for (var i = 0; i < 7; ++i) {
+		cell.className = "day name";
+		var realday = (i + fdow) % 7;
+		if (i) {
+			cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
+			cell.navtype = 100;
+			cell.calendar = this;
+			cell.fdow = realday;
+			Calendar._add_evs(cell);
+		}
+		if (weekend.indexOf(realday.toString()) != -1) {
+			Calendar.addClass(cell, "weekend");
+		}
+		cell.innerHTML = Calendar._SDN[(i + fdow) % 7];
+		cell = cell.nextSibling;
+	}
+};
+
+/** Internal function.  Hides all combo boxes that might be displayed. */
+Calendar.prototype._hideCombos = function () {
+	this.monthsCombo.style.display = "none";
+	this.yearsCombo.style.display = "none";
+};
+
+/** Internal function.  Starts dragging the element. */
+Calendar.prototype._dragStart = function (ev) {
+	if (this.dragging) {
+		return;
+	}
+	this.dragging = true;
+	var posX;
+	var posY;
+	if (Calendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posY = ev.clientY + window.scrollY;
+		posX = ev.clientX + window.scrollX;
+	}
+	var st = this.element.style;
+	this.xOffs = posX - parseInt(st.left);
+	this.yOffs = posY - parseInt(st.top);
+	with (Calendar) {
+		addEvent(document, "mousemove", calDragIt);
+		addEvent(document, "mouseup", calDragEnd);
+	}
+};
+
+// BEGIN: DATE OBJECT PATCHES
+
+/** Adds the number of days array to the Date object. */
+Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
+
+/** Constants used for time computations */
+Date.SECOND = 1000 /* milliseconds */;
+Date.MINUTE = 60 * Date.SECOND;
+Date.HOUR   = 60 * Date.MINUTE;
+Date.DAY    = 24 * Date.HOUR;
+Date.WEEK   =  7 * Date.DAY;
+
+Date.parseDate = function(str, fmt) {
+	var today = new Date();
 	var y = 0;
 	var m = -1;
 	var d = 0;
 	var a = str.split(/\W+/);
-	if (!fmt) {
-		fmt = this.dateFormat;
-	}
 	var b = fmt.match(/%./g);
 	var i = 0, j = 0;
 	var hr = 0;
@@ -1422,6 +1628,8 @@ Calendar.prototype.parseDate = function (str, fmt) {
 		    case "%p":
 			if (/pm/i.test(a[i]) && hr < 12)
 				hr += 12;
+			else if (/am/i.test(a[i]) && hr >= 12)
+				hr -= 12;
 			break;
 
 		    case "%M":
@@ -1429,10 +1637,13 @@ Calendar.prototype.parseDate = function (str, fmt) {
 			break;
 		}
 	}
-	if (y != 0 && m != -1 && d != 0) {
-		this.setDate(new Date(y, m, d, hr, min, 0));
-		return;
-	}
+	if (isNaN(y)) y = today.getFullYear();
+	if (isNaN(m)) m = today.getMonth();
+	if (isNaN(d)) d = today.getDate();
+	if (isNaN(hr)) hr = today.getHours();
+	if (isNaN(min)) min = today.getMinutes();
+	if (y != 0 && m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
 	y = 0; m = -1; d = 0;
 	for (i = 0; i < a.length; ++i) {
 		if (a[i].search(/[a-zA-Z]+/) != -1) {
@@ -1455,142 +1666,13 @@ Calendar.prototype.parseDate = function (str, fmt) {
 			d = a[i];
 		}
 	}
-	if (y == 0) {
-		var today = new Date();
+	if (y == 0)
 		y = today.getFullYear();
-	}
-	if (m != -1 && d != 0) {
-		this.setDate(new Date(y, m, d, hr, min, 0));
-	}
-};
-
-Calendar.prototype.hideShowCovered = function () {
-	var self = this;
-	Calendar.continuation_for_the_fucking_khtml_browser = function() {
-		function getVisib(obj){
-			var value = obj.style.visibility;
-			if (!value) {
-				if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
-					if (!Calendar.is_khtml)
-						value = document.defaultView.
-							getComputedStyle(obj, "").getPropertyValue("visibility");
-					else
-						value = '';
-				} else if (obj.currentStyle) { // IE
-					value = obj.currentStyle.visibility;
-				} else
-					value = '';
-			}
-			return value;
-		};
-
-		var tags = new Array("applet", "iframe", "select");
-		var el = self.element;
-
-		var p = Calendar.getAbsolutePos(el);
-		var EX1 = p.x;
-		var EX2 = el.offsetWidth + EX1;
-		var EY1 = p.y;
-		var EY2 = el.offsetHeight + EY1;
-
-		for (var k = tags.length; k > 0; ) {
-			var ar = document.getElementsByTagName(tags[--k]);
-			var cc = null;
-
-			for (var i = ar.length; i > 0;) {
-				cc = ar[--i];
-
-				p = Calendar.getAbsolutePos(cc);
-				var CX1 = p.x;
-				var CX2 = cc.offsetWidth + CX1;
-				var CY1 = p.y;
-				var CY2 = cc.offsetHeight + CY1;
-
-				if (self.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
-					if (!cc.__msh_save_visibility) {
-						cc.__msh_save_visibility = getVisib(cc);
-					}
-					cc.style.visibility = cc.__msh_save_visibility;
-				} else {
-					if (!cc.__msh_save_visibility) {
-						cc.__msh_save_visibility = getVisib(cc);
-					}
-					cc.style.visibility = "hidden";
-				}
-			}
-		}
-	};
-	if (Calendar.is_khtml)
-		setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
-	else
-		Calendar.continuation_for_the_fucking_khtml_browser();
-};
-
-/** Internal function; it displays the bar with the names of the weekday. */
-Calendar.prototype._displayWeekdays = function () {
-	var fdow = this.firstDayOfWeek;
-	var cell = this.firstdayname;
-	var weekend = Calendar._TT["WEEKEND"];
-	for (var i = 0; i < 7; ++i) {
-		cell.className = "day name";
-		var realday = (i + fdow) % 7;
-		if (i) {
-			cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
-			cell.navtype = 100;
-			cell.calendar = this;
-			cell.fdow = realday;
-			Calendar._add_evs(cell);
-		}
-		if (weekend.indexOf(realday.toString()) != -1) {
-			Calendar.addClass(cell, "weekend");
-		}
-		cell.firstChild.data = Calendar._SDN[(i + fdow) % 7];
-		cell = cell.nextSibling;
-	}
-};
-
-/** Internal function.  Hides all combo boxes that might be displayed. */
-Calendar.prototype._hideCombos = function () {
-	this.monthsCombo.style.display = "none";
-	this.yearsCombo.style.display = "none";
-};
-
-/** Internal function.  Starts dragging the element. */
-Calendar.prototype._dragStart = function (ev) {
-	if (this.dragging) {
-		return;
-	}
-	this.dragging = true;
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posY = ev.clientY + window.scrollY;
-		posX = ev.clientX + window.scrollX;
-	}
-	var st = this.element.style;
-	this.xOffs = posX - parseInt(st.left);
-	this.yOffs = posY - parseInt(st.top);
-	with (Calendar) {
-		addEvent(document, "mousemove", calDragIt);
-		addEvent(document, "mouseup", calDragEnd);
-	}
+	if (m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	return today;
 };
 
-// BEGIN: DATE OBJECT PATCHES
-
-/** Adds the number of days array to the Date object. */
-Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
-
-/** Constants used for time computations */
-Date.SECOND = 1000 /* milliseconds */;
-Date.MINUTE = 60 * Date.SECOND;
-Date.HOUR   = 60 * Date.MINUTE;
-Date.DAY    = 24 * Date.HOUR;
-Date.WEEK   =  7 * Date.DAY;
-
 /** Returns the number of days in the current month */
 Date.prototype.getMonthDays = function(month) {
 	var year = this.getFullYear();
@@ -1623,7 +1705,7 @@ Date.prototype.getWeekNumber = function() {
 	return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
 };
 
-/** Checks dates equality (ignores time) */
+/** Checks date and time equality */
 Date.prototype.equalsTo = function(date) {
 	return ((this.getFullYear() == date.getFullYear()) &&
 		(this.getMonth() == date.getMonth()) &&
@@ -1632,6 +1714,15 @@ Date.prototype.equalsTo = function(date) {
 		(this.getMinutes() == date.getMinutes()));
 };
 
+/** Set only the year, month, date parts (keep existing time) */
+Date.prototype.setDateOnly = function(date) {
+	var tmp = new Date(date);
+	this.setDate(1);
+	this.setFullYear(tmp.getFullYear());
+	this.setMonth(tmp.getMonth());
+	this.setDate(tmp.getDate());
+};
+
 /** Prints the date in a string according to the given format. */
 Date.prototype.print = function (str) {
 	var m = this.getMonth();
@@ -1684,7 +1775,7 @@ Date.prototype.print = function (str) {
 	s["%%"] = "%";		// a literal '%' character
 
 	var re = /%./g;
-	if (!Calendar.is_ie5)
+	if (!Calendar.is_ie5 && !Calendar.is_khtml)
 		return str.replace(re, function (par) { return s[par] || par; });
 
 	var a = str.match(re);
@@ -1712,4 +1803,4 @@ Date.prototype.setFullYear = function(y) {
 
 
 // global object that remembers the calendar
-window.calendar = null;
+window._dynarch_popupCalendar = null;
diff --git a/httemplate/elements/calendar_stripped.js b/httemplate/elements/calendar_stripped.js
index 6a8e326af..4fe03f1ea 100644
--- a/httemplate/elements/calendar_stripped.js
+++ b/httemplate/elements/calendar_stripped.js
@@ -1,12 +1,14 @@
-/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
- * ------------------------------------------------------------------
+/*  Copyright Mihai Bazon, 2002-2005  |  www.bazon.net/mishoo
+ * -----------------------------------------------------------
  *
- * The DHTML Calendar, version 0.9.6 "Keep cool but don't freeze"
+ * The DHTML Calendar, version 1.0 "It is happening again"
  *
  * Details and latest version at:
- * http://dynarch.com/mishoo/calendar.epl
+ * www.dynarch.com/projects/calendar
+ *
+ * This script is developed by Dynarch.com.  Visit us at www.dynarch.com.
  *
  * This script is distributed under the GNU Lesser General Public License.
  * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
  */
- Calendar=function(firstDayOfWeek,dateStr,onSelected,onClose){this.activeDiv=null;this.currentDateEl=null;this.getDateStatus=null;this.timeout=null;this.onSelected=onSelected||null;this.onClose=onClose||null;this.dragging=false;this.hidden=false;this.minYear=1970;this.maxYear=2050;this.dateFormat=Calendar._TT["DEF_DATE_FORMAT"];this.ttDateFormat=Calendar._TT["TT_DATE_FORMAT"];this.isPopup=true;this.weekNumbers=true;this.firstDayOfWeek=firstDayOfWeek;this.showsOtherMonths=false;this.dateStr=dateStr;this.ar_days=null;this.showsTime=false;this.time24=true;this.yearStep=2;this.table=null;this.element=null;this.tbody=null;this.firstdayname=null;this.monthsCombo=null;this.yearsCombo=null;this.hilitedMonth=null;this.activeMonth=null;this.hilitedYear=null;this.activeYear=null;this.dateClicked=false;if(typeof Calendar._SDN=="undefined"){if(typeof Calendar._SDN_len=="undefined")Calendar._SDN_len=3;var ar=new Array();for(var i=8;i>0;){ar[--i]=Calendar._DN[i].substr(0,Calendar._SDN_len);}Calendar._SDN=ar;if(typeof Calendar._SMN_len=="undefined")Calendar._SMN_len=3;ar=new Array();for(var i=12;i>0;){ar[--i]=Calendar._MN[i].substr(0,Calendar._SMN_len);}Calendar._SMN=ar;}};Calendar._C=null;Calendar.is_ie=(/msie/i.test(navigator.userAgent)&&!/opera/i.test(navigator.userAgent));Calendar.is_ie5=(Calendar.is_ie&&/msie 5\.0/i.test(navigator.userAgent));Calendar.is_opera=/opera/i.test(navigator.userAgent);Calendar.is_khtml=/Konqueror|Safari|KHTML/i.test(navigator.userAgent);Calendar.getAbsolutePos=function(el){var SL=0,ST=0;var is_div=/^div$/i.test(el.tagName);if(is_div&&el.scrollLeft)SL=el.scrollLeft;if(is_div&&el.scrollTop)ST=el.scrollTop;var r={x:el.offsetLeft-SL,y:el.offsetTop-ST};if(el.offsetParent){var tmp=this.getAbsolutePos(el.offsetParent);r.x+=tmp.x;r.y+=tmp.y;}return r;};Calendar.isRelated=function(el,evt){var related=evt.relatedTarget;if(!related){var type=evt.type;if(type=="mouseover"){related=evt.fromElement;}else if(type=="mouseout"){related=evt.toElement;}}while(related){if(related==el){return true;}related=related.parentNode;}return false;};Calendar.removeClass=function(el,className){if(!(el&&el.className)){return;}var cls=el.className.split(" ");var ar=new Array();for(var i=cls.length;i>0;){if(cls[--i]!=className){ar[ar.length]=cls[i];}}el.className=ar.join(" ");};Calendar.addClass=function(el,className){Calendar.removeClass(el,className);el.className+=" "+className;};Calendar.getElement=function(ev){if(Calendar.is_ie){return window.event.srcElement;}else{return ev.currentTarget;}};Calendar.getTargetElement=function(ev){if(Calendar.is_ie){return window.event.srcElement;}else{return ev.target;}};Calendar.stopEvent=function(ev){ev||(ev=window.event);if(Calendar.is_ie){ev.cancelBubble=true;ev.returnValue=false;}else{ev.preventDefault();ev.stopPropagation();}return false;};Calendar.addEvent=function(el,evname,func){if(el.attachEvent){el.attachEvent("on"+evname,func);}else if(el.addEventListener){el.addEventListener(evname,func,true);}else{el["on"+evname]=func;}};Calendar.removeEvent=function(el,evname,func){if(el.detachEvent){el.detachEvent("on"+evname,func);}else if(el.removeEventListener){el.removeEventListener(evname,func,true);}else{el["on"+evname]=null;}};Calendar.createElement=function(type,parent){var el=null;if(document.createElementNS){el=document.createElementNS("http://www.w3.org/1999/xhtml",type);}else{el=document.createElement(type);}if(typeof parent!="undefined"){parent.appendChild(el);}return el;};Calendar._add_evs=function(el){with(Calendar){addEvent(el,"mouseover",dayMouseOver);addEvent(el,"mousedown",dayMouseDown);addEvent(el,"mouseout",dayMouseOut);if(is_ie){addEvent(el,"dblclick",dayMouseDblClick);el.setAttribute("unselectable",true);}}};Calendar.findMonth=function(el){if(typeof el.month!="undefined"){return el;}else if(typeof el.parentNode.month!="undefined"){return el.parentNode;}return null;};Calendar.findYear=function(el){if(typeof el.year!="undefined"){return el;}else if(typeof el.parentNode.year!="undefined"){return el.parentNode;}return null;};Calendar.showMonthsCombo=function(){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var mc=cal.monthsCombo;if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}if(cal.activeMonth){Calendar.removeClass(cal.activeMonth,"active");}var mon=cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];Calendar.addClass(mon,"active");cal.activeMonth=mon;var s=mc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var mcw=mc.offsetWidth;if(typeof mcw=="undefined")mcw=50;s.left=(cd.offsetLeft+cd.offsetWidth-mcw)+"px";}s.top=(cd.offsetTop+cd.offsetHeight)+"px";};Calendar.showYearsCombo=function(fwd){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var yc=cal.yearsCombo;if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}if(cal.activeYear){Calendar.removeClass(cal.activeYear,"active");}cal.activeYear=null;var Y=cal.date.getFullYear()+(fwd?1:-1);var yr=yc.firstChild;var show=false;for(var i=12;i>0;--i){if(Y>=cal.minYear&&Y<=cal.maxYear){yr.firstChild.data=Y;yr.year=Y;yr.style.display="block";show=true;}else{yr.style.display="none";}yr=yr.nextSibling;Y+=fwd?cal.yearStep:-cal.yearStep;}if(show){var s=yc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var ycw=yc.offsetWidth;if(typeof ycw=="undefined")ycw=50;s.left=(cd.offsetLeft+cd.offsetWidth-ycw)+"px";}s.top=(cd.offsetTop+cd.offsetHeight)+"px";}};Calendar.tableMouseUp=function(ev){var cal=Calendar._C;if(!cal){return false;}if(cal.timeout){clearTimeout(cal.timeout);}var el=cal.activeDiv;if(!el){return false;}var target=Calendar.getTargetElement(ev);ev||(ev=window.event);Calendar.removeClass(el,"active");if(target==el||target.parentNode==el){Calendar.cellClick(el,ev);}var mon=Calendar.findMonth(target);var date=null;if(mon){date=new Date(cal.date);if(mon.month!=date.getMonth()){date.setMonth(mon.month);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}else{var year=Calendar.findYear(target);if(year){date=new Date(cal.date);if(year.year!=date.getFullYear()){date.setFullYear(year.year);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}}with(Calendar){removeEvent(document,"mouseup",tableMouseUp);removeEvent(document,"mouseover",tableMouseOver);removeEvent(document,"mousemove",tableMouseOver);cal._hideCombos();_C=null;return stopEvent(ev);}};Calendar.tableMouseOver=function(ev){var cal=Calendar._C;if(!cal){return;}var el=cal.activeDiv;var target=Calendar.getTargetElement(ev);if(target==el||target.parentNode==el){Calendar.addClass(el,"hilite active");Calendar.addClass(el.parentNode,"rowhilite");}else{if(typeof el.navtype=="undefined"||(el.navtype!=50&&(el.navtype==0||Math.abs(el.navtype)>2)))Calendar.removeClass(el,"active");Calendar.removeClass(el,"hilite");Calendar.removeClass(el.parentNode,"rowhilite");}ev||(ev=window.event);if(el.navtype==50&&target!=el){var pos=Calendar.getAbsolutePos(el);var w=el.offsetWidth;var x=ev.clientX;var dx;var decrease=true;if(x>pos.x+w){dx=x-pos.x-w;decrease=false;}else dx=pos.x-x;if(dx<0)dx=0;var range=el._range;var current=el._current;var count=Math.floor(dx/10)%range.length;for(var i=range.length;--i>=0;)if(range[i]==current)break;while(count-->0)if(decrease){if(--i<0)i=range.length-1;}else if(++i>=range.length)i=0;var newval=range[i];el.firstChild.data=newval;cal.onUpdateTime();}var mon=Calendar.findMonth(target);if(mon){if(mon.month!=cal.date.getMonth()){if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}Calendar.addClass(mon,"hilite");cal.hilitedMonth=mon;}else if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}}else{if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}var year=Calendar.findYear(target);if(year){if(year.year!=cal.date.getFullYear()){if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}Calendar.addClass(year,"hilite");cal.hilitedYear=year;}else if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}}else if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}}return Calendar.stopEvent(ev);};Calendar.tableMouseDown=function(ev){if(Calendar.getTargetElement(ev)==Calendar.getElement(ev)){return Calendar.stopEvent(ev);}};Calendar.calDragIt=function(ev){var cal=Calendar._C;if(!(cal&&cal.dragging)){return false;}var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posX=ev.pageX;posY=ev.pageY;}cal.hideShowCovered();var st=cal.element.style;st.left=(posX-cal.xOffs)+"px";st.top=(posY-cal.yOffs)+"px";return Calendar.stopEvent(ev);};Calendar.calDragEnd=function(ev){var cal=Calendar._C;if(!cal){return false;}cal.dragging=false;with(Calendar){removeEvent(document,"mousemove",calDragIt);removeEvent(document,"mouseup",calDragEnd);tableMouseUp(ev);}cal.hideShowCovered();};Calendar.dayMouseDown=function(ev){var el=Calendar.getElement(ev);if(el.disabled){return false;}var cal=el.calendar;cal.activeDiv=el;Calendar._C=cal;if(el.navtype!=300)with(Calendar){if(el.navtype==50){el._current=el.firstChild.data;addEvent(document,"mousemove",tableMouseOver);}else addEvent(document,Calendar.is_ie5?"mousemove":"mouseover",tableMouseOver);addClass(el,"hilite active");addEvent(document,"mouseup",tableMouseUp);}else if(cal.isPopup){cal._dragStart(ev);}if(el.navtype==-1||el.navtype==1){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout("Calendar.showMonthsCombo()",250);}else if(el.navtype==-2||el.navtype==2){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout((el.navtype>0)?"Calendar.showYearsCombo(true)":"Calendar.showYearsCombo(false)",250);}else{cal.timeout=null;}return Calendar.stopEvent(ev);};Calendar.dayMouseDblClick=function(ev){Calendar.cellClick(Calendar.getElement(ev),ev||window.event);if(Calendar.is_ie){document.selection.empty();}};Calendar.dayMouseOver=function(ev){var el=Calendar.getElement(ev);if(Calendar.isRelated(el,ev)||Calendar._C||el.disabled){return false;}if(el.ttip){if(el.ttip.substr(0,1)=="_"){el.ttip=el.caldate.print(el.calendar.ttDateFormat)+el.ttip.substr(1);}el.calendar.tooltips.firstChild.data=el.ttip;}if(el.navtype!=300){Calendar.addClass(el,"hilite");if(el.caldate){Calendar.addClass(el.parentNode,"rowhilite");}}return Calendar.stopEvent(ev);};Calendar.dayMouseOut=function(ev){with(Calendar){var el=getElement(ev);if(isRelated(el,ev)||_C||el.disabled){return false;}removeClass(el,"hilite");if(el.caldate){removeClass(el.parentNode,"rowhilite");}el.calendar.tooltips.firstChild.data=_TT["SEL_DATE"];return stopEvent(ev);}};Calendar.cellClick=function(el,ev){var cal=el.calendar;var closing=false;var newdate=false;var date=null;if(typeof el.navtype=="undefined"){Calendar.removeClass(cal.currentDateEl,"selected");Calendar.addClass(el,"selected");closing=(cal.currentDateEl==el);if(!closing){cal.currentDateEl=el;}cal.date=new Date(el.caldate);date=cal.date;newdate=true;if(!(cal.dateClicked=!el.otherMonth))cal._init(cal.firstDayOfWeek,date);}else{if(el.navtype==200){Calendar.removeClass(el,"hilite");cal.callCloseHandler();return;}date=(el.navtype==0)?new Date():new Date(cal.date);cal.dateClicked=false;var year=date.getFullYear();var mon=date.getMonth();function setMonth(m){var day=date.getDate();var max=date.getMonthDays(m);if(day>max){date.setDate(max);}date.setMonth(m);};switch(el.navtype){case 400:Calendar.removeClass(el,"hilite");var text=Calendar._TT["ABOUT"];if(typeof text!="undefined"){text+=cal.showsTime?Calendar._TT["ABOUT_TIME"]:"";}else{text="Help and about box text is not translated into this language.\n"+"If you know this language and you feel generous please update\n"+"the corresponding file in \"lang\" subdir to match calendar-en.js\n"+"and send it back to <mishoo@infoiasi.ro> to get it into the distribution  ;-)\n\n"+"Thank you!\n"+"http://dynarch.com/mishoo/calendar.epl\n";}alert(text);return;case-2:if(year>cal.minYear){date.setFullYear(year-1);}break;case-1:if(mon>0){setMonth(mon-1);}else if(year-->cal.minYear){date.setFullYear(year);setMonth(11);}break;case 1:if(mon<11){setMonth(mon+1);}else if(year<cal.maxYear){date.setFullYear(year+1);setMonth(0);}break;case 2:if(year<cal.maxYear){date.setFullYear(year+1);}break;case 100:cal.setFirstDayOfWeek(el.fdow);return;case 50:var range=el._range;var current=el.firstChild.data;for(var i=range.length;--i>=0;)if(range[i]==current)break;if(ev&&ev.shiftKey){if(--i<0)i=range.length-1;}else if(++i>=range.length)i=0;var newval=range[i];el.firstChild.data=newval;cal.onUpdateTime();return;case 0:if((typeof cal.getDateStatus=="function")&&cal.getDateStatus(date,date.getFullYear(),date.getMonth(),date.getDate())){return false;}break;}if(!date.equalsTo(cal.date)){cal.setDate(date);newdate=true;}}if(newdate){cal.callHandler();}if(closing){Calendar.removeClass(el,"hilite");cal.callCloseHandler();}};Calendar.prototype.create=function(_par){var parent=null;if(!_par){parent=document.getElementsByTagName("body")[0];this.isPopup=true;}else{parent=_par;this.isPopup=false;}this.date=this.dateStr?new Date(this.dateStr):new Date();var table=Calendar.createElement("table");this.table=table;table.cellSpacing=0;table.cellPadding=0;table.calendar=this;Calendar.addEvent(table,"mousedown",Calendar.tableMouseDown);var div=Calendar.createElement("div");this.element=div;div.className="calendar";if(this.isPopup){div.style.position="absolute";div.style.display="none";}div.appendChild(table);var thead=Calendar.createElement("thead",table);var cell=null;var row=null;var cal=this;var hh=function(text,cs,navtype){cell=Calendar.createElement("td",row);cell.colSpan=cs;cell.className="button";if(navtype!=0&&Math.abs(navtype)<=2)cell.className+=" nav";Calendar._add_evs(cell);cell.calendar=cal;cell.navtype=navtype;if(text.substr(0,1)!="&"){cell.appendChild(document.createTextNode(text));}else{cell.innerHTML=text;}return cell;};row=Calendar.createElement("tr",thead);var title_length=6;(this.isPopup)&&--title_length;(this.weekNumbers)&&++title_length;hh("?",1,400).ttip=Calendar._TT["INFO"];this.title=hh("",title_length,300);this.title.className="title";if(this.isPopup){this.title.ttip=Calendar._TT["DRAG_TO_MOVE"];this.title.style.cursor="move";hh("&#x00d7;",1,200).ttip=Calendar._TT["CLOSE"];}row=Calendar.createElement("tr",thead);row.className="headrow";this._nav_py=hh("&#x00ab;",1,-2);this._nav_py.ttip=Calendar._TT["PREV_YEAR"];this._nav_pm=hh("&#x2039;",1,-1);this._nav_pm.ttip=Calendar._TT["PREV_MONTH"];this._nav_now=hh(Calendar._TT["TODAY"],this.weekNumbers?4:3,0);this._nav_now.ttip=Calendar._TT["GO_TODAY"];this._nav_nm=hh("&#x203a;",1,1);this._nav_nm.ttip=Calendar._TT["NEXT_MONTH"];this._nav_ny=hh("&#x00bb;",1,2);this._nav_ny.ttip=Calendar._TT["NEXT_YEAR"];row=Calendar.createElement("tr",thead);row.className="daynames";if(this.weekNumbers){cell=Calendar.createElement("td",row);cell.className="name wn";cell.appendChild(document.createTextNode(Calendar._TT["WK"]));}for(var i=7;i>0;--i){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));if(!i){cell.navtype=100;cell.calendar=this;Calendar._add_evs(cell);}}this.firstdayname=(this.weekNumbers)?row.firstChild.nextSibling:row.firstChild;this._displayWeekdays();var tbody=Calendar.createElement("tbody",table);this.tbody=tbody;for(i=6;i>0;--i){row=Calendar.createElement("tr",tbody);if(this.weekNumbers){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));}for(var j=7;j>0;--j){cell=Calendar.createElement("td",row);cell.appendChild(document.createTextNode(""));cell.calendar=this;Calendar._add_evs(cell);}}if(this.showsTime){row=Calendar.createElement("tr",tbody);row.className="time";cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=2;cell.innerHTML=Calendar._TT["TIME"]||"&nbsp;";cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=this.weekNumbers?4:3;(function(){function makeTimePart(className,init,range_start,range_end){var part=Calendar.createElement("span",cell);part.className=className;part.appendChild(document.createTextNode(init));part.calendar=cal;part.ttip=Calendar._TT["TIME_PART"];part.navtype=50;part._range=[];if(typeof range_start!="number")part._range=range_start;else{for(var i=range_start;i<=range_end;++i){var txt;if(i<10&&range_end>=10)txt='0'+i;else txt=''+i;part._range[part._range.length]=txt;}}Calendar._add_evs(part);return part;};var hrs=cal.date.getHours();var mins=cal.date.getMinutes();var t12=!cal.time24;var pm=(hrs>12);if(t12&&pm)hrs-=12;var H=makeTimePart("hour",hrs,t12?1:0,t12?12:23);var span=Calendar.createElement("span",cell);span.appendChild(document.createTextNode(":"));span.className="colon";var M=makeTimePart("minute",mins,0,59);var AP=null;cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=2;if(t12)AP=makeTimePart("ampm",pm?"pm":"am",["am","pm"]);else cell.innerHTML="&nbsp;";cal.onSetTime=function(){var hrs=this.date.getHours();var mins=this.date.getMinutes();var pm=(hrs>12);if(pm&&t12)hrs-=12;H.firstChild.data=(hrs<10)?("0"+hrs):hrs;M.firstChild.data=(mins<10)?("0"+mins):mins;if(t12)AP.firstChild.data=pm?"pm":"am";};cal.onUpdateTime=function(){var date=this.date;var h=parseInt(H.firstChild.data,10);if(t12){if(/pm/i.test(AP.firstChild.data)&&h<12)h+=12;else if(/am/i.test(AP.firstChild.data)&&h==12)h=0;}var d=date.getDate();var m=date.getMonth();var y=date.getFullYear();date.setHours(h);date.setMinutes(parseInt(M.firstChild.data,10));date.setFullYear(y);date.setMonth(m);date.setDate(d);this.dateClicked=false;this.callHandler();};})();}else{this.onSetTime=this.onUpdateTime=function(){};}var tfoot=Calendar.createElement("tfoot",table);row=Calendar.createElement("tr",tfoot);row.className="footrow";cell=hh(Calendar._TT["SEL_DATE"],this.weekNumbers?8:7,300);cell.className="ttip";if(this.isPopup){cell.ttip=Calendar._TT["DRAG_TO_MOVE"];cell.style.cursor="move";}this.tooltips=cell;div=Calendar.createElement("div",this.element);this.monthsCombo=div;div.className="combo";for(i=0;i<Calendar._MN.length;++i){var mn=Calendar.createElement("div");mn.className=Calendar.is_ie?"label-IEfix":"label";mn.month=i;mn.appendChild(document.createTextNode(Calendar._SMN[i]));div.appendChild(mn);}div=Calendar.createElement("div",this.element);this.yearsCombo=div;div.className="combo";for(i=12;i>0;--i){var yr=Calendar.createElement("div");yr.className=Calendar.is_ie?"label-IEfix":"label";yr.appendChild(document.createTextNode(""));div.appendChild(yr);}this._init(this.firstDayOfWeek,this.date);parent.appendChild(this.element);};Calendar._keyEvent=function(ev){if(!window.calendar){return false;}(Calendar.is_ie)&&(ev=window.event);var cal=window.calendar;var act=(Calendar.is_ie||ev.type=="keypress");if(ev.ctrlKey){switch(ev.keyCode){case 37:act&&Calendar.cellClick(cal._nav_pm);break;case 38:act&&Calendar.cellClick(cal._nav_py);break;case 39:act&&Calendar.cellClick(cal._nav_nm);break;case 40:act&&Calendar.cellClick(cal._nav_ny);break;default:return false;}}else switch(ev.keyCode){case 32:Calendar.cellClick(cal._nav_now);break;case 27:act&&cal.callCloseHandler();break;case 37:case 38:case 39:case 40:if(act){var date=cal.date.getDate()-1;var el=cal.currentDateEl;var ne=null;var prev=(ev.keyCode==37)||(ev.keyCode==38);switch(ev.keyCode){case 37:(--date>=0)&&(ne=cal.ar_days[date]);break;case 38:date-=7;(date>=0)&&(ne=cal.ar_days[date]);break;case 39:(++date<cal.ar_days.length)&&(ne=cal.ar_days[date]);break;case 40:date+=7;(date<cal.ar_days.length)&&(ne=cal.ar_days[date]);break;}if(!ne){if(prev){Calendar.cellClick(cal._nav_pm);}else{Calendar.cellClick(cal._nav_nm);}date=(prev)?cal.date.getMonthDays():1;el=cal.currentDateEl;ne=cal.ar_days[date-1];}Calendar.removeClass(el,"selected");Calendar.addClass(ne,"selected");cal.date=new Date(ne.caldate);cal.callHandler();cal.currentDateEl=ne;}break;case 13:if(act){cal.callHandler();cal.hide();}break;default:return false;}return Calendar.stopEvent(ev);};Calendar.prototype._init=function(firstDayOfWeek,date){var today=new Date();this.table.style.visibility="hidden";var year=date.getFullYear();if(year<this.minYear){year=this.minYear;date.setFullYear(year);}else if(year>this.maxYear){year=this.maxYear;date.setFullYear(year);}this.firstDayOfWeek=firstDayOfWeek;this.date=new Date(date);var month=date.getMonth();var mday=date.getDate();var no_days=date.getMonthDays();date.setDate(1);var day1=(date.getDay()-this.firstDayOfWeek)%7;if(day1<0)day1+=7;date.setDate(-day1);date.setDate(date.getDate()+1);var row=this.tbody.firstChild;var MN=Calendar._SMN[month];var ar_days=new Array();var weekend=Calendar._TT["WEEKEND"];for(var i=0;i<6;++i,row=row.nextSibling){var cell=row.firstChild;if(this.weekNumbers){cell.className="day wn";cell.firstChild.data=date.getWeekNumber();cell=cell.nextSibling;}row.className="daysrow";var hasdays=false;for(var j=0;j<7;++j,cell=cell.nextSibling,date.setDate(date.getDate()+1)){var iday=date.getDate();var wday=date.getDay();cell.className="day";var current_month=(date.getMonth()==month);if(!current_month){if(this.showsOtherMonths){cell.className+=" othermonth";cell.otherMonth=true;}else{cell.className="emptycell";cell.innerHTML="&nbsp;";cell.disabled=true;continue;}}else{cell.otherMonth=false;hasdays=true;}cell.disabled=false;cell.firstChild.data=iday;if(typeof this.getDateStatus=="function"){var status=this.getDateStatus(date,year,month,iday);if(status===true){cell.className+=" disabled";cell.disabled=true;}else{if(/disabled/i.test(status))cell.disabled=true;cell.className+=" "+status;}}if(!cell.disabled){ar_days[ar_days.length]=cell;cell.caldate=new Date(date);cell.ttip="_";if(current_month&&iday==mday){cell.className+=" selected";this.currentDateEl=cell;}if(date.getFullYear()==today.getFullYear()&&date.getMonth()==today.getMonth()&&iday==today.getDate()){cell.className+=" today";cell.ttip+=Calendar._TT["PART_TODAY"];}if(weekend.indexOf(wday.toString())!=-1){cell.className+=cell.otherMonth?" oweekend":" weekend";}}}if(!(hasdays||this.showsOtherMonths))row.className="emptyrow";}this.ar_days=ar_days;this.title.firstChild.data=Calendar._MN[month]+", "+year;this.onSetTime();this.table.style.visibility="visible";};Calendar.prototype.setDate=function(date){if(!date.equalsTo(this.date)){this._init(this.firstDayOfWeek,date);}};Calendar.prototype.refresh=function(){this._init(this.firstDayOfWeek,this.date);};Calendar.prototype.setFirstDayOfWeek=function(firstDayOfWeek){this._init(firstDayOfWeek,this.date);this._displayWeekdays();};Calendar.prototype.setDateStatusHandler=Calendar.prototype.setDisabledHandler=function(unaryFunction){this.getDateStatus=unaryFunction;};Calendar.prototype.setRange=function(a,z){this.minYear=a;this.maxYear=z;};Calendar.prototype.callHandler=function(){if(this.onSelected){this.onSelected(this,this.date.print(this.dateFormat));}};Calendar.prototype.callCloseHandler=function(){if(this.onClose){this.onClose(this);}this.hideShowCovered();};Calendar.prototype.destroy=function(){var el=this.element.parentNode;el.removeChild(this.element);Calendar._C=null;window.calendar=null;};Calendar.prototype.reparent=function(new_parent){var el=this.element;el.parentNode.removeChild(el);new_parent.appendChild(el);};Calendar._checkCalendar=function(ev){if(!window.calendar){return false;}var el=Calendar.is_ie?Calendar.getElement(ev):Calendar.getTargetElement(ev);for(;el!=null&&el!=calendar.element;el=el.parentNode);if(el==null){window.calendar.callCloseHandler();return Calendar.stopEvent(ev);}};Calendar.prototype.show=function(){var rows=this.table.getElementsByTagName("tr");for(var i=rows.length;i>0;){var row=rows[--i];Calendar.removeClass(row,"rowhilite");var cells=row.getElementsByTagName("td");for(var j=cells.length;j>0;){var cell=cells[--j];Calendar.removeClass(cell,"hilite");Calendar.removeClass(cell,"active");}}this.element.style.display="block";this.hidden=false;if(this.isPopup){window.calendar=this;Calendar.addEvent(document,"keydown",Calendar._keyEvent);Calendar.addEvent(document,"keypress",Calendar._keyEvent);Calendar.addEvent(document,"mousedown",Calendar._checkCalendar);}this.hideShowCovered();};Calendar.prototype.hide=function(){if(this.isPopup){Calendar.removeEvent(document,"keydown",Calendar._keyEvent);Calendar.removeEvent(document,"keypress",Calendar._keyEvent);Calendar.removeEvent(document,"mousedown",Calendar._checkCalendar);}this.element.style.display="none";this.hidden=true;this.hideShowCovered();};Calendar.prototype.showAt=function(x,y){var s=this.element.style;s.left=x+"px";s.top=y+"px";this.show();};Calendar.prototype.showAtElement=function(el,opts){var self=this;var p=Calendar.getAbsolutePos(el);if(!opts||typeof opts!="string"){this.showAt(p.x,p.y+el.offsetHeight);return true;}function fixPosition(box){if(box.x<0)box.x=0;if(box.y<0)box.y=0;var cp=document.createElement("div");var s=cp.style;s.position="absolute";s.right=s.bottom=s.width=s.height="0px";document.body.appendChild(cp);var br=Calendar.getAbsolutePos(cp);document.body.removeChild(cp);if(Calendar.is_ie){br.y+=document.body.scrollTop;br.x+=document.body.scrollLeft;}else{br.y+=window.scrollY;br.x+=window.scrollX;}var tmp=box.x+box.width-br.x;if(tmp>0)box.x-=tmp;tmp=box.y+box.height-br.y;if(tmp>0)box.y-=tmp;};this.element.style.display="block";Calendar.continuation_for_the_fucking_khtml_browser=function(){var w=self.element.offsetWidth;var h=self.element.offsetHeight;self.element.style.display="none";var valign=opts.substr(0,1);var halign="l";if(opts.length>1){halign=opts.substr(1,1);}switch(valign){case "T":p.y-=h;break;case "B":p.y+=el.offsetHeight;break;case "C":p.y+=(el.offsetHeight-h)/2;break;case "t":p.y+=el.offsetHeight-h;break;case "b":break;}switch(halign){case "L":p.x-=w;break;case "R":p.x+=el.offsetWidth;break;case "C":p.x+=(el.offsetWidth-w)/2;break;case "r":p.x+=el.offsetWidth-w;break;case "l":break;}p.width=w;p.height=h+40;self.monthsCombo.style.display="none";fixPosition(p);self.showAt(p.x,p.y);};if(Calendar.is_khtml)setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()",10);else Calendar.continuation_for_the_fucking_khtml_browser();};Calendar.prototype.setDateFormat=function(str){this.dateFormat=str;};Calendar.prototype.setTtDateFormat=function(str){this.ttDateFormat=str;};Calendar.prototype.parseDate=function(str,fmt){var y=0;var m=-1;var d=0;var a=str.split(/\W+/);if(!fmt){fmt=this.dateFormat;}var b=fmt.match(/%./g);var i=0,j=0;var hr=0;var min=0;for(i=0;i<a.length;++i){if(!a[i])continue;switch(b[i]){case "%d":case "%e":d=parseInt(a[i],10);break;case "%m":m=parseInt(a[i],10)-1;break;case "%Y":case "%y":y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);break;case "%b":case "%B":for(j=0;j<12;++j){if(Calendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){m=j;break;}}break;case "%H":case "%I":case "%k":case "%l":hr=parseInt(a[i],10);break;case "%P":case "%p":if(/pm/i.test(a[i])&&hr<12)hr+=12;break;case "%M":min=parseInt(a[i],10);break;}}if(y!=0&&m!=-1&&d!=0){this.setDate(new Date(y,m,d,hr,min,0));return;}y=0;m=-1;d=0;for(i=0;i<a.length;++i){if(a[i].search(/[a-zA-Z]+/)!=-1){var t=-1;for(j=0;j<12;++j){if(Calendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){t=j;break;}}if(t!=-1){if(m!=-1){d=m+1;}m=t;}}else if(parseInt(a[i],10)<=12&&m==-1){m=a[i]-1;}else if(parseInt(a[i],10)>31&&y==0){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);}else if(d==0){d=a[i];}}if(y==0){var today=new Date();y=today.getFullYear();}if(m!=-1&&d!=0){this.setDate(new Date(y,m,d,hr,min,0));}};Calendar.prototype.hideShowCovered=function(){var self=this;Calendar.continuation_for_the_fucking_khtml_browser=function(){function getVisib(obj){var value=obj.style.visibility;if(!value){if(document.defaultView&&typeof(document.defaultView.getComputedStyle)=="function"){if(!Calendar.is_khtml)value=document.defaultView. getComputedStyle(obj,"").getPropertyValue("visibility");else value='';}else if(obj.currentStyle){value=obj.currentStyle.visibility;}else value='';}return value;};var tags=new Array("applet","iframe","select");var el=self.element;var p=Calendar.getAbsolutePos(el);var EX1=p.x;var EX2=el.offsetWidth+EX1;var EY1=p.y;var EY2=el.offsetHeight+EY1;for(var k=tags.length;k>0;){var ar=document.getElementsByTagName(tags[--k]);var cc=null;for(var i=ar.length;i>0;){cc=ar[--i];p=Calendar.getAbsolutePos(cc);var CX1=p.x;var CX2=cc.offsetWidth+CX1;var CY1=p.y;var CY2=cc.offsetHeight+CY1;if(self.hidden||(CX1>EX2)||(CX2<EX1)||(CY1>EY2)||(CY2<EY1)){if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc);}cc.style.visibility=cc.__msh_save_visibility;}else{if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc);}cc.style.visibility="hidden";}}}};if(Calendar.is_khtml)setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()",10);else Calendar.continuation_for_the_fucking_khtml_browser();};Calendar.prototype._displayWeekdays=function(){var fdow=this.firstDayOfWeek;var cell=this.firstdayname;var weekend=Calendar._TT["WEEKEND"];for(var i=0;i<7;++i){cell.className="day name";var realday=(i+fdow)%7;if(i){cell.ttip=Calendar._TT["DAY_FIRST"].replace("%s",Calendar._DN[realday]);cell.navtype=100;cell.calendar=this;cell.fdow=realday;Calendar._add_evs(cell);}if(weekend.indexOf(realday.toString())!=-1){Calendar.addClass(cell,"weekend");}cell.firstChild.data=Calendar._SDN[(i+fdow)%7];cell=cell.nextSibling;}};Calendar.prototype._hideCombos=function(){this.monthsCombo.style.display="none";this.yearsCombo.style.display="none";};Calendar.prototype._dragStart=function(ev){if(this.dragging){return;}this.dragging=true;var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posY=ev.clientY+window.scrollY;posX=ev.clientX+window.scrollX;}var st=this.element.style;this.xOffs=posX-parseInt(st.left);this.yOffs=posY-parseInt(st.top);with(Calendar){addEvent(document,"mousemove",calDragIt);addEvent(document,"mouseup",calDragEnd);}};Date._MD=new Array(31,28,31,30,31,30,31,31,30,31,30,31);Date.SECOND=1000;Date.MINUTE=60*Date.SECOND;Date.HOUR=60*Date.MINUTE;Date.DAY=24*Date.HOUR;Date.WEEK=7*Date.DAY;Date.prototype.getMonthDays=function(month){var year=this.getFullYear();if(typeof month=="undefined"){month=this.getMonth();}if(((0==(year%4))&&((0!=(year%100))||(0==(year%400))))&&month==1){return 29;}else{return Date._MD[month];}};Date.prototype.getDayOfYear=function(){var now=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var then=new Date(this.getFullYear(),0,0,0,0,0);var time=now-then;return Math.floor(time/Date.DAY);};Date.prototype.getWeekNumber=function(){var d=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var DoW=d.getDay();d.setDate(d.getDate()-(DoW+6)%7+3);var ms=d.valueOf();d.setMonth(0);d.setDate(4);return Math.round((ms-d.valueOf())/(7*864e5))+1;};Date.prototype.equalsTo=function(date){return((this.getFullYear()==date.getFullYear())&&(this.getMonth()==date.getMonth())&&(this.getDate()==date.getDate())&&(this.getHours()==date.getHours())&&(this.getMinutes()==date.getMinutes()));};Date.prototype.print=function(str){var m=this.getMonth();var d=this.getDate();var y=this.getFullYear();var wn=this.getWeekNumber();var w=this.getDay();var s={};var hr=this.getHours();var pm=(hr>=12);var ir=(pm)?(hr-12):hr;var dy=this.getDayOfYear();if(ir==0)ir=12;var min=this.getMinutes();var sec=this.getSeconds();s["%a"]=Calendar._SDN[w];s["%A"]=Calendar._DN[w];s["%b"]=Calendar._SMN[m];s["%B"]=Calendar._MN[m];s["%C"]=1+Math.floor(y/100);s["%d"]=(d<10)?("0"+d):d;s["%e"]=d;s["%H"]=(hr<10)?("0"+hr):hr;s["%I"]=(ir<10)?("0"+ir):ir;s["%j"]=(dy<100)?((dy<10)?("00"+dy):("0"+dy)):dy;s["%k"]=hr;s["%l"]=ir;s["%m"]=(m<9)?("0"+(1+m)):(1+m);s["%M"]=(min<10)?("0"+min):min;s["%n"]="\n";s["%p"]=pm?"PM":"AM";s["%P"]=pm?"pm":"am";s["%s"]=Math.floor(this.getTime()/1000);s["%S"]=(sec<10)?("0"+sec):sec;s["%t"]="\t";s["%U"]=s["%W"]=s["%V"]=(wn<10)?("0"+wn):wn;s["%u"]=w+1;s["%w"]=w;s["%y"]=(''+y).substr(2,2);s["%Y"]=y;s["%%"]="%";var re=/%./g;if(!Calendar.is_ie5)return str.replace(re,function(par){return s[par]||par;});var a=str.match(re);for(var i=0;i<a.length;i++){var tmp=s[a[i]];if(tmp){re=new RegExp(a[i],'g');str=str.replace(re,tmp);}}return str;};Date.prototype.__msh_oldSetFullYear=Date.prototype.setFullYear;Date.prototype.setFullYear=function(y){var d=new Date(this);d.__msh_oldSetFullYear(y);if(d.getMonth()!=this.getMonth())this.setDate(28);this.__msh_oldSetFullYear(y);};window.calendar=null;
\ No newline at end of file
+ Calendar=function(firstDayOfWeek,dateStr,onSelected,onClose){this.activeDiv=null;this.currentDateEl=null;this.getDateStatus=null;this.getDateToolTip=null;this.getDateText=null;this.timeout=null;this.onSelected=onSelected||null;this.onClose=onClose||null;this.dragging=false;this.hidden=false;this.minYear=1970;this.maxYear=2050;this.dateFormat=Calendar._TT["DEF_DATE_FORMAT"];this.ttDateFormat=Calendar._TT["TT_DATE_FORMAT"];this.isPopup=true;this.weekNumbers=true;this.firstDayOfWeek=typeof firstDayOfWeek=="number"?firstDayOfWeek:Calendar._FD;this.showsOtherMonths=false;this.dateStr=dateStr;this.ar_days=null;this.showsTime=false;this.time24=true;this.yearStep=2;this.hiliteToday=true;this.multiple=null;this.table=null;this.element=null;this.tbody=null;this.firstdayname=null;this.monthsCombo=null;this.yearsCombo=null;this.hilitedMonth=null;this.activeMonth=null;this.hilitedYear=null;this.activeYear=null;this.dateClicked=false;if(typeof Calendar._SDN=="undefined"){if(typeof Calendar._SDN_len=="undefined")Calendar._SDN_len=3;var ar=new Array();for(var i=8;i>0;){ar[--i]=Calendar._DN[i].substr(0,Calendar._SDN_len);}Calendar._SDN=ar;if(typeof Calendar._SMN_len=="undefined")Calendar._SMN_len=3;ar=new Array();for(var i=12;i>0;){ar[--i]=Calendar._MN[i].substr(0,Calendar._SMN_len);}Calendar._SMN=ar;}};Calendar._C=null;Calendar.is_ie=(/msie/i.test(navigator.userAgent)&&!/opera/i.test(navigator.userAgent));Calendar.is_ie5=(Calendar.is_ie&&/msie 5\.0/i.test(navigator.userAgent));Calendar.is_opera=/opera/i.test(navigator.userAgent);Calendar.is_khtml=/Konqueror|Safari|KHTML/i.test(navigator.userAgent);Calendar.getAbsolutePos=function(el){var SL=0,ST=0;var is_div=/^div$/i.test(el.tagName);if(is_div&&el.scrollLeft)SL=el.scrollLeft;if(is_div&&el.scrollTop)ST=el.scrollTop;var r={x:el.offsetLeft-SL,y:el.offsetTop-ST};if(el.offsetParent){var tmp=this.getAbsolutePos(el.offsetParent);r.x+=tmp.x;r.y+=tmp.y;}return r;};Calendar.isRelated=function(el,evt){var related=evt.relatedTarget;if(!related){var type=evt.type;if(type=="mouseover"){related=evt.fromElement;}else if(type=="mouseout"){related=evt.toElement;}}while(related){if(related==el){return true;}related=related.parentNode;}return false;};Calendar.removeClass=function(el,className){if(!(el&&el.className)){return;}var cls=el.className.split(" ");var ar=new Array();for(var i=cls.length;i>0;){if(cls[--i]!=className){ar[ar.length]=cls[i];}}el.className=ar.join(" ");};Calendar.addClass=function(el,className){Calendar.removeClass(el,className);el.className+=" "+className;};Calendar.getElement=function(ev){var f=Calendar.is_ie?window.event.srcElement:ev.currentTarget;while(f.nodeType!=1||/^div$/i.test(f.tagName))f=f.parentNode;return f;};Calendar.getTargetElement=function(ev){var f=Calendar.is_ie?window.event.srcElement:ev.target;while(f.nodeType!=1)f=f.parentNode;return f;};Calendar.stopEvent=function(ev){ev||(ev=window.event);if(Calendar.is_ie){ev.cancelBubble=true;ev.returnValue=false;}else{ev.preventDefault();ev.stopPropagation();}return false;};Calendar.addEvent=function(el,evname,func){if(el.attachEvent){el.attachEvent("on"+evname,func);}else if(el.addEventListener){el.addEventListener(evname,func,true);}else{el["on"+evname]=func;}};Calendar.removeEvent=function(el,evname,func){if(el.detachEvent){el.detachEvent("on"+evname,func);}else if(el.removeEventListener){el.removeEventListener(evname,func,true);}else{el["on"+evname]=null;}};Calendar.createElement=function(type,parent){var el=null;if(document.createElementNS){el=document.createElementNS("http://www.w3.org/1999/xhtml",type);}else{el=document.createElement(type);}if(typeof parent!="undefined"){parent.appendChild(el);}return el;};Calendar._add_evs=function(el){with(Calendar){addEvent(el,"mouseover",dayMouseOver);addEvent(el,"mousedown",dayMouseDown);addEvent(el,"mouseout",dayMouseOut);if(is_ie){addEvent(el,"dblclick",dayMouseDblClick);el.setAttribute("unselectable",true);}}};Calendar.findMonth=function(el){if(typeof el.month!="undefined"){return el;}else if(typeof el.parentNode.month!="undefined"){return el.parentNode;}return null;};Calendar.findYear=function(el){if(typeof el.year!="undefined"){return el;}else if(typeof el.parentNode.year!="undefined"){return el.parentNode;}return null;};Calendar.showMonthsCombo=function(){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var mc=cal.monthsCombo;if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}if(cal.activeMonth){Calendar.removeClass(cal.activeMonth,"active");}var mon=cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];Calendar.addClass(mon,"active");cal.activeMonth=mon;var s=mc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var mcw=mc.offsetWidth;if(typeof mcw=="undefined")mcw=50;s.left=(cd.offsetLeft+cd.offsetWidth-mcw)+"px";}s.top=(cd.offsetTop+cd.offsetHeight)+"px";};Calendar.showYearsCombo=function(fwd){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var yc=cal.yearsCombo;if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}if(cal.activeYear){Calendar.removeClass(cal.activeYear,"active");}cal.activeYear=null;var Y=cal.date.getFullYear()+(fwd?1:-1);var yr=yc.firstChild;var show=false;for(var i=12;i>0;--i){if(Y>=cal.minYear&&Y<=cal.maxYear){yr.innerHTML=Y;yr.year=Y;yr.style.display="block";show=true;}else{yr.style.display="none";}yr=yr.nextSibling;Y+=fwd?cal.yearStep:-cal.yearStep;}if(show){var s=yc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var ycw=yc.offsetWidth;if(typeof ycw=="undefined")ycw=50;s.left=(cd.offsetLeft+cd.offsetWidth-ycw)+"px";}s.top=(cd.offsetTop+cd.offsetHeight)+"px";}};Calendar.tableMouseUp=function(ev){var cal=Calendar._C;if(!cal){return false;}if(cal.timeout){clearTimeout(cal.timeout);}var el=cal.activeDiv;if(!el){return false;}var target=Calendar.getTargetElement(ev);ev||(ev=window.event);Calendar.removeClass(el,"active");if(target==el||target.parentNode==el){Calendar.cellClick(el,ev);}var mon=Calendar.findMonth(target);var date=null;if(mon){date=new Date(cal.date);if(mon.month!=date.getMonth()){date.setMonth(mon.month);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}else{var year=Calendar.findYear(target);if(year){date=new Date(cal.date);if(year.year!=date.getFullYear()){date.setFullYear(year.year);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}}with(Calendar){removeEvent(document,"mouseup",tableMouseUp);removeEvent(document,"mouseover",tableMouseOver);removeEvent(document,"mousemove",tableMouseOver);cal._hideCombos();_C=null;return stopEvent(ev);}};Calendar.tableMouseOver=function(ev){var cal=Calendar._C;if(!cal){return;}var el=cal.activeDiv;var target=Calendar.getTargetElement(ev);if(target==el||target.parentNode==el){Calendar.addClass(el,"hilite active");Calendar.addClass(el.parentNode,"rowhilite");}else{if(typeof el.navtype=="undefined"||(el.navtype!=50&&(el.navtype==0||Math.abs(el.navtype)>2)))Calendar.removeClass(el,"active");Calendar.removeClass(el,"hilite");Calendar.removeClass(el.parentNode,"rowhilite");}ev||(ev=window.event);if(el.navtype==50&&target!=el){var pos=Calendar.getAbsolutePos(el);var w=el.offsetWidth;var x=ev.clientX;var dx;var decrease=true;if(x>pos.x+w){dx=x-pos.x-w;decrease=false;}else dx=pos.x-x;if(dx<0)dx=0;var range=el._range;var current=el._current;var count=Math.floor(dx/10)%range.length;for(var i=range.length;--i>=0;)if(range[i]==current)break;while(count-->0)if(decrease){if(--i<0)i=range.length-1;}else if(++i>=range.length)i=0;var newval=range[i];el.innerHTML=newval;cal.onUpdateTime();}var mon=Calendar.findMonth(target);if(mon){if(mon.month!=cal.date.getMonth()){if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}Calendar.addClass(mon,"hilite");cal.hilitedMonth=mon;}else if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}}else{if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}var year=Calendar.findYear(target);if(year){if(year.year!=cal.date.getFullYear()){if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}Calendar.addClass(year,"hilite");cal.hilitedYear=year;}else if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}}else if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}}return Calendar.stopEvent(ev);};Calendar.tableMouseDown=function(ev){if(Calendar.getTargetElement(ev)==Calendar.getElement(ev)){return Calendar.stopEvent(ev);}};Calendar.calDragIt=function(ev){var cal=Calendar._C;if(!(cal&&cal.dragging)){return false;}var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posX=ev.pageX;posY=ev.pageY;}cal.hideShowCovered();var st=cal.element.style;st.left=(posX-cal.xOffs)+"px";st.top=(posY-cal.yOffs)+"px";return Calendar.stopEvent(ev);};Calendar.calDragEnd=function(ev){var cal=Calendar._C;if(!cal){return false;}cal.dragging=false;with(Calendar){removeEvent(document,"mousemove",calDragIt);removeEvent(document,"mouseup",calDragEnd);tableMouseUp(ev);}cal.hideShowCovered();};Calendar.dayMouseDown=function(ev){var el=Calendar.getElement(ev);if(el.disabled){return false;}var cal=el.calendar;cal.activeDiv=el;Calendar._C=cal;if(el.navtype!=300)with(Calendar){if(el.navtype==50){el._current=el.innerHTML;addEvent(document,"mousemove",tableMouseOver);}else addEvent(document,Calendar.is_ie5?"mousemove":"mouseover",tableMouseOver);addClass(el,"hilite active");addEvent(document,"mouseup",tableMouseUp);}else if(cal.isPopup){cal._dragStart(ev);}if(el.navtype==-1||el.navtype==1){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout("Calendar.showMonthsCombo()",250);}else if(el.navtype==-2||el.navtype==2){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout((el.navtype>0)?"Calendar.showYearsCombo(true)":"Calendar.showYearsCombo(false)",250);}else{cal.timeout=null;}return Calendar.stopEvent(ev);};Calendar.dayMouseDblClick=function(ev){Calendar.cellClick(Calendar.getElement(ev),ev||window.event);if(Calendar.is_ie){document.selection.empty();}};Calendar.dayMouseOver=function(ev){var el=Calendar.getElement(ev);if(Calendar.isRelated(el,ev)||Calendar._C||el.disabled){return false;}if(el.ttip){if(el.ttip.substr(0,1)=="_"){el.ttip=el.caldate.print(el.calendar.ttDateFormat)+el.ttip.substr(1);}el.calendar.tooltips.innerHTML=el.ttip;}if(el.navtype!=300){Calendar.addClass(el,"hilite");if(el.caldate){Calendar.addClass(el.parentNode,"rowhilite");}}return Calendar.stopEvent(ev);};Calendar.dayMouseOut=function(ev){with(Calendar){var el=getElement(ev);if(isRelated(el,ev)||_C||el.disabled)return false;removeClass(el,"hilite");if(el.caldate)removeClass(el.parentNode,"rowhilite");if(el.calendar)el.calendar.tooltips.innerHTML=_TT["SEL_DATE"];return stopEvent(ev);}};Calendar.cellClick=function(el,ev){var cal=el.calendar;var closing=false;var newdate=false;var date=null;if(typeof el.navtype=="undefined"){if(cal.currentDateEl){Calendar.removeClass(cal.currentDateEl,"selected");Calendar.addClass(el,"selected");closing=(cal.currentDateEl==el);if(!closing){cal.currentDateEl=el;}}cal.date.setDateOnly(el.caldate);date=cal.date;var other_month=!(cal.dateClicked=!el.otherMonth);if(!other_month&&!cal.currentDateEl)cal._toggleMultipleDate(new Date(date));else newdate=!el.disabled;if(other_month)cal._init(cal.firstDayOfWeek,date);}else{if(el.navtype==200){Calendar.removeClass(el,"hilite");cal.callCloseHandler();return;}date=new Date(cal.date);if(el.navtype==0)date.setDateOnly(new Date());cal.dateClicked=false;var year=date.getFullYear();var mon=date.getMonth();function setMonth(m){var day=date.getDate();var max=date.getMonthDays(m);if(day>max){date.setDate(max);}date.setMonth(m);};switch(el.navtype){case 400:Calendar.removeClass(el,"hilite");var text=Calendar._TT["ABOUT"];if(typeof text!="undefined"){text+=cal.showsTime?Calendar._TT["ABOUT_TIME"]:"";}else{text="Help and about box text is not translated into this language.\n"+"If you know this language and you feel generous please update\n"+"the corresponding file in \"lang\" subdir to match calendar-en.js\n"+"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n"+"Thank you!\n"+"http://dynarch.com/mishoo/calendar.epl\n";}alert(text);return;case-2:if(year>cal.minYear){date.setFullYear(year-1);}break;case-1:if(mon>0){setMonth(mon-1);}else if(year-->cal.minYear){date.setFullYear(year);setMonth(11);}break;case 1:if(mon<11){setMonth(mon+1);}else if(year<cal.maxYear){date.setFullYear(year+1);setMonth(0);}break;case 2:if(year<cal.maxYear){date.setFullYear(year+1);}break;case 100:cal.setFirstDayOfWeek(el.fdow);return;case 50:var range=el._range;var current=el.innerHTML;for(var i=range.length;--i>=0;)if(range[i]==current)break;if(ev&&ev.shiftKey){if(--i<0)i=range.length-1;}else if(++i>=range.length)i=0;var newval=range[i];el.innerHTML=newval;cal.onUpdateTime();return;case 0:if((typeof cal.getDateStatus=="function")&&cal.getDateStatus(date,date.getFullYear(),date.getMonth(),date.getDate())){return false;}break;}if(!date.equalsTo(cal.date)){cal.setDate(date);newdate=true;}else if(el.navtype==0)newdate=closing=true;}if(newdate){ev&&cal.callHandler();}if(closing){Calendar.removeClass(el,"hilite");ev&&cal.callCloseHandler();}};Calendar.prototype.create=function(_par){var parent=null;if(!_par){parent=document.getElementsByTagName("body")[0];this.isPopup=true;}else{parent=_par;this.isPopup=false;}this.date=this.dateStr?new Date(this.dateStr):new Date();var table=Calendar.createElement("table");this.table=table;table.cellSpacing=0;table.cellPadding=0;table.calendar=this;Calendar.addEvent(table,"mousedown",Calendar.tableMouseDown);var div=Calendar.createElement("div");this.element=div;div.className="calendar";if(this.isPopup){div.style.position="absolute";div.style.display="none";}div.appendChild(table);var thead=Calendar.createElement("thead",table);var cell=null;var row=null;var cal=this;var hh=function(text,cs,navtype){cell=Calendar.createElement("td",row);cell.colSpan=cs;cell.className="button";if(navtype!=0&&Math.abs(navtype)<=2)cell.className+=" nav";Calendar._add_evs(cell);cell.calendar=cal;cell.navtype=navtype;cell.innerHTML="<div unselectable='on'>"+text+"</div>";return cell;};row=Calendar.createElement("tr",thead);var title_length=6;(this.isPopup)&&--title_length;(this.weekNumbers)&&++title_length;hh("?",1,400).ttip=Calendar._TT["INFO"];this.title=hh("",title_length,300);this.title.className="title";if(this.isPopup){this.title.ttip=Calendar._TT["DRAG_TO_MOVE"];this.title.style.cursor="move";hh("&#x00d7;",1,200).ttip=Calendar._TT["CLOSE"];}row=Calendar.createElement("tr",thead);row.className="headrow";this._nav_py=hh("&#x00ab;",1,-2);this._nav_py.ttip=Calendar._TT["PREV_YEAR"];this._nav_pm=hh("&#x2039;",1,-1);this._nav_pm.ttip=Calendar._TT["PREV_MONTH"];this._nav_now=hh(Calendar._TT["TODAY"],this.weekNumbers?4:3,0);this._nav_now.ttip=Calendar._TT["GO_TODAY"];this._nav_nm=hh("&#x203a;",1,1);this._nav_nm.ttip=Calendar._TT["NEXT_MONTH"];this._nav_ny=hh("&#x00bb;",1,2);this._nav_ny.ttip=Calendar._TT["NEXT_YEAR"];row=Calendar.createElement("tr",thead);row.className="daynames";if(this.weekNumbers){cell=Calendar.createElement("td",row);cell.className="name wn";cell.innerHTML=Calendar._TT["WK"];}for(var i=7;i>0;--i){cell=Calendar.createElement("td",row);if(!i){cell.navtype=100;cell.calendar=this;Calendar._add_evs(cell);}}this.firstdayname=(this.weekNumbers)?row.firstChild.nextSibling:row.firstChild;this._displayWeekdays();var tbody=Calendar.createElement("tbody",table);this.tbody=tbody;for(i=6;i>0;--i){row=Calendar.createElement("tr",tbody);if(this.weekNumbers){cell=Calendar.createElement("td",row);}for(var j=7;j>0;--j){cell=Calendar.createElement("td",row);cell.calendar=this;Calendar._add_evs(cell);}}if(this.showsTime){row=Calendar.createElement("tr",tbody);row.className="time";cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=2;cell.innerHTML=Calendar._TT["TIME"]||"&nbsp;";cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=this.weekNumbers?4:3;(function(){function makeTimePart(className,init,range_start,range_end){var part=Calendar.createElement("span",cell);part.className=className;part.innerHTML=init;part.calendar=cal;part.ttip=Calendar._TT["TIME_PART"];part.navtype=50;part._range=[];if(typeof range_start!="number")part._range=range_start;else{for(var i=range_start;i<=range_end;++i){var txt;if(i<10&&range_end>=10)txt='0'+i;else txt=''+i;part._range[part._range.length]=txt;}}Calendar._add_evs(part);return part;};var hrs=cal.date.getHours();var mins=cal.date.getMinutes();var t12=!cal.time24;var pm=(hrs>12);if(t12&&pm)hrs-=12;var H=makeTimePart("hour",hrs,t12?1:0,t12?12:23);var span=Calendar.createElement("span",cell);span.innerHTML=":";span.className="colon";var M=makeTimePart("minute",mins,0,59);var AP=null;cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=2;if(t12)AP=makeTimePart("ampm",pm?"pm":"am",["am","pm"]);else cell.innerHTML="&nbsp;";cal.onSetTime=function(){var pm,hrs=this.date.getHours(),mins=this.date.getMinutes();if(t12){pm=(hrs>=12);if(pm)hrs-=12;if(hrs==0)hrs=12;AP.innerHTML=pm?"pm":"am";}H.innerHTML=(hrs<10)?("0"+hrs):hrs;M.innerHTML=(mins<10)?("0"+mins):mins;};cal.onUpdateTime=function(){var date=this.date;var h=parseInt(H.innerHTML,10);if(t12){if(/pm/i.test(AP.innerHTML)&&h<12)h+=12;else if(/am/i.test(AP.innerHTML)&&h==12)h=0;}var d=date.getDate();var m=date.getMonth();var y=date.getFullYear();date.setHours(h);date.setMinutes(parseInt(M.innerHTML,10));date.setFullYear(y);date.setMonth(m);date.setDate(d);this.dateClicked=false;this.callHandler();};})();}else{this.onSetTime=this.onUpdateTime=function(){};}var tfoot=Calendar.createElement("tfoot",table);row=Calendar.createElement("tr",tfoot);row.className="footrow";cell=hh(Calendar._TT["SEL_DATE"],this.weekNumbers?8:7,300);cell.className="ttip";if(this.isPopup){cell.ttip=Calendar._TT["DRAG_TO_MOVE"];cell.style.cursor="move";}this.tooltips=cell;div=Calendar.createElement("div",this.element);this.monthsCombo=div;div.className="combo";for(i=0;i<Calendar._MN.length;++i){var mn=Calendar.createElement("div");mn.className=Calendar.is_ie?"label-IEfix":"label";mn.month=i;mn.innerHTML=Calendar._SMN[i];div.appendChild(mn);}div=Calendar.createElement("div",this.element);this.yearsCombo=div;div.className="combo";for(i=12;i>0;--i){var yr=Calendar.createElement("div");yr.className=Calendar.is_ie?"label-IEfix":"label";div.appendChild(yr);}this._init(this.firstDayOfWeek,this.date);parent.appendChild(this.element);};Calendar._keyEvent=function(ev){var cal=window._dynarch_popupCalendar;if(!cal||cal.multiple)return false;(Calendar.is_ie)&&(ev=window.event);var act=(Calendar.is_ie||ev.type=="keypress"),K=ev.keyCode;if(ev.ctrlKey){switch(K){case 37:act&&Calendar.cellClick(cal._nav_pm);break;case 38:act&&Calendar.cellClick(cal._nav_py);break;case 39:act&&Calendar.cellClick(cal._nav_nm);break;case 40:act&&Calendar.cellClick(cal._nav_ny);break;default:return false;}}else switch(K){case 32:Calendar.cellClick(cal._nav_now);break;case 27:act&&cal.callCloseHandler();break;case 37:case 38:case 39:case 40:if(act){var prev,x,y,ne,el,step;prev=K==37||K==38;step=(K==37||K==39)?1:7;function setVars(){el=cal.currentDateEl;var p=el.pos;x=p&15;y=p>>4;ne=cal.ar_days[y][x];};setVars();function prevMonth(){var date=new Date(cal.date);date.setDate(date.getDate()-step);cal.setDate(date);};function nextMonth(){var date=new Date(cal.date);date.setDate(date.getDate()+step);cal.setDate(date);};while(1){switch(K){case 37:if(--x>=0)ne=cal.ar_days[y][x];else{x=6;K=38;continue;}break;case 38:if(--y>=0)ne=cal.ar_days[y][x];else{prevMonth();setVars();}break;case 39:if(++x<7)ne=cal.ar_days[y][x];else{x=0;K=40;continue;}break;case 40:if(++y<cal.ar_days.length)ne=cal.ar_days[y][x];else{nextMonth();setVars();}break;}break;}if(ne){if(!ne.disabled)Calendar.cellClick(ne);else if(prev)prevMonth();else nextMonth();}}break;case 13:if(act)Calendar.cellClick(cal.currentDateEl,ev);break;default:return false;}return Calendar.stopEvent(ev);};Calendar.prototype._init=function(firstDayOfWeek,date){var today=new Date(),TY=today.getFullYear(),TM=today.getMonth(),TD=today.getDate();this.table.style.visibility="hidden";var year=date.getFullYear();if(year<this.minYear){year=this.minYear;date.setFullYear(year);}else if(year>this.maxYear){year=this.maxYear;date.setFullYear(year);}this.firstDayOfWeek=firstDayOfWeek;this.date=new Date(date);var month=date.getMonth();var mday=date.getDate();var no_days=date.getMonthDays();date.setDate(1);var day1=(date.getDay()-this.firstDayOfWeek)%7;if(day1<0)day1+=7;date.setDate(-day1);date.setDate(date.getDate()+1);var row=this.tbody.firstChild;var MN=Calendar._SMN[month];var ar_days=this.ar_days=new Array();var weekend=Calendar._TT["WEEKEND"];var dates=this.multiple?(this.datesCells={}):null;for(var i=0;i<6;++i,row=row.nextSibling){var cell=row.firstChild;if(this.weekNumbers){cell.className="day wn";cell.innerHTML=date.getWeekNumber();cell=cell.nextSibling;}row.className="daysrow";var hasdays=false,iday,dpos=ar_days[i]=[];for(var j=0;j<7;++j,cell=cell.nextSibling,date.setDate(iday+1)){iday=date.getDate();var wday=date.getDay();cell.className="day";cell.pos=i<<4|j;dpos[j]=cell;var current_month=(date.getMonth()==month);if(!current_month){if(this.showsOtherMonths){cell.className+=" othermonth";cell.otherMonth=true;}else{cell.className="emptycell";cell.innerHTML="&nbsp;";cell.disabled=true;continue;}}else{cell.otherMonth=false;hasdays=true;}cell.disabled=false;cell.innerHTML=this.getDateText?this.getDateText(date,iday):iday;if(dates)dates[date.print("%Y%m%d")]=cell;if(this.getDateStatus){var status=this.getDateStatus(date,year,month,iday);if(this.getDateToolTip){var toolTip=this.getDateToolTip(date,year,month,iday);if(toolTip)cell.title=toolTip;}if(status===true){cell.className+=" disabled";cell.disabled=true;}else{if(/disabled/i.test(status))cell.disabled=true;cell.className+=" "+status;}}if(!cell.disabled){cell.caldate=new Date(date);cell.ttip="_";if(!this.multiple&&current_month&&iday==mday&&this.hiliteToday){cell.className+=" selected";this.currentDateEl=cell;}if(date.getFullYear()==TY&&date.getMonth()==TM&&iday==TD){cell.className+=" today";cell.ttip+=Calendar._TT["PART_TODAY"];}if(weekend.indexOf(wday.toString())!=-1)cell.className+=cell.otherMonth?" oweekend":" weekend";}}if(!(hasdays||this.showsOtherMonths))row.className="emptyrow";}this.title.innerHTML=Calendar._MN[month]+", "+year;this.onSetTime();this.table.style.visibility="visible";this._initMultipleDates();};Calendar.prototype._initMultipleDates=function(){if(this.multiple){for(var i in this.multiple){var cell=this.datesCells[i];var d=this.multiple[i];if(!d)continue;if(cell)cell.className+=" selected";}}};Calendar.prototype._toggleMultipleDate=function(date){if(this.multiple){var ds=date.print("%Y%m%d");var cell=this.datesCells[ds];if(cell){var d=this.multiple[ds];if(!d){Calendar.addClass(cell,"selected");this.multiple[ds]=date;}else{Calendar.removeClass(cell,"selected");delete this.multiple[ds];}}}};Calendar.prototype.setDateToolTipHandler=function(unaryFunction){this.getDateToolTip=unaryFunction;};Calendar.prototype.setDate=function(date){if(!date.equalsTo(this.date)){this._init(this.firstDayOfWeek,date);}};Calendar.prototype.refresh=function(){this._init(this.firstDayOfWeek,this.date);};Calendar.prototype.setFirstDayOfWeek=function(firstDayOfWeek){this._init(firstDayOfWeek,this.date);this._displayWeekdays();};Calendar.prototype.setDateStatusHandler=Calendar.prototype.setDisabledHandler=function(unaryFunction){this.getDateStatus=unaryFunction;};Calendar.prototype.setRange=function(a,z){this.minYear=a;this.maxYear=z;};Calendar.prototype.callHandler=function(){if(this.onSelected){this.onSelected(this,this.date.print(this.dateFormat));}};Calendar.prototype.callCloseHandler=function(){if(this.onClose){this.onClose(this);}this.hideShowCovered();};Calendar.prototype.destroy=function(){var el=this.element.parentNode;el.removeChild(this.element);Calendar._C=null;window._dynarch_popupCalendar=null;};Calendar.prototype.reparent=function(new_parent){var el=this.element;el.parentNode.removeChild(el);new_parent.appendChild(el);};Calendar._checkCalendar=function(ev){var calendar=window._dynarch_popupCalendar;if(!calendar){return false;}var el=Calendar.is_ie?Calendar.getElement(ev):Calendar.getTargetElement(ev);for(;el!=null&&el!=calendar.element;el=el.parentNode);if(el==null){window._dynarch_popupCalendar.callCloseHandler();return Calendar.stopEvent(ev);}};Calendar.prototype.show=function(){var rows=this.table.getElementsByTagName("tr");for(var i=rows.length;i>0;){var row=rows[--i];Calendar.removeClass(row,"rowhilite");var cells=row.getElementsByTagName("td");for(var j=cells.length;j>0;){var cell=cells[--j];Calendar.removeClass(cell,"hilite");Calendar.removeClass(cell,"active");}}this.element.style.display="block";this.hidden=false;if(this.isPopup){window._dynarch_popupCalendar=this;Calendar.addEvent(document,"keydown",Calendar._keyEvent);Calendar.addEvent(document,"keypress",Calendar._keyEvent);Calendar.addEvent(document,"mousedown",Calendar._checkCalendar);}this.hideShowCovered();};Calendar.prototype.hide=function(){if(this.isPopup){Calendar.removeEvent(document,"keydown",Calendar._keyEvent);Calendar.removeEvent(document,"keypress",Calendar._keyEvent);Calendar.removeEvent(document,"mousedown",Calendar._checkCalendar);}this.element.style.display="none";this.hidden=true;this.hideShowCovered();};Calendar.prototype.showAt=function(x,y){var s=this.element.style;s.left=x+"px";s.top=y+"px";this.show();};Calendar.prototype.showAtElement=function(el,opts){var self=this;var p=Calendar.getAbsolutePos(el);if(!opts||typeof opts!="string"){this.showAt(p.x,p.y+el.offsetHeight);return true;}function fixPosition(box){if(box.x<0)box.x=0;if(box.y<0)box.y=0;var cp=document.createElement("div");var s=cp.style;s.position="absolute";s.right=s.bottom=s.width=s.height="0px";document.body.appendChild(cp);var br=Calendar.getAbsolutePos(cp);document.body.removeChild(cp);if(Calendar.is_ie){br.y+=document.body.scrollTop;br.x+=document.body.scrollLeft;}else{br.y+=window.scrollY;br.x+=window.scrollX;}var tmp=box.x+box.width-br.x;if(tmp>0)box.x-=tmp;tmp=box.y+box.height-br.y;if(tmp>0)box.y-=tmp;};this.element.style.display="block";Calendar.continuation_for_the_fucking_khtml_browser=function(){var w=self.element.offsetWidth;var h=self.element.offsetHeight;self.element.style.display="none";var valign=opts.substr(0,1);var halign="l";if(opts.length>1){halign=opts.substr(1,1);}switch(valign){case "T":p.y-=h;break;case "B":p.y+=el.offsetHeight;break;case "C":p.y+=(el.offsetHeight-h)/2;break;case "t":p.y+=el.offsetHeight-h;break;case "b":break;}switch(halign){case "L":p.x-=w;break;case "R":p.x+=el.offsetWidth;break;case "C":p.x+=(el.offsetWidth-w)/2;break;case "l":p.x+=el.offsetWidth-w;break;case "r":break;}p.width=w;p.height=h+40;self.monthsCombo.style.display="none";fixPosition(p);self.showAt(p.x,p.y);};if(Calendar.is_khtml)setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()",10);else Calendar.continuation_for_the_fucking_khtml_browser();};Calendar.prototype.setDateFormat=function(str){this.dateFormat=str;};Calendar.prototype.setTtDateFormat=function(str){this.ttDateFormat=str;};Calendar.prototype.parseDate=function(str,fmt){if(!fmt)fmt=this.dateFormat;this.setDate(Date.parseDate(str,fmt));};Calendar.prototype.hideShowCovered=function(){if(!Calendar.is_ie&&!Calendar.is_opera)return;function getVisib(obj){var value=obj.style.visibility;if(!value){if(document.defaultView&&typeof(document.defaultView.getComputedStyle)=="function"){if(!Calendar.is_khtml)value=document.defaultView. getComputedStyle(obj,"").getPropertyValue("visibility");else value='';}else if(obj.currentStyle){value=obj.currentStyle.visibility;}else value='';}return value;};var tags=new Array("applet","iframe","select");var el=this.element;var p=Calendar.getAbsolutePos(el);var EX1=p.x;var EX2=el.offsetWidth+EX1;var EY1=p.y;var EY2=el.offsetHeight+EY1;for(var k=tags.length;k>0;){var ar=document.getElementsByTagName(tags[--k]);var cc=null;for(var i=ar.length;i>0;){cc=ar[--i];p=Calendar.getAbsolutePos(cc);var CX1=p.x;var CX2=cc.offsetWidth+CX1;var CY1=p.y;var CY2=cc.offsetHeight+CY1;if(this.hidden||(CX1>EX2)||(CX2<EX1)||(CY1>EY2)||(CY2<EY1)){if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc);}cc.style.visibility=cc.__msh_save_visibility;}else{if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc);}cc.style.visibility="hidden";}}}};Calendar.prototype._displayWeekdays=function(){var fdow=this.firstDayOfWeek;var cell=this.firstdayname;var weekend=Calendar._TT["WEEKEND"];for(var i=0;i<7;++i){cell.className="day name";var realday=(i+fdow)%7;if(i){cell.ttip=Calendar._TT["DAY_FIRST"].replace("%s",Calendar._DN[realday]);cell.navtype=100;cell.calendar=this;cell.fdow=realday;Calendar._add_evs(cell);}if(weekend.indexOf(realday.toString())!=-1){Calendar.addClass(cell,"weekend");}cell.innerHTML=Calendar._SDN[(i+fdow)%7];cell=cell.nextSibling;}};Calendar.prototype._hideCombos=function(){this.monthsCombo.style.display="none";this.yearsCombo.style.display="none";};Calendar.prototype._dragStart=function(ev){if(this.dragging){return;}this.dragging=true;var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posY=ev.clientY+window.scrollY;posX=ev.clientX+window.scrollX;}var st=this.element.style;this.xOffs=posX-parseInt(st.left);this.yOffs=posY-parseInt(st.top);with(Calendar){addEvent(document,"mousemove",calDragIt);addEvent(document,"mouseup",calDragEnd);}};Date._MD=new Array(31,28,31,30,31,30,31,31,30,31,30,31);Date.SECOND=1000;Date.MINUTE=60*Date.SECOND;Date.HOUR=60*Date.MINUTE;Date.DAY=24*Date.HOUR;Date.WEEK=7*Date.DAY;Date.parseDate=function(str,fmt){var today=new Date();var y=0;var m=-1;var d=0;var a=str.split(/\W+/);var b=fmt.match(/%./g);var i=0,j=0;var hr=0;var min=0;for(i=0;i<a.length;++i){if(!a[i])continue;switch(b[i]){case "%d":case "%e":d=parseInt(a[i],10);break;case "%m":m=parseInt(a[i],10)-1;break;case "%Y":case "%y":y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);break;case "%b":case "%B":for(j=0;j<12;++j){if(Calendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){m=j;break;}}break;case "%H":case "%I":case "%k":case "%l":hr=parseInt(a[i],10);break;case "%P":case "%p":if(/pm/i.test(a[i])&&hr<12)hr+=12;else if(/am/i.test(a[i])&&hr>=12)hr-=12;break;case "%M":min=parseInt(a[i],10);break;}}if(isNaN(y))y=today.getFullYear();if(isNaN(m))m=today.getMonth();if(isNaN(d))d=today.getDate();if(isNaN(hr))hr=today.getHours();if(isNaN(min))min=today.getMinutes();if(y!=0&&m!=-1&&d!=0)return new Date(y,m,d,hr,min,0);y=0;m=-1;d=0;for(i=0;i<a.length;++i){if(a[i].search(/[a-zA-Z]+/)!=-1){var t=-1;for(j=0;j<12;++j){if(Calendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){t=j;break;}}if(t!=-1){if(m!=-1){d=m+1;}m=t;}}else if(parseInt(a[i],10)<=12&&m==-1){m=a[i]-1;}else if(parseInt(a[i],10)>31&&y==0){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);}else if(d==0){d=a[i];}}if(y==0)y=today.getFullYear();if(m!=-1&&d!=0)return new Date(y,m,d,hr,min,0);return today;};Date.prototype.getMonthDays=function(month){var year=this.getFullYear();if(typeof month=="undefined"){month=this.getMonth();}if(((0==(year%4))&&((0!=(year%100))||(0==(year%400))))&&month==1){return 29;}else{return Date._MD[month];}};Date.prototype.getDayOfYear=function(){var now=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var then=new Date(this.getFullYear(),0,0,0,0,0);var time=now-then;return Math.floor(time/Date.DAY);};Date.prototype.getWeekNumber=function(){var d=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var DoW=d.getDay();d.setDate(d.getDate()-(DoW+6)%7+3);var ms=d.valueOf();d.setMonth(0);d.setDate(4);return Math.round((ms-d.valueOf())/(7*864e5))+1;};Date.prototype.equalsTo=function(date){return((this.getFullYear()==date.getFullYear())&&(this.getMonth()==date.getMonth())&&(this.getDate()==date.getDate())&&(this.getHours()==date.getHours())&&(this.getMinutes()==date.getMinutes()));};Date.prototype.setDateOnly=function(date){var tmp=new Date(date);this.setDate(1);this.setFullYear(tmp.getFullYear());this.setMonth(tmp.getMonth());this.setDate(tmp.getDate());};Date.prototype.print=function(str){var m=this.getMonth();var d=this.getDate();var y=this.getFullYear();var wn=this.getWeekNumber();var w=this.getDay();var s={};var hr=this.getHours();var pm=(hr>=12);var ir=(pm)?(hr-12):hr;var dy=this.getDayOfYear();if(ir==0)ir=12;var min=this.getMinutes();var sec=this.getSeconds();s["%a"]=Calendar._SDN[w];s["%A"]=Calendar._DN[w];s["%b"]=Calendar._SMN[m];s["%B"]=Calendar._MN[m];s["%C"]=1+Math.floor(y/100);s["%d"]=(d<10)?("0"+d):d;s["%e"]=d;s["%H"]=(hr<10)?("0"+hr):hr;s["%I"]=(ir<10)?("0"+ir):ir;s["%j"]=(dy<100)?((dy<10)?("00"+dy):("0"+dy)):dy;s["%k"]=hr;s["%l"]=ir;s["%m"]=(m<9)?("0"+(1+m)):(1+m);s["%M"]=(min<10)?("0"+min):min;s["%n"]="\n";s["%p"]=pm?"PM":"AM";s["%P"]=pm?"pm":"am";s["%s"]=Math.floor(this.getTime()/1000);s["%S"]=(sec<10)?("0"+sec):sec;s["%t"]="\t";s["%U"]=s["%W"]=s["%V"]=(wn<10)?("0"+wn):wn;s["%u"]=w+1;s["%w"]=w;s["%y"]=(''+y).substr(2,2);s["%Y"]=y;s["%%"]="%";var re=/%./g;if(!Calendar.is_ie5&&!Calendar.is_khtml)return str.replace(re,function(par){return s[par]||par;});var a=str.match(re);for(var i=0;i<a.length;i++){var tmp=s[a[i]];if(tmp){re=new RegExp(a[i],'g');str=str.replace(re,tmp);}}return str;};Date.prototype.__msh_oldSetFullYear=Date.prototype.setFullYear;Date.prototype.setFullYear=function(y){var d=new Date(this);d.__msh_oldSetFullYear(y);if(d.getMonth()!=this.getMonth())this.setDate(28);this.__msh_oldSetFullYear(y);};window._dynarch_popupCalendar=null;
\ No newline at end of file
-- 
cgit v1.2.1


From a2b0b3e8500b08a5cf017c85693d9649853f8569 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 Feb 2006 21:43:02 +0000
Subject: automate more of the initial data adding...

---
 FS/FS/Setup.pm               | 422 +++++++++++++++++++++++++++++++++++++++++++
 FS/bin/freeside-setup        |  73 +-------
 bin/populate-msgcat          | 135 --------------
 httemplate/docs/admin.html   |  45 +----
 httemplate/docs/install.html |  11 +-
 5 files changed, 434 insertions(+), 252 deletions(-)
 create mode 100644 FS/FS/Setup.pm
 delete mode 100755 bin/populate-msgcat

diff --git a/FS/FS/Setup.pm b/FS/FS/Setup.pm
new file mode 100644
index 000000000..8e89be5eb
--- /dev/null
+++ b/FS/FS/Setup.pm
@@ -0,0 +1,422 @@
+package FS::Setup;
+
+use strict;
+use vars qw( @ISA @EXPORT_OK );
+use Exporter;
+#use Tie::DxHash;
+use Tie::IxHash;
+use FS::UID qw( dbh );
+use FS::Record;
+
+use FS::svc_domain;
+$FS::svc_domain::whois_hack = 1;
+$FS::svc_domain::whois_hack = 1;
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( create_initial_data );
+
+=head1 NAME
+
+FS::Setup - Database setup
+
+=head1 SYNOPSIS
+
+  use FS::Setup;
+
+=head1 DESCRIPTION
+
+Currently this module simply provides a place to store common subroutines for
+database setup.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item
+
+=cut
+
+sub create_initial_data {
+  my %opt = @_;
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  $FS::UID::AutoCommit = 0;
+
+  populate_locales();
+
+  #initial_data data
+  populate_initial_data(%opt);
+
+  populate_msgcat();
+  
+  if ( $oldAutoCommit ) {
+    dbh->commit or die dbh->errstr;
+  }
+
+}
+
+sub populate_locales {
+
+  use Locale::Country;
+  use Locale::SubCountry;
+  use FS::cust_main_county;
+
+  #cust_main_county
+  foreach my $country ( sort map uc($_), all_country_codes ) {
+  
+    my $subcountry = eval { new Locale::SubCountry($country) };
+    my @states = $subcountry ? $subcountry->all_codes : undef;
+  
+    if ( !scalar(@states) || ( scalar(@states)==1 && !defined($states[0]) ) ) {
+  
+      my $cust_main_county = new FS::cust_main_county({
+        'tax'   => 0,
+        'country' => $country,
+      });  
+      my $error = $cust_main_county->insert;
+      die $error if $error;
+  
+    } else {
+  
+      if ( $states[0] =~ /^(\d+|\w)$/ ) {
+        @states = map $subcountry->full_name($_), @states
+      }
+  
+      foreach my $state ( @states ) {
+  
+        my $cust_main_county = new FS::cust_main_county({
+          'state' => $state,
+          'tax'   => 0,
+          'country' => $country,
+        });  
+        my $error = $cust_main_county->insert;
+        die $error if $error;
+  
+      }
+    
+    }
+  }
+
+}
+
+sub populate_initial_data {
+  my %opt = @_;
+
+  my $data = initial_data(%opt);
+
+  foreach my $table ( keys %$data ) {
+
+    my $class = "FS::$table";
+    eval "use $class;";
+    die $@ if $@;
+
+    my @records = @{ $data->{$table} };
+
+    foreach my $record ( @records ) {
+      my $args = delete($record->{'_insert_args'}) || [];
+      my $object = $class->new( $record );
+      my $error = $object->insert( @$args );
+      die "error inserting record into $table: $error\n"
+        if $error;
+    }
+
+  }
+
+}
+
+sub initial_data {
+  my %opt = @_;
+
+  #tie my %hash, 'Tie::DxHash', 
+  tie my %hash, 'Tie::IxHash', 
+
+    #billing events
+    'part_bill_event' => [
+      { 'payby'     => 'CARD',
+        'event'     => 'Batch card',
+        'seconds'   => 0,
+        'eventcode' => '$cust_bill->batch_card();',
+        'weight'    => 40,
+        'plan'      => 'batch-card',
+      },
+      { 'payby'     => 'BILL',
+        'event'     => 'Send invoice',
+        'seconds'   => 0,
+        'eventcode' => '$cust_bill->send();',
+        'weight'    => 50,
+        'plan'      => 'send',
+      },
+      { 'payby'     => 'DCRD',
+        'event'     => 'Send invoice',
+        'seconds'   => 0,
+        'eventcode' => '$cust_bill->send();',
+        'weight'    => 50,
+        'plan'      => 'send',
+      },
+      { 'payby'     => 'DCHK',
+        'event'     => 'Send invoice',
+        'seconds'   => 0,
+        'eventcode' => '$cust_bill->send();',
+        'weight'    => 50,
+        'plan'      => 'send',
+      },
+    ],
+    
+    #you must create a service definition. An example of a service definition
+    #would be a dial-up account or a domain. First, it is necessary to create a
+    #domain definition. Click on View/Edit service definitions and Add a new
+    #service definition with Table svc_domain (and no modifiers).
+    'part_svc' => [
+      { 'svc'   => 'Domain',
+        'svcdb' => 'svc_domain',
+      }
+    ],
+
+    #Now that you have created your first service, you must create a package
+    #including this service which you can sell to customers. Zero, one, or many
+    #services are bundled into a package. Click on View/Edit package
+    #definitions and Add a new package definition which includes quantity 1 of
+    #the svc_domain service you created above.
+    'part_pkg' => [
+      { 'pkg'     => 'System Domain',
+        'comment' => '(NOT FOR CUSTOMERS)',
+        'freq'    => '0',
+        'plan'    => 'flat',
+        '_insert_args' => [
+          'pkg_svc'     => { 1 => 1 }, # XXX
+          'primary_svc' => 1, #XXX
+          'options'     => {
+            'setup_fee' => '0',
+            'recur_fee' => '0',
+          },
+        ],
+      },
+    ],
+
+    #After you create your first package, then you must define who is able to
+    #sell that package by creating an agent type. An example of an agent type
+    #would be an internal sales representitive which sells regular and
+    #promotional packages, as opposed to an external sales representitive
+    #which would only sell regular packages of services. Click on View/Edit
+    #agent types and Add a new agent type.
+    'agent_type' => [
+      { 'atype' => 'internal' },
+    ],
+
+    #Allow this agent type to sell the package you created above.
+    'type_pkgs' => [
+      { 'typenum' => 1, #XXX
+        'pkgpart' => 1, #XXX
+      },
+    ],
+
+    #After creating a new agent type, you must create an agent. Click on
+    #View/Edit agents and Add a new agent.
+    'agent' => [
+      { 'agent'   => 'Internal',
+        'typenum' => 1, # XXX
+      },
+    ],
+
+    #Set up at least one Advertising source. Advertising sources will help you
+    #keep track of how effective your advertising is, tracking where customers
+    #heard of your service offerings. You must create at least one advertising
+    #source. If you do not wish to use the referral functionality, simply
+    #create a single advertising source only. Click on View/Edit advertising
+    #sources and Add a new advertising source.
+    'part_referral' => [
+      { 'referral' => 'Internal', },
+    ],
+    
+    #Click on New Customer and create a new customer for your system accounts
+    #with billing type Complimentary. Leave the First package dropdown set to
+    #(none).
+    'cust_main' => [
+      { 'agentnum'  => 1, #XXX
+        'refnum'    => 1, #XXX
+        'first'     => 'System',
+        'last'      => 'Accounts',
+        'address1'  => '1234 System Lane',
+        'city'      => 'Systemtown',
+        'state'     => 'CA',
+        'zip'       => '54321',
+        'country'   => 'US',
+        'payby'     => 'COMP',
+        'payinfo'   => 'system', #or something
+        'paydate'   => '1/2037',
+      },
+    ],
+
+    #From the Customer View screen of the newly created customer, order the
+    #package you defined above.
+    'cust_pkg' => [
+      { 'custnum' => 1, #XXX
+        'pkgpart' => 1, #XXX
+      },
+    ],
+
+    #From the Package View screen of the newly created package, choose
+    #(Provision) to add the customer's service for this new package.
+    #Add your own domain.
+    'svc_domain' => [
+      { 'domain'  => $opt{'domain'},
+        'pkgnum'  => 1, #XXX
+        'svcpart' => 1, #XXX
+        'action'  => 'N', #pseudo-field
+      },
+    ],
+
+    #Go back to View/Edit service definitions on the main menu, and Add a new
+    #service definition with Table svc_acct. Select your domain in the domsvc
+    #Modifier. Set Fixed to define a service locked-in to this domain, or
+    #Default to define a service which may select from among this domain and
+    #the customer's domains.
+
+    #not yet....
+
+  #)
+  ;
+
+  \%hash;
+
+}
+
+sub populate_msgcat {
+
+  use FS::Record qw(qsearch);
+  use FS::msgcat;
+
+  foreach my $del_msgcat ( qsearch('msgcat', {}) ) {
+    my $error = $del_msgcat->delete;
+    die $error if $error;
+  }
+
+  my %messages = msgcat_messages();
+
+  foreach my $msgcode ( keys %messages ) {
+    foreach my $locale ( keys %{$messages{$msgcode}} ) {
+      my $msgcat = new FS::msgcat( {
+        'msgcode' => $msgcode,
+        'locale'  => $locale,
+        'msg'     => $messages{$msgcode}{$locale},
+      });
+      my $error = $msgcat->insert;
+      die $error if $error;
+    }
+  }
+
+}
+
+sub msgcat_messages {
+
+  #  'msgcode' => {
+  #    'en_US' => 'Message',
+  #  },
+
+  (
+
+    'passwords_dont_match' => {
+      'en_US' => "Passwords don't match",
+    },
+
+    'invalid_card' => {
+      'en_US' => 'Invalid credit card number',
+    },
+
+    'unknown_card_type' => {
+      'en_US' => 'Unknown card type',
+    },
+
+    'not_a' => {
+      'en_US' => 'Not a ',
+    },
+
+    'empty_password' => {
+      'en_US' => 'Empty password',
+    },
+
+    'no_access_number_selected' => {
+      'en_US' => 'No access number selected',
+    },
+
+    'illegal_text' => {
+      'en_US' => 'Illegal (text)',
+      #'en_US' => 'Only letters, numbers, spaces, and the following punctuation symbols are permitted: ! @ # $ % & ( ) - + ; : \' " , . ? / in field',
+    },
+
+    'illegal_or_empty_text' => {
+      'en_US' => 'Illegal or empty (text)',
+      #'en_US' => 'Only letters, numbers, spaces, and the following punctuation symbols are permitted: ! @ # $ % & ( ) - + ; : \' " , . ? / in required field',
+    },
+
+    'illegal_username' => {
+      'en_US' => 'Illegal username',
+    },
+
+    'illegal_password' => {
+      'en_US' => 'Illegal password (',
+    },
+
+    'illegal_password_characters' => {
+      'en_US' => ' characters)',
+    },
+
+    'username_in_use' => {
+      'en_US' => 'Username in use',
+    },
+
+    'illegal_email_invoice_address' => {
+      'en_US' => 'Illegal email invoice address',
+    },
+
+    'illegal_name' => {
+      'en_US' => 'Illegal (name)',
+      #'en_US' => 'Only letters, numbers, spaces and the following punctuation symbols are permitted: , . - \' in field',
+    },
+
+    'illegal_phone' => {
+      'en_US' => 'Illegal (phone)',
+      #'en_US' => '',
+    },
+
+    'illegal_zip' => {
+      'en_US' => 'Illegal (zip)',
+      #'en_US' => '',
+    },
+
+    'expired_card' => {
+      'en_US' => 'Expired card',
+    },
+
+    'daytime' => {
+      'en_US' => 'Day Phone',
+    },
+
+    'night' => {
+      'en_US' => 'Night Phone',
+    },
+
+    'svc_external-id' => {
+      'en_US' => 'External ID',
+    },
+
+    'svc_external-title' => {
+      'en_US' => 'Title',
+    },
+
+  );
+}
+
+=back
+
+=head1 BUGS
+
+Sure.
+
+=head1 SEE ALSO
+
+=cut
+
+1;
+
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index a16e51749..bff2bcc63 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -4,23 +4,20 @@
 BEGIN { $FS::Schema::setup_hack = 1; }
 
 use strict;
-use vars qw($opt_s);
+use vars qw($opt_s $opt_d $opt_v);
 use Getopt::Std;
-use Locale::Country;
-use Locale::SubCountry;
 use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
 use FS::Schema qw( dbdef_dist reload_dbdef );
 use FS::Record;
-use FS::cust_main_county;
 #use FS::raddb;
-use FS::part_bill_event;
+use FS::Setup qw(create_initial_data);
 
 die "Not running uid freeside!" unless checkeuid();
 
 #my %attrib2db =
 #  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
 
-getopts("s");
+getopts("svd:");
 my $user = shift or die &usage;
 getsecrets($user);
 
@@ -94,6 +91,7 @@ my $dbh = adminsuidsetup $user;
 $|=1;
 
 foreach my $statement ( $dbdef->sql($dbh) ) {
+  warn $statement if $statement =~ /TABLE cdr/;
   $dbh->do( $statement )
     or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
 }
@@ -104,69 +102,14 @@ dbdef_create($dbh, $dbdef_file);
 delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
 reload_dbdef($dbdef_file);
 
-#cust_main_county
-foreach my $country ( sort map uc($_), all_country_codes ) {
+create_initial_data('domain' => $opt_d);
 
-  my $subcountry = eval { new Locale::SubCountry($country) };
-  my @states = $subcountry ? $subcountry->all_codes : undef;
-
-  if ( !scalar(@states) || ( scalar(@states) == 1 && !defined($states[0]) ) ) {
-
-    my $cust_main_county = new FS::cust_main_county({
-      'tax'   => 0,
-      'country' => $country,
-    });  
-    my $error = $cust_main_county->insert;
-    die $error if $error;
-
-  } else {
-
-    if ( $states[0] =~ /^(\d+|\w)$/ ) {
-      @states = map $subcountry->full_name($_), @states
-    }
-
-    foreach my $state ( @states ) {
-
-      my $cust_main_county = new FS::cust_main_county({
-        'state' => $state,
-        'tax'   => 0,
-        'country' => $country,
-      });  
-      my $error = $cust_main_county->insert;
-      die $error if $error;
-
-    }
-  
-  }
-}
-
-#billing events
-foreach my $aref ( 
-  #[ 'COMP', 'Comp invoice', '$cust_bill->comp();', 30, 'comp' ],
-  [ 'CARD', 'Batch card', '$cust_bill->batch_card();', 40, 'batch-card' ],
-  [ 'BILL', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
-  [ 'DCRD', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
-  [ 'DCHK', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
-) {
-
-  my $part_bill_event = new FS::part_bill_event({
-    'payby' => $aref->[0],
-    'event' => $aref->[1],
-    'eventcode' => $aref->[2],
-    'seconds' => 0,
-    'weight' => $aref->[3],
-    'plan' => $aref->[4],
-  });
-  my($error);
-  $error=$part_bill_event->insert;
-  die $error if $error;
-
-}
+warn "Freeside database initialized - commiting transaction\n" if $opt_v;
 
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
-#print "Freeside database initialized sucessfully\n";
+warn "Database initialization committed sucessfully\n" if $opt_v;
 
 sub dbdef_create { # reverse engineer the schema from the DB and save to file
   my( $dbh, $file ) = @_;
@@ -175,7 +118,7 @@ sub dbdef_create { # reverse engineer the schema from the DB and save to file
 }
 
 sub usage {
-  die "Usage:\n  freeside-setup user\n"; 
+  die "Usage:\n  freeside-setup -d domain.name [ -v ] user\n"; 
 }
 
 1;
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
deleted file mode 100755
index adac92dd0..000000000
--- a/bin/populate-msgcat
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::msgcat;
-
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-foreach my $del_msgcat ( qsearch('msgcat', {}) ) {
-  my $error = $del_msgcat->delete;
-  die $error if $error;
-}
-
-my %messages = messages();
-
-foreach my $msgcode ( keys %messages ) {
-  foreach my $locale ( keys %{$messages{$msgcode}} ) {
-    my $msgcat = new FS::msgcat( {
-      'msgcode' => $msgcode,
-      'locale'  => $locale,
-      'msg'     => $messages{$msgcode}{$locale},
-    });
-    my $error = $msgcat->insert;
-    die $error if $error;
-  }
-}
-
-#print "Message catalog initialized sucessfully\n";
-
-sub messages {
-
-  #  'msgcode' => {
-  #    'en_US' => 'Message',
-  #  },
-
-  (
-
-    'passwords_dont_match' => {
-      'en_US' => "Passwords don't match",
-    },
-
-    'invalid_card' => {
-      'en_US' => 'Invalid credit card number',
-    },
-
-    'unknown_card_type' => {
-      'en_US' => 'Unknown card type',
-    },
-
-    'not_a' => {
-      'en_US' => 'Not a ',
-    },
-
-    'empty_password' => {
-      'en_US' => 'Empty password',
-    },
-
-    'no_access_number_selected' => {
-      'en_US' => 'No access number selected',
-    },
-
-    'illegal_text' => {
-      'en_US' => 'Illegal (text)',
-      #'en_US' => 'Only letters, numbers, spaces, and the following punctuation symbols are permitted: ! @ # $ % & ( ) - + ; : \' " , . ? / in field',
-    },
-
-    'illegal_or_empty_text' => {
-      'en_US' => 'Illegal or empty (text)',
-      #'en_US' => 'Only letters, numbers, spaces, and the following punctuation symbols are permitted: ! @ # $ % & ( ) - + ; : \' " , . ? / in required field',
-    },
-
-    'illegal_username' => {
-      'en_US' => 'Illegal username',
-    },
-
-    'illegal_password' => {
-      'en_US' => 'Illegal password (',
-    },
-
-    'illegal_password_characters' => {
-      'en_US' => ' characters)',
-    },
-
-    'username_in_use' => {
-      'en_US' => 'Username in use',
-    },
-
-    'illegal_email_invoice_address' => {
-      'en_US' => 'Illegal email invoice address',
-    },
-
-    'illegal_name' => {
-      'en_US' => 'Illegal (name)',
-      #'en_US' => 'Only letters, numbers, spaces and the following punctuation symbols are permitted: , . - \' in field',
-    },
-
-    'illegal_phone' => {
-      'en_US' => 'Illegal (phone)',
-      #'en_US' => '',
-    },
-
-    'illegal_zip' => {
-      'en_US' => 'Illegal (zip)',
-      #'en_US' => '',
-    },
-
-    'expired_card' => {
-      'en_US' => 'Expired card',
-    },
-
-    'daytime' => {
-      'en_US' => 'Day Phone',
-    },
-
-    'night' => {
-      'en_US' => 'Night Phone',
-    },
-
-    'svc_external-id' => {
-      'en_US' => 'External ID',
-    },
-
-    'svc_external-title' => {
-      'en_US' => 'Title',
-    },
-
-  );
-}
-
-sub usage {
-  die "Usage:\n\n  populate-msgcat user\n";
-}
-
diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
index 9ce259c2b..2aa934812 100755
--- a/httemplate/docs/admin.html
+++ b/httemplate/docs/admin.html
@@ -11,49 +11,8 @@
   /home/httpd/html, open https://your_host/freeside/. Replace
   "your_host" with the name or network address of your web server.
   <li>Select <u>Configuration</u> from the main menu and update your configuration values.
-  <li>Next you must create a service definition.  An example of a service
-  definition would be a dial-up account or a domain.  First, it is
-  necessary to create a domain definition.  Click on <u>View/Edit service
-  definitions</u> and <u>Add a new service definition</u> with <i>Table</i>
-  <b>svc_domain</b> (and no modifiers).
 
-  <li>Now that you have created your first service, you must create a package
-  including this service which you can sell to customers.  Zero, one, or many
-  services are bundled into a package.  Click on <u>View/Edit package
-  definitions</u> and <u>Add a new package definition</u> which includes
-  quantity <b>1</b> of the svc_domain service you created above.
-
-  <li>After you create your first package, then you must define who is
-  able to sell that package by creating an agent type.  An example of
-  an agent type would be an internal sales representitive which sells
-  regular and promotional packages, as opposed to an external sales
-  representitive which would only sell regular packages of services.  Click on
-  <u>View/Edit agent types</u> and <u>Add a new agent type</u>.  Allow this
-  agent type to sell the package you created above.
-
-  <li>After creating a new agent type, you must create an agent.  Click on
-  <u>View/Edit agents</u> and <u>Add a new agent</u>.
-
-  <li>Set up at least one Advertising source.  Advertising sources will help
-  you keep track of how effective your advertising is, tracking where customers
-  heard of your service offerings.  You must create at least one advertising 
-  source.  If you do not wish to use the referral functionality, simply create
-  a single advertising source only.  Click on <u>View/Edit advertising
-  sources</u> and <u>Add a new advertising source</u>.
-
-  <li>Click on <u>New Customer</u> and create a new customer for your system
-  accounts with billing type <b>Complimentary</b>.  Leave the <i>First
-  package</i> dropdown set to <b>(none)</b>.
-
-  <li>From the Customer View screen of the newly created customer, order the
-  package you defined above.
-
-  <li>From the Package View screen of the newly created package, choose
-  <u>(Provision)</u> to add the customer's service for this new package.
-
-  <li>Add your own domain.
-
-  <li>Go back to <u>View/Edit service definitions</u> on the main menu, and
+  <li>Go to <u>View/Edit service definitions</u> on the main menu, and
   <u>Add a new service definition</u> with <i>Table</i> <b>svc_acct</b>.
   Select your domain in the <b>domsvc</b> Modifier.  Set <b>Fixed</b> to define
   a service locked-in to this domain, or <b>Default</b> to define a service
@@ -69,7 +28,7 @@
 
   <li>If you are using Freeside to keep track of sales taxes, define tax
   information for your locales by clicking on the <u>View/Edit locales and tax
-  rates</b> on the main menu.
+  rates</u> on the main menu.
 
   <li>If you would like Freeside to notify your customers when their credit
   cards and other billing arrangements are about to expire, arrange for
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 1f80db1a7..02572759e 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -196,17 +196,10 @@ require valid-user
 <pre>$ su
 # <a href="man/bin/freeside-adduser.html">freeside-adduser</a> fs_queue
 # <a href="man/bin/freeside-adduser.html">freeside-adduser</a> fs_selfservice</pre>
-  <li>As the freeside UNIX user, run <tt>freeside-setup <b>username</b></tt> to create the database tables, passing the username of a Freeside user you created above:
+  <li>As the freeside UNIX user, run <tt>freeside-setup -d <b>domain.name</b> <b>username</b></tt> to create the database tables and initial data, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
-$ freeside-setup <b>username</b>
-</pre>
-  Alternately, use the -s option to enable shipping addresses: <tt>freeside-setup -s <b>username</b></tt>
-  <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <b>username</b></tt> (in the untar'ed freeside directory) to populate the message catalog, passing the username of a Freeside user you created above:
-<pre>
-$ su freeside
-$ cd <b>/path/to/freeside/</b>
-$ bin/populate-msgcat <b>username</b>
+$ freeside-setup -d </b>example.com</b> <b>username</b>
 </pre>
   <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your systemand QUEUED_USER with the username of a Freeside user you created above, and run <tt>make install-init</tt>)
   <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
-- 
cgit v1.2.1


From d8b70477cf7fd3b87464940f13e85547ccdbd31d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 18 Feb 2006 02:11:44 +0000
Subject: update POD documentation left behind from example template

---
 FS/FS/cust_tax_exempt_pkg.pm | 6 +++---
 FS/FS/domain_record.pm       | 4 ++--
 FS/FS/msgcat.pm              | 7 ++++---
 FS/FS/nas.pm                 | 2 +-
 FS/FS/part_bill_event.pm     | 4 ++--
 FS/FS/port.pm                | 4 ++--
 FS/FS/prepay_credit.pm       | 2 +-
 FS/FS/queue.pm               | 2 +-
 FS/FS/queue_arg.pm           | 2 +-
 FS/FS/rate_detail.pm         | 5 +++--
 FS/FS/reg_code_pkg.pm        | 3 ++-
 11 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/FS/FS/cust_tax_exempt_pkg.pm b/FS/FS/cust_tax_exempt_pkg.pm
index 28fa24327..128921b9c 100644
--- a/FS/FS/cust_tax_exempt_pkg.pm
+++ b/FS/FS/cust_tax_exempt_pkg.pm
@@ -56,8 +56,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new exemption record.  To add the example to the database, see
-L<"insert">.
+Creates a new exemption record.  To add the examption record to the database,
+see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -96,7 +96,7 @@ returns the error, otherwise returns false.
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid exemption record.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 3c65a1a05..6513abf25 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -59,7 +59,7 @@ supported:
 
 =item new HASHREF
 
-Creates a new entry.  To add the example to the database, see L<"insert">.
+Creates a new entry.  To add the entry to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -229,7 +229,7 @@ sub replace {
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid entry.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
diff --git a/FS/FS/msgcat.pm b/FS/FS/msgcat.pm
index 855b8b291..cbdc1d633 100644
--- a/FS/FS/msgcat.pm
+++ b/FS/FS/msgcat.pm
@@ -52,7 +52,8 @@ If you just want to B<use> message catalogs, see L<FS::Msgcat>.
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new message catalog entry.  To add the message catalog entry to the
+database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -91,8 +92,8 @@ returns the error, otherwise returns false.
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
+Checks all fields to make sure this is a valid message catalog entry.  If there
+is an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
 =cut
diff --git a/FS/FS/nas.pm b/FS/FS/nas.pm
index 3495339e0..97b0ea17d 100644
--- a/FS/FS/nas.pm
+++ b/FS/FS/nas.pm
@@ -98,7 +98,7 @@ returns the error, otherwise returns false.
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid NAS.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index 8143e3473..98e15d4a2 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -61,8 +61,8 @@ FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new invoice event definition.  To add the example to the database,
-see L<"insert">.
+Creates a new invoice event definition.  To add the invoice event definition to
+the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
diff --git a/FS/FS/port.pm b/FS/FS/port.pm
index 253727ba7..c26ca85d4 100644
--- a/FS/FS/port.pm
+++ b/FS/FS/port.pm
@@ -52,7 +52,7 @@ from FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new port.  To add the example to the database, see L<"insert">.
+Creates a new port.  To add the port to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -91,7 +91,7 @@ returns the error, otherwise returns false.
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid port.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
index 92f2a3032..38e87ad91 100644
--- a/FS/FS/prepay_credit.pm
+++ b/FS/FS/prepay_credit.pm
@@ -61,7 +61,7 @@ fields are currently supported:
 
 =item new HASHREF
 
-Creates a new pre-paid credit.  To add the example to the database, see
+Creates a new pre-paid credit.  To add the pre-paid credit to the database, see
 L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index f42d99837..5f8bf11f0 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -68,7 +68,7 @@ FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new job.  To add the example to the database, see L<"insert">.
+Creates a new job.  To add the job to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
diff --git a/FS/FS/queue_arg.pm b/FS/FS/queue_arg.pm
index 39c71192f..c96ff1236 100644
--- a/FS/FS/queue_arg.pm
+++ b/FS/FS/queue_arg.pm
@@ -46,7 +46,7 @@ FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new argument.  To add the example to the database, see L<"insert">.
+Creates a new argument.  To add the argument to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
diff --git a/FS/FS/rate_detail.pm b/FS/FS/rate_detail.pm
index 7d54355fb..1964be2f4 100644
--- a/FS/FS/rate_detail.pm
+++ b/FS/FS/rate_detail.pm
@@ -56,7 +56,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new call plan rate.  To add the call plan rate to the database, see
+L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -95,7 +96,7 @@ returns the error, otherwise returns false.
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid call plan rate.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
diff --git a/FS/FS/reg_code_pkg.pm b/FS/FS/reg_code_pkg.pm
index 9b9a87712..837b755e6 100644
--- a/FS/FS/reg_code_pkg.pm
+++ b/FS/FS/reg_code_pkg.pm
@@ -49,7 +49,8 @@ supported:
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new registration code.  To add the registration code to the database,
+see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
-- 
cgit v1.2.1


From 6d27649c93f3f83c14611c790281a7b667062fc0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 18 Feb 2006 04:32:57 +0000
Subject: Mason it is

---
 htetc/global.asa             | 263 -------------------------------------------
 httemplate/docs/install.html |  39 +------
 2 files changed, 2 insertions(+), 300 deletions(-)
 delete mode 100644 htetc/global.asa

diff --git a/htetc/global.asa b/htetc/global.asa
deleted file mode 100644
index bb30608a4..000000000
--- a/htetc/global.asa
+++ /dev/null
@@ -1,263 +0,0 @@
-BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
-#BEGIN { package Devel::AutoProfiler; use vars qw(%caller_info); }
-#use Devel::AutoProfiler;
-
-use strict;
-use vars qw( $cgi $p );
-use Apache::ASP 2.55;
-use CGI 2.47;
-#use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use Date::Parse;
-use Time::Local;
-use Time::Duration;
-use Tie::IxHash;
-use URI::Escape;
-use HTML::Entities;
-use JSON;
-use IO::Handle;
-use IO::File;
-use IO::Scalar;
-use Net::Whois::Raw qw(whois);
-if ( $] < 5.006 ) {
-  eval "use Net::Whois::Raw 0.32 qw(whois)";
-  die $@ if $@;
-}
-use Text::CSV_XS;
-use Spreadsheet::WriteExcel;
-use Business::CreditCard;
-use String::Approx qw(amatch);
-use Chart::LinesPoints;
-use HTML::Widgets::SelectLayers 0.05;
-use FS;
-use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
-use FS::Record qw(qsearch qsearchs fields dbdef);
-use FS::Conf;
-use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-               small_custview myexit http_header);
-use FS::UI::Web;
-use FS::Msgcat qw(gettext geterror);
-use FS::Misc qw( send_email );
-use FS::Report::Table::Monthly;
-use FS::TicketSystem;
-
-use FS::agent;
-use FS::agent_type;
-use FS::domain_record;
-use FS::cust_bill;
-use FS::cust_bill_pay;
-use FS::cust_credit;
-use FS::cust_credit_bill;
-use FS::cust_main qw(smart_search);
-use FS::cust_main_county;
-use FS::cust_pay;
-use FS::cust_pkg;
-use FS::cust_refund;
-use FS::cust_svc;
-use FS::nas;
-use FS::part_bill_event;
-use FS::part_pkg;
-use FS::part_referral;
-use FS::part_svc;
-use FS::part_svc_router;
-use FS::part_virtual_field;
-use FS::pkg_svc;
-use FS::port;
-use FS::queue qw(joblisting);
-use FS::raddb;
-use FS::session;
-use FS::svc_acct;
-use FS::svc_acct_pop qw(popselector);
-use FS::svc_domain;
-use FS::svc_forward;
-use FS::svc_www;
-use FS::router;
-use FS::addr_block;
-use FS::svc_broadband;
-use FS::svc_external;
-use FS::type_pkgs;
-use FS::part_export;
-use FS::part_export_option;
-use FS::export_svc;
-use FS::msgcat;
-use FS::rate;
-use FS::rate_region;
-use FS::rate_prefix;
-use FS::payment_gateway;
-use FS::agent_payment_gateway;
-
-sub Script_OnStart {
-  $Response->AddHeader('Cache-control' => 'no-cache');
-#  $Response->AddHeader('Expires' => 0);
-  $Response->{Expires} = -36288000;
-
-  $cgi = new CGI;
-  &cgisuidsetup($cgi);
-  $p = popurl(2);
-  #print $cgi->header( '-expires' => 'now' );
-  #dbh->{'private_profile'} = {} if dbh->can('sprintProfile');
-  dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
-
-  #really should check for FS::Profiler or something
-    # Devel::AutoProfiler _our_ VERSION?  thanks a fucking lot
-  if ( Devel::AutoProfiler->can('__recursively_fetch_subs_in_package') ) {
-    #should check to see it's my special version.  well, switch to FS::Profiler
-
-    #nicked from Devel::AutoProfiler::INIT
-    my %subs = Devel::AutoProfiler::__recursively_fetch_subs_in_package('main');
-
-
-    SUB : while( my ($name, $ref) = each(%subs) )
-      {
-        #next if $name =~ /^(main::)?Apache::/;
-        next unless $name =~ /FS/;
-        foreach my $sub (@Devel::AutoProfiler::do_not_instrument_this_sub)
-          {
-            if ($name =~ /$sub/)
-              {
-                next SUB;
-              }
-          }
-        next if ($Devel::AutoProfiler::do_not_instrument_this_sub{$name});
-        #warn "INIT name is $name \n";
-        Devel::AutoProfiler::__instrument_sub($name, $ref);
-      }
-
-  }
-
-}
-
-sub Script_OnFlush {
-  my $ref = $Response->{BinaryRef};
-  #$$ref = $cgi->header( @FS::CGI::header ) . $$ref;
-  #$$ref = $cgi->header() . $$ref;
-  #warn "Script_OnFlush called with dbh ". dbh. "\n";
-  #if ( dbh->can('sprintProfile') ) {
-  if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
-    #warn "dbh can sprintProfile\n";
-    if ( lc($Response->{ContentType}) eq 'text/html' ) { #con
-      #warn "contenttype is sprintProfile\n";
-      $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
-        or warn "can't remove";
-  
-      #$$ref .= '<PRE>'. ("\n"x96). encode_entities(dbh->sprintProfile()). '</PRE>';
-      #  wtf?  konqueror...
-      $$ref .= '<PRE>'. ("\n"x4096). encode_entities(dbh->sprintProfile()).
-               "\n\n". &sprintAutoProfile(). '</PRE>';
-
-      $$ref .= '</BODY></HTML>';
-    }
-    dbh->{'private_profile'} = {};
-  }
-}
-
-#if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) {
-#if ( defined(@DBIx::Profile::ISA) && UNIVERSAL::can('DBIx::Profile::db', 'sprintProfile') ) {
-if ( defined(@DBIx::Profile::ISA) ) {
-
-  #warn "enabling profiling redirects";
-  *CGI::redirect = sub {
-    my( $self, $location) = @_;
-    my $page =
-      $cgi->header.
-      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!.
-      '<BR><BR><PRE>'.
-        ( UNIVERSAL::can(dbh, 'sprintProfile')
-            ? encode_entities(dbh->sprintProfile())
-            : 'DBIx::Profile missing sprintProfile method;'.
-              'unpatched or too old?'                        ).
-      "\n\n". &sprintAutoProfile().  '</PRE>'.
-      '</BODY></HTML>';
-    dbh->{'private_profile'} = {};
-    return $page;
-  };
-
-}
-
-sub by_total_time 
-{ 
-  return $a->{total_time_in_sub} <=> $b->{total_time_in_sub}; 
-}
-
-sub sprintAutoProfile {
-  my %caller_info = %Devel::AutoProfiler::caller_info;
-  return unless keys %caller_info;
-
-  %Devel::AutoProfiler::caller_info = ();
-
-  my @keys = keys(%caller_info);
-
-  foreach my $key (@keys)
-    {
-      my $href = $caller_info{$key};
-
-      $href->{who_am_i} = $key;
-    }
-
-  my @subs = values(%caller_info);
-
-  #my @sorted = sort by_total_time ( @subs );
-  my @sorted = reverse sort by_total_time ( @subs );
-
-  # print Dumper \@sorted;
-
-  my @readable_info;
-
-  foreach my $sort (@sorted)
-    {
-      push(@readable_info, delete($sort->{who_am_i}));
-      push(@readable_info, $sort);
-    }
-
-  use Data::Dumper;
-  return encode_entities(Dumper(\@readable_info));
-
-}
-
-sub include {
-  my $file = shift;
-  my $shift = 0;
-  if ( $file =~ m(^([^/].*)/[^/]+) ) {
-    unshift @{$Response->{asp}{includes_dir}}, "./$1";
-    $shift = 1;
-  }
-  $file =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/);
-  #broken in 5.005# ${$Response->TrapInclude($file, @_)};
-  my $ref = $Response->TrapInclude($file, @_);
-  shift @{$Response->{asp}{includes_dir}} if $shift;
-  $$ref;
-}
-
-if ( defined(@DBIx::Profile::ISA) ) {
-
-  #false laziness w/above
-  *redirect = sub {
-    my($location) = @_;
-
-    ${$Response->{BinaryRef}} = 
-      $cgi->header.
-      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!.
-      '<BR><BR><PRE>'.
-        ( UNIVERSAL::can(dbh, 'sprintProfile')
-            ? encode_entities(dbh->sprintProfile())
-            : 'DBIx::Profile missing sprintProfile method;'.
-              'unpatched or too old?'                        ).
-      "\n\n". &sprintAutoProfile().  '</PRE>'.
-      '</BODY></HTML>';
-
-    dbh->{'private_profile'} = {};
-
-    $Response->End;
-
-  };
-
-} else {
-
-  *redirect = sub {
-    $Response->Redirect(@_);
-  }
-
-}
-
-1;
-
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 02572759e..6e366cbbb 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -52,7 +52,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/dist/Net-SSH">Net-SSH</a>
       <li><a href="http://search.cpan.org/dist/String-ShellQuote">String-ShellQuote</a>
       <li><a href="http://search.cpan.org/dist/Net-SCP">Net-SCP</a>
-      <li><a href="http://www.masonhq.com/">HTML::Mason</a> (recommended, enables full functionality) or <a href="http://www.apache-asp.org/">Apache::ASP</a> (deprecated, integrated RT ticketing will not be available)
+      <li><a href="http://www.masonhq.com/">HTML::Mason</a>
       <li><a href="http://search.cpan.org/dist/Tie-IxHash">Tie-IxHash</a>
       <li><a href="http://search.cpan.org/dist/Time-Duration">Time-Duration</a>
       <li><a href="http://search.cpan.org/dist/HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
@@ -123,15 +123,7 @@ $ su
     <li>Run a <b>separate</b> iteration of Apache[-SSL] with mod_perl enabled <b>as the freeside user</b>.
     <li>Edit the <tt>Makefile</tt> and set <tt>TEMPLATE</tt> to <tt>asp</tt> or <tt>mason</tt>.  Also set <tt>FREESIDE_DOCUMENT_ROOT</tt>.
     <li>Run <tt> make install-docs</tt>.
-</ul>
-<table>
-  <tr>
-    <th>Mason (recommended)</th><th>Apache::ASP (deprecated)</th>
-  </tr>
-  <tr>
-
-    <td valign="top"><ul>
-      <li>Configure Apache:
+<li>Configure Apache:
 <font size="-1"><pre>
 PerlModule HTML::Mason
 # your freeside docuemnt root
@@ -145,33 +137,6 @@ require&nbsp;"/usr/local/etc/freeside/handler.pl";
 &lt;/Perl&gt;
 &lt;/Directory&gt;
 </pre></font>
-    </ul></td>
-
-    <td valign="top"><ul>
-      <li>Configure Apache:
-<font size="-1"><pre>
-PerlModule Apache::ASP
-# your freeside document root
-&lt;Directory&nbsp;/var/www/freeside&gt;
-&lt;Files ~ (\.cgi|\.html)&gt;
-AddHandler perl-script .cgi .html
-PerlHandler Apache::ASP
-&lt;/Files&gt;
-&lt;Perl&gt;
-$MLDBM::RemoveTaint = 1;
-&lt;/Perl&gt;
-PerlSetVar&nbsp;Global&nbsp;/usr/local/etc/freeside/asp-global/
-PerlSetVar&nbsp;Debug&nbsp;2
-PerlSetVar&nbsp;RequestBinaryRead&nbsp;Off
-# your freeside document root
-PerlSetVar&nbsp;IncludesDir&nbsp;/var/www/freeside
-&lt;/Directory&gt;
-</pre></font>
-    </ul></td>
-
-  </tr>
-</table>
-<ul>
 <li>Restrict access to this web interface - see the <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache documentation on user authentication</a>.    For example, to configure user authentication with <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files), add something like the following to your Apache httpd.conf file, adjusting for your actual paths:
 <pre>
 #your freeside document root
-- 
cgit v1.2.1


From fadaa67e77ad8d5d966e252aba7f193e9e3840e3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 18 Feb 2006 11:14:21 +0000
Subject: CDR schema and class

---
 FS/FS/Schema.pm                         | 1004 +++++++++++++++++--------------
 FS/FS/cdr.pm                            |  385 ++++++++++++
 FS/FS/cdr_calltype.pm                   |  115 ++++
 FS/FS/cdr_carrier.pm                    |  116 ++++
 FS/FS/cdr_type.pm                       |  119 ++++
 FS/FS/cust_main.pm                      |    5 +-
 FS/FS/part_pkg/voip_sqlradacct.pm       |    1 +
 FS/MANIFEST                             |   11 +-
 FS/t/cdr.t                              |    5 +
 FS/t/cdr_calltype.t                     |    5 +
 FS/t/cdr_carrier.t                      |    5 +
 FS/t/cdr_type.t                         |    5 +
 FS/t/part_pkg-voip_cdr.t                |    5 +
 README.1.7.0                            |   19 +
 README.2.0.0                            |   17 -
 bin/cdr_calltype.import                 |   41 ++
 htetc/handler.pl                        |    9 +-
 httemplate/misc/cdr-import.html         |   15 +
 httemplate/misc/process/cdr-import.html |   26 +
 httemplate/search/cdr.html              |   20 +
 httemplate/search/report_cdr.html       |    7 +
 21 files changed, 1469 insertions(+), 466 deletions(-)
 create mode 100644 FS/FS/cdr.pm
 create mode 100644 FS/FS/cdr_calltype.pm
 create mode 100644 FS/FS/cdr_carrier.pm
 create mode 100644 FS/FS/cdr_type.pm
 create mode 100644 FS/t/cdr.t
 create mode 100644 FS/t/cdr_calltype.t
 create mode 100644 FS/t/cdr_carrier.t
 create mode 100644 FS/t/cdr_type.t
 create mode 100644 FS/t/part_pkg-voip_cdr.t
 create mode 100644 README.1.7.0
 delete mode 100644 README.2.0.0
 create mode 100755 bin/cdr_calltype.import
 create mode 100644 httemplate/misc/cdr-import.html
 create mode 100644 httemplate/misc/process/cdr-import.html
 create mode 100644 httemplate/search/cdr.html
 create mode 100644 httemplate/search/report_cdr.html

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 33d0fd6d8..3ca599b49 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -3,9 +3,9 @@ package FS::Schema;
 use vars qw(@ISA @EXPORT_OK $DEBUG $setup_hack %dbdef_cache);
 use subs qw(reload_dbdef);
 use Exporter;
-use DBIx::DBSchema 0.25;
+use DBIx::DBSchema 0.30;
 use DBIx::DBSchema::Table;
-use DBIx::DBSchema::Column;
+use DBIx::DBSchema::Column 0.06;
 use DBIx::DBSchema::ColGroup::Unique;
 use DBIx::DBSchema::ColGroup::Index;
 use FS::UID qw(datasrc);
@@ -92,9 +92,18 @@ sub dbdef_dist {
   my $dbdef = new DBIx::DBSchema map {  
     my @columns;
     while (@{$tables_hashref->{$_}{'columns'}}) {
-      my($name, $type, $null, $length) =
-        splice @{$tables_hashref->{$_}{'columns'}}, 0, 4;
-      push @columns, new DBIx::DBSchema::Column ( $name,$type,$null,$length );
+      #my($name, $type, $null, $length, $default, $local) =
+      my @coldef = 
+        splice @{$tables_hashref->{$_}{'columns'}}, 0, 6;
+      my %hash = map { $_ => shift @coldef }
+                     qw( name type null length default local );
+
+      unless ( defined $hash{'default'} ) {
+        warn "$_:\n".
+             join('', map "$_ => $hash{$_}\n", keys %hash) ;# $stop = <STDIN>;
+      }
+
+      push @columns, new DBIx::DBSchema::Column ( \%hash );
     }
     DBIx::DBSchema::Table->new(
       $_,
@@ -239,15 +248,15 @@ sub tables_hashref {
 
     'agent' => {
       'columns' => [
-        'agentnum', 'serial',            '',     '',
-        'agent',    'varchar',           '',     $char_d,
-        'typenum',  'int',            '',     '',
-        'freq',     'int',       'NULL', '',
-        'prog',     @perl_type,
-        'disabled',     'char', 'NULL', 1,
-        'username', 'varchar',       'NULL',     $char_d,
-        '_password','varchar',       'NULL',     $char_d,
-        'ticketing_queueid', 'int', 'NULL', '',
+        'agentnum', 'serial',            '',     '', '', '', 
+        'agent',    'varchar',           '',     $char_d, '', '', 
+        'typenum',  'int',            '',     '', '', '', 
+        'freq',     'int',       'NULL', '', '', '', 
+        'prog',     @perl_type, '', '', 
+        'disabled',     'char', 'NULL', 1, '', '', 
+        'username', 'varchar',       'NULL',     $char_d, '', '', 
+        '_password','varchar',       'NULL',     $char_d, '', '', 
+        'ticketing_queueid', 'int', 'NULL', '', '', '', 
       ],
       'primary_key' => 'agentnum',
       'unique' => [],
@@ -256,8 +265,8 @@ sub tables_hashref {
 
     'agent_type' => {
       'columns' => [
-        'typenum',   'serial',  '', '',
-        'atype',     'varchar', '', $char_d,
+        'typenum',   'serial',  '', '', '', '', 
+        'atype',     'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'typenum',
       'unique' => [],
@@ -266,9 +275,9 @@ sub tables_hashref {
 
     'type_pkgs' => {
       'columns' => [
-        'typepkgnum', 'serial', '', '',
-        'typenum',   'int',  '', '',
-        'pkgpart',   'int',  '', '',
+        'typepkgnum', 'serial', '', '', '', '', 
+        'typenum',   'int',  '', '', '', '', 
+        'pkgpart',   'int',  '', '', '', '', 
       ],
       'primary_key' => 'typepkgnum',
       'unique' => [ ['typenum', 'pkgpart'] ],
@@ -277,12 +286,12 @@ sub tables_hashref {
 
     'cust_bill' => {
       'columns' => [
-        'invnum',    'serial',  '', '',
-        'custnum',   'int',  '', '',
-        '_date',     @date_type,
-        'charged',   @money_type,
-        'printed',   'int',  '', '',
-        'closed',    'char', 'NULL', 1,
+        'invnum',    'serial',  '', '', '', '', 
+        'custnum',   'int',  '', '', '', '', 
+        '_date',     @date_type, '', '', 
+        'charged',   @money_type, '', '', 
+        'printed',   'int',  '', '', '', '', 
+        'closed',    'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'invnum',
       'unique' => [],
@@ -291,12 +300,12 @@ sub tables_hashref {
 
     'cust_bill_event' => {
       'columns' => [
-        'eventnum',    'serial',  '', '',
-        'invnum',   'int',  '', '',
-        'eventpart',   'int',  '', '',
-        '_date',     @date_type,
-        'status', 'varchar', '', $char_d,
-        'statustext', 'text', 'NULL', '',
+        'eventnum',    'serial',  '', '', '', '', 
+        'invnum',   'int',  '', '', '', '', 
+        'eventpart',   'int',  '', '', '', '', 
+        '_date',     @date_type, '', '', 
+        'status', 'varchar', '', $char_d, '', '', 
+        'statustext', 'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'eventnum',
       #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
@@ -306,16 +315,16 @@ sub tables_hashref {
 
     'part_bill_event' => {
       'columns' => [
-        'eventpart',    'serial',  '', '',
-        'freq',        'varchar',       'NULL',     $char_d,
-        'payby',       'char',  '', 4,
-        'event',       'varchar',           '',     $char_d,
-        'eventcode',    @perl_type,
-        'seconds',     'int', 'NULL', '',
-        'weight',      'int', '', '',
-        'plan',       'varchar', 'NULL', $char_d,
-        'plandata',   'text', 'NULL', '',
-        'disabled',     'char', 'NULL', 1,
+        'eventpart',    'serial',  '', '', '', '', 
+        'freq',        'varchar',       'NULL',     $char_d, '', '', 
+        'payby',       'char',  '', 4, '', '', 
+        'event',       'varchar',           '',     $char_d, '', '', 
+        'eventcode',    @perl_type, '', '', 
+        'seconds',     'int', 'NULL', '', '', '', 
+        'weight',      'int', '', '', '', '', 
+        'plan',       'varchar', 'NULL', $char_d, '', '', 
+        'plandata',   'text', 'NULL', '', '', '', 
+        'disabled',     'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'eventpart',
       'unique' => [],
@@ -324,14 +333,14 @@ sub tables_hashref {
 
     'cust_bill_pkg' => {
       'columns' => [
-        'billpkgnum', 'serial', '', '',
-        'pkgnum',  'int', '', '',
-        'invnum',  'int', '', '',
-        'setup',   @money_type,
-        'recur',   @money_type,
-        'sdate',   @date_type,
-        'edate',   @date_type,
-        'itemdesc', 'varchar', 'NULL', $char_d,
+        'billpkgnum', 'serial', '', '', '', '', 
+        'pkgnum',  'int', '', '', '', '', 
+        'invnum',  'int', '', '', '', '', 
+        'setup',   @money_type, '', '', 
+        'recur',   @money_type, '', '', 
+        'sdate',   @date_type, '', '', 
+        'edate',   @date_type, '', '', 
+        'itemdesc', 'varchar', 'NULL', $char_d, '', '', 
       ],
       'primary_key' => 'billpkgnum',
       'unique' => [],
@@ -340,10 +349,10 @@ sub tables_hashref {
 
     'cust_bill_pkg_detail' => {
       'columns' => [
-        'detailnum', 'serial', '', '',
-        'pkgnum',  'int', '', '',
-        'invnum',  'int', '', '',
-        'detail',  'varchar', '', $char_d,
+        'detailnum', 'serial', '', '', '', '', 
+        'pkgnum',  'int', '', '', '', '', 
+        'invnum',  'int', '', '', '', '', 
+        'detail',  'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'detailnum',
       'unique' => [],
@@ -352,13 +361,13 @@ sub tables_hashref {
 
     'cust_credit' => {
       'columns' => [
-        'crednum',  'serial', '', '',
-        'custnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
-        'otaker',   'varchar', '', 32,
-        'reason',   'text', 'NULL', '',
-        'closed',    'char', 'NULL', 1,
+        'crednum',  'serial', '', '', '', '', 
+        'custnum',  'int', '', '', '', '', 
+        '_date',    @date_type, '', '', 
+        'amount',   @money_type, '', '', 
+        'otaker',   'varchar', '', 32, '', '', 
+        'reason',   'text', 'NULL', '', '', '', 
+        'closed',    'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'crednum',
       'unique' => [],
@@ -367,11 +376,11 @@ sub tables_hashref {
 
     'cust_credit_bill' => {
       'columns' => [
-        'creditbillnum', 'serial', '', '',
-        'crednum',  'int', '', '',
-        'invnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
+        'creditbillnum', 'serial', '', '', '', '', 
+        'crednum',  'int', '', '', '', '', 
+        'invnum',  'int', '', '', '', '', 
+        '_date',    @date_type, '', '', 
+        'amount',   @money_type, '', '', 
       ],
       'primary_key' => 'creditbillnum',
       'unique' => [],
@@ -380,54 +389,54 @@ sub tables_hashref {
 
     'cust_main' => {
       'columns' => [
-        'custnum',  'serial',  '',     '',
-        'agentnum', 'int',  '',     '',
-#        'titlenum', 'int',  'NULL',   '',
-        'last',     'varchar', '',     $char_d,
-#        'middle',   'varchar', 'NULL', $char_d,
-        'first',    'varchar', '',     $char_d,
-        'ss',       'varchar', 'NULL', 11,
-        'company',  'varchar', 'NULL', $char_d,
-        'address1', 'varchar', '',     $char_d,
-        'address2', 'varchar', 'NULL', $char_d,
-        'city',     'varchar', '',     $char_d,
-        'county',   'varchar', 'NULL', $char_d,
-        'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', 'NULL', 10,
-        'country',  'char', '',     2,
-        'daytime',  'varchar', 'NULL', 20,
-        'night',    'varchar', 'NULL', 20,
-        'fax',      'varchar', 'NULL', 12,
-        'ship_last',     'varchar', 'NULL', $char_d,
-#        'ship_middle',   'varchar', 'NULL', $char_d,
-        'ship_first',    'varchar', 'NULL', $char_d,
-        'ship_company',  'varchar', 'NULL', $char_d,
-        'ship_address1', 'varchar', 'NULL', $char_d,
-        'ship_address2', 'varchar', 'NULL', $char_d,
-        'ship_city',     'varchar', 'NULL', $char_d,
-        'ship_county',   'varchar', 'NULL', $char_d,
-        'ship_state',    'varchar', 'NULL', $char_d,
-        'ship_zip',      'varchar', 'NULL', 10,
-        'ship_country',  'char', 'NULL', 2,
-        'ship_daytime',  'varchar', 'NULL', 20,
-        'ship_night',    'varchar', 'NULL', 20,
-        'ship_fax',      'varchar', 'NULL', 12,
-        'payby',    'char', '',     4,
-        'payinfo',  'varchar', 'NULL', 512,
-        'paycvv',   'varchar', 'NULL', 512,
-	'paymask', 'varchar', 'NULL', $char_d,
-        #'paydate',  @date_type,
-        'paydate',  'varchar', 'NULL', 10,
-        'paystart_month', 'int', 'NULL', '',
-        'paystart_year',  'int', 'NULL', '',
-        'payissue', 'varchar', 'NULL', 2,
-        'payname',  'varchar', 'NULL', $char_d,
-        'payip',    'varchar', 'NULL', 15,
-        'tax',      'char', 'NULL', 1,
-        'otaker',   'varchar', '',    32,
-        'refnum',   'int',  '',     '',
-        'referral_custnum', 'int',  'NULL', '',
-        'comments', 'text', 'NULL', '',
+        'custnum',  'serial',  '',     '', '', '', 
+        'agentnum', 'int',  '',     '', '', '', 
+#        'titlenum', 'int',  'NULL',   '', '', '', 
+        'last',     'varchar', '',     $char_d, '', '', 
+#        'middle',   'varchar', 'NULL', $char_d, '', '', 
+        'first',    'varchar', '',     $char_d, '', '', 
+        'ss',       'varchar', 'NULL', 11, '', '', 
+        'company',  'varchar', 'NULL', $char_d, '', '', 
+        'address1', 'varchar', '',     $char_d, '', '', 
+        'address2', 'varchar', 'NULL', $char_d, '', '', 
+        'city',     'varchar', '',     $char_d, '', '', 
+        'county',   'varchar', 'NULL', $char_d, '', '', 
+        'state',    'varchar', 'NULL', $char_d, '', '', 
+        'zip',      'varchar', 'NULL', 10, '', '', 
+        'country',  'char', '',     2, '', '', 
+        'daytime',  'varchar', 'NULL', 20, '', '', 
+        'night',    'varchar', 'NULL', 20, '', '', 
+        'fax',      'varchar', 'NULL', 12, '', '', 
+        'ship_last',     'varchar', 'NULL', $char_d, '', '', 
+#        'ship_middle',   'varchar', 'NULL', $char_d, '', '', 
+        'ship_first',    'varchar', 'NULL', $char_d, '', '', 
+        'ship_company',  'varchar', 'NULL', $char_d, '', '', 
+        'ship_address1', 'varchar', 'NULL', $char_d, '', '', 
+        'ship_address2', 'varchar', 'NULL', $char_d, '', '', 
+        'ship_city',     'varchar', 'NULL', $char_d, '', '', 
+        'ship_county',   'varchar', 'NULL', $char_d, '', '', 
+        'ship_state',    'varchar', 'NULL', $char_d, '', '', 
+        'ship_zip',      'varchar', 'NULL', 10, '', '', 
+        'ship_country',  'char', 'NULL', 2, '', '', 
+        'ship_daytime',  'varchar', 'NULL', 20, '', '', 
+        'ship_night',    'varchar', 'NULL', 20, '', '', 
+        'ship_fax',      'varchar', 'NULL', 12, '', '', 
+        'payby',    'char', '',     4, '', '', 
+        'payinfo',  'varchar', 'NULL', 512, '', '', 
+        'paycvv',   'varchar', 'NULL', 512, '', '', 
+	'paymask', 'varchar', 'NULL', $char_d, '', '', 
+        #'paydate',  @date_type, '', '', 
+        'paydate',  'varchar', 'NULL', 10, '', '', 
+        'paystart_month', 'int', 'NULL', '', '', '', 
+        'paystart_year',  'int', 'NULL', '', '', '', 
+        'payissue', 'varchar', 'NULL', 2, '', '', 
+        'payname',  'varchar', 'NULL', $char_d, '', '', 
+        'payip',    'varchar', 'NULL', 15, '', '', 
+        'tax',      'char', 'NULL', 1, '', '', 
+        'otaker',   'varchar', '',    32, '', '', 
+        'refnum',   'int',  '',     '', '', '', 
+        'referral_custnum', 'int',  'NULL', '', '', '', 
+        'comments', 'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'custnum',
       'unique' => [],
@@ -440,9 +449,9 @@ sub tables_hashref {
 
     'cust_main_invoice' => {
       'columns' => [
-        'destnum',  'serial',  '',     '',
-        'custnum',  'int',  '',     '',
-        'dest',     'varchar', '',  $char_d,
+        'destnum',  'serial',  '',     '', '', '', 
+        'custnum',  'int',  '',     '', '', '', 
+        'dest',     'varchar', '',  $char_d, '', '', 
       ],
       'primary_key' => 'destnum',
       'unique' => [],
@@ -453,16 +462,16 @@ sub tables_hashref {
                             #cust_main_county for validation and to provide
                             # a tax rate.
       'columns' => [
-        'taxnum',   'serial',   '',    '',
-        'state',    'varchar',  'NULL',    $char_d,
-        'county',   'varchar',  'NULL',    $char_d,
-        'country',  'char',  '', 2, 
-        'taxclass',   'varchar', 'NULL', $char_d,
-        'exempt_amount', @money_type,
-        'tax',      'real',  '',    '', #tax %
-        'taxname',  'varchar',  'NULL',    $char_d,
-        'setuptax',  'char', 'NULL', 1, # Y = setup tax exempt
-        'recurtax',  'char', 'NULL', 1, # Y = recur tax exempt
+        'taxnum',   'serial',   '',    '', '', '', 
+        'state',    'varchar',  'NULL',    $char_d, '', '', 
+        'county',   'varchar',  'NULL',    $char_d, '', '', 
+        'country',  'char',  '', 2, '', '', 
+        'taxclass',   'varchar', 'NULL', $char_d, '', '', 
+        'exempt_amount', @money_type, '', '', 
+        'tax',      'real',  '',    '', '', '', #tax %
+        'taxname',  'varchar',  'NULL',    $char_d, '', '', 
+        'setuptax',  'char', 'NULL', 1, '', '', # Y = setup tax exempt
+        'recurtax',  'char', 'NULL', 1, '', '', # Y = recur tax exempt
       ],
       'primary_key' => 'taxnum',
       'unique' => [],
@@ -472,16 +481,17 @@ sub tables_hashref {
 
     'cust_pay' => {
       'columns' => [
-        'paynum',   'serial',    '',   '',
-        #now cust_bill_pay #'invnum',   'int',    '',   '',
-        'custnum',  'int',    '',   '',
-        'paid',     @money_type,
-        '_date',    @date_type,
-        'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
-                                         # payment type table.
-        'payinfo',  'varchar',   'NULL', $char_d,  #see cust_main above
-        'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
-        'closed',    'char', 'NULL', 1,
+        'paynum',   'serial',    '',   '', '', '',
+        #now cust_bill_pay #'invnum',   'int',    '',   '', '', '', 
+        'custnum',  'int',    '',   '', '', '', 
+        'paid',     @money_type, '', '', 
+        '_date',    @date_type, '', '', 
+        'payby',    'char',   '',     4, '', '', # CARD/BILL/COMP, should be
+                                                 # index into payby table
+                                                 # eventually
+        'payinfo',  'varchar',   'NULL', $char_d, '', '', #see cust_main above
+        'paybatch', 'varchar',   'NULL', $char_d, '', '', #for auditing purposes.
+        'closed',    'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'paynum',
       'unique' => [],
@@ -490,18 +500,19 @@ sub tables_hashref {
 
     'cust_pay_void' => {
       'columns' => [
-        'paynum',    'int',    '',   '',
-        'custnum',   'int',    '',   '',
-        'paid',      @money_type,
-        '_date',     @date_type,
-        'payby',     'char',   '',     4, # CARD/BILL/COMP, should be index into
-                                          # payment type table.
-        'payinfo',   'varchar',   'NULL', $char_d,  #see cust_main above
-        'paybatch',  'varchar',   'NULL', $char_d, #for auditing purposes.
-        'closed',    'char', 'NULL', 1,
-        'void_date', @date_type,
-        'reason',    'varchar',   'NULL', $char_d,
-        'otaker',   'varchar', '', 32,
+        'paynum',    'int',    '',   '', '', '', 
+        'custnum',   'int',    '',   '', '', '', 
+        'paid',      @money_type, '', '', 
+        '_date',     @date_type, '', '', 
+        'payby',     'char',   '',     4, '', '', # CARD/BILL/COMP, should be
+                                                  # index into payby table
+                                                  # eventually
+        'payinfo',   'varchar',   'NULL', $char_d, '', '', #see cust_main above
+        'paybatch',  'varchar',   'NULL', $char_d, '', '', #for auditing purposes.
+        'closed',    'char', 'NULL', 1, '', '', 
+        'void_date', @date_type, '', '', 
+        'reason',    'varchar',   'NULL', $char_d, '', '', 
+        'otaker',   'varchar', '', 32, '', '', 
       ],
       'primary_key' => 'paynum',
       'unique' => [],
@@ -510,11 +521,11 @@ sub tables_hashref {
 
     'cust_bill_pay' => {
       'columns' => [
-        'billpaynum', 'serial',     '',   '',
-        'invnum',  'int',     '',   '',
-        'paynum',  'int',     '',   '',
-        'amount',  @money_type,
-        '_date',   @date_type
+        'billpaynum', 'serial',     '',   '', '', '', 
+        'invnum',  'int',     '',   '', '', '', 
+        'paynum',  'int',     '',   '', '', '', 
+        'amount',  @money_type, '', '', 
+        '_date',   @date_type, '', '', 
       ],
       'primary_key' => 'billpaynum',
       'unique' => [],
@@ -524,23 +535,23 @@ sub tables_hashref {
     'cust_pay_batch' => { #what's this used for again?  list of customers
                           #in current CARD batch? (necessarily CARD?)
       'columns' => [
-        'paybatchnum',   'serial',    '',   '',
-        'invnum',   'int',    '',   '',
-        'custnum',   'int',    '',   '',
-        'last',     'varchar', '',     $char_d,
-        'first',    'varchar', '',     $char_d,
-        'address1', 'varchar', '',     $char_d,
-        'address2', 'varchar', 'NULL', $char_d,
-        'city',     'varchar', '',     $char_d,
-        'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', 'NULL', 10,
-        'country',  'char', '',     2,
-#        'trancode', 'int', '', '',
-        'cardnum',  'varchar', '',     16,
-        #'exp',      @date_type,
-        'exp',      'varchar', '',     11,
-        'payname',  'varchar', 'NULL', $char_d,
-        'amount',   @money_type,
+        'paybatchnum',   'serial',    '',   '', '', '', 
+        'invnum',   'int',    '',   '', '', '', 
+        'custnum',   'int',    '',   '', '', '', 
+        'last',     'varchar', '',     $char_d, '', '', 
+        'first',    'varchar', '',     $char_d, '', '', 
+        'address1', 'varchar', '',     $char_d, '', '', 
+        'address2', 'varchar', 'NULL', $char_d, '', '', 
+        'city',     'varchar', '',     $char_d, '', '', 
+        'state',    'varchar', 'NULL', $char_d, '', '', 
+        'zip',      'varchar', 'NULL', 10, '', '', 
+        'country',  'char', '',     2, '', '', 
+        #        'trancode', 'int', '', '', '', ''
+        'cardnum',  'varchar', '',     16, '', '', 
+        #'exp',      @date_type, '', ''
+        'exp',      'varchar', '',     11, '', '', 
+        'payname',  'varchar', 'NULL', $char_d, '', '', 
+        'amount',   @money_type, '', '', 
       ],
       'primary_key' => 'paybatchnum',
       'unique' => [],
@@ -549,17 +560,17 @@ sub tables_hashref {
 
     'cust_pkg' => {
       'columns' => [
-        'pkgnum',    'serial',    '',   '',
-        'custnum',   'int',    '',   '',
-        'pkgpart',   'int',    '',   '',
-        'otaker',    'varchar', '', 32,
-        'setup',     @date_type,
-        'bill',      @date_type,
-        'last_bill', @date_type,
-        'susp',      @date_type,
-        'cancel',    @date_type,
-        'expire',    @date_type,
-        'manual_flag', 'char', 'NULL', 1,
+        'pkgnum',    'serial',    '',   '', '', '', 
+        'custnum',   'int',    '',   '', '', '', 
+        'pkgpart',   'int',    '',   '', '', '', 
+        'otaker',    'varchar', '', 32, '', '', 
+        'setup',     @date_type, '', '', 
+        'bill',      @date_type, '', '', 
+        'last_bill', @date_type, '', '', 
+        'susp',      @date_type, '', '', 
+        'cancel',    @date_type, '', '', 
+        'expire',    @date_type, '', '', 
+        'manual_flag', 'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'pkgnum',
       'unique' => [],
@@ -568,18 +579,19 @@ sub tables_hashref {
 
     'cust_refund' => {
       'columns' => [
-        'refundnum',    'serial',    '',   '',
-        #now cust_credit_refund #'crednum',      'int',    '',   '',
-        'custnum',  'int',    '',   '',
-        '_date',        @date_type,
-        'refund',       @money_type,
-        'otaker',       'varchar',   '',   32,
-        'reason',       'varchar',   '',   $char_d,
-        'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
-                                             # into payment type table.
-        'payinfo',      'varchar',   'NULL', $char_d,  #see cust_main above
-        'paybatch',     'varchar',   'NULL', $char_d,
-        'closed',    'char', 'NULL', 1,
+        'refundnum',    'serial',    '',   '', '', '', 
+        #now cust_credit_refund #'crednum',      'int',    '',   '', '', '',
+        'custnum',  'int',    '',   '', '', '', 
+        '_date',        @date_type, '', '', 
+        'refund',       @money_type, '', '', 
+        'otaker',       'varchar',   '',   32, '', '', 
+        'reason',       'varchar',   '',   $char_d, '', '', 
+        'payby',        'char',   '',     4, '', '', # CARD/BILL/COMP, should
+                                                     # be index into payby
+                                                     # table eventually
+        'payinfo',      'varchar',   'NULL', $char_d, '', '', #see cust_main above
+        'paybatch',     'varchar',   'NULL', $char_d, '', '', 
+        'closed',    'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'refundnum',
       'unique' => [],
@@ -588,11 +600,11 @@ sub tables_hashref {
 
     'cust_credit_refund' => {
       'columns' => [
-        'creditrefundnum', 'serial',     '',   '',
-        'crednum',  'int',     '',   '',
-        'refundnum',  'int',     '',   '',
-        'amount',  @money_type,
-        '_date',   @date_type
+        'creditrefundnum', 'serial',     '',   '', '', '', 
+        'crednum',  'int',     '',   '', '', '', 
+        'refundnum',  'int',     '',   '', '', '', 
+        'amount',  @money_type, '', '', 
+        '_date',   @date_type, '', '', 
       ],
       'primary_key' => 'creditrefundnum',
       'unique' => [],
@@ -602,9 +614,9 @@ sub tables_hashref {
 
     'cust_svc' => {
       'columns' => [
-        'svcnum',    'serial',    '',   '',
-        'pkgnum',    'int',    'NULL',   '',
-        'svcpart',   'int',    '',   '',
+        'svcnum',    'serial',    '',   '', '', '', 
+        'pkgnum',    'int',    'NULL',   '', '', '', 
+        'svcpart',   'int',    '',   '', '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique' => [],
@@ -613,20 +625,20 @@ sub tables_hashref {
 
     'part_pkg' => {
       'columns' => [
-        'pkgpart',    'serial',    '',   '',
-        'pkg',        'varchar',   '',   $char_d,
-        'comment',    'varchar',   '',   $char_d,
-        'promo_code', 'varchar', 'NULL', $char_d,
-        'setup',      @perl_type,
-        'freq',       'varchar',   '',   $char_d,  #billing frequency
-        'recur',      @perl_type,
-        'setuptax',  'char', 'NULL', 1,
-        'recurtax',  'char', 'NULL', 1,
-        'plan',       'varchar', 'NULL', $char_d,
-        'plandata',   'text', 'NULL', '',
-        'disabled',   'char', 'NULL', 1,
-        'taxclass',   'varchar', 'NULL', $char_d,
-        'classnum',   'int',     'NULL', '',
+        'pkgpart',    'serial',    '',   '', '', '', 
+        'pkg',        'varchar',   '',   $char_d, '', '', 
+        'comment',    'varchar',   '',   $char_d, '', '', 
+        'promo_code', 'varchar', 'NULL', $char_d, '', '', 
+        'setup',      @perl_type, '', '', 
+        'freq',       'varchar',   '',   $char_d, '', '', #billing frequency
+        'recur',      @perl_type, '', '', 
+        'setuptax',  'char', 'NULL', 1, '', '', 
+        'recurtax',  'char', 'NULL', 1, '', '', 
+        'plan',       'varchar', 'NULL', $char_d, '', '', 
+        'plandata',   'text', 'NULL', '', '', '', 
+        'disabled',   'char', 'NULL', 1, '', '', 
+        'taxclass',   'varchar', 'NULL', $char_d, '', '', 
+        'classnum',   'int',     'NULL', '', '', '', 
       ],
       'primary_key' => 'pkgpart',
       'unique' => [],
@@ -645,11 +657,11 @@ sub tables_hashref {
 
     'pkg_svc' => {
       'columns' => [
-        'pkgsvcnum',  'serial', '',  '',
-        'pkgpart',    'int',    '',   '',
-        'svcpart',    'int',    '',   '',
-        'quantity',   'int',    '',   '',
-        'primary_svc','char', 'NULL',  1,
+        'pkgsvcnum',  'serial', '',  '', '', '', 
+        'pkgpart',    'int',    '',   '', '', '', 
+        'svcpart',    'int',    '',   '', '', '', 
+        'quantity',   'int',    '',   '', '', '', 
+        'primary_svc','char', 'NULL',  1, '', '', 
       ],
       'primary_key' => 'pkgsvcnum',
       'unique' => [ ['pkgpart', 'svcpart'] ],
@@ -658,9 +670,9 @@ sub tables_hashref {
 
     'part_referral' => {
       'columns' => [
-        'refnum',   'serial',    '',   '',
-        'referral', 'varchar',   '',   $char_d,
-        'disabled',     'char', 'NULL', 1,
+        'refnum',   'serial',    '',   '', '', '', 
+        'referral', 'varchar',   '',   $char_d, '', '', 
+        'disabled',     'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'refnum',
       'unique' => [],
@@ -669,10 +681,10 @@ sub tables_hashref {
 
     'part_svc' => {
       'columns' => [
-        'svcpart',    'serial',    '',   '',
-        'svc',        'varchar',   '',   $char_d,
-        'svcdb',      'varchar',   '',   $char_d,
-        'disabled',   'char',  'NULL',   1,
+        'svcpart',    'serial',    '',   '', '', '', 
+        'svc',        'varchar',   '',   $char_d, '', '', 
+        'svcdb',      'varchar',   '',   $char_d, '', '', 
+        'disabled',   'char',  'NULL',   1, '', '', 
       ],
       'primary_key' => 'svcpart',
       'unique' => [],
@@ -681,11 +693,11 @@ sub tables_hashref {
 
     'part_svc_column' => {
       'columns' => [
-        'columnnum',   'serial',         '', '',
-        'svcpart',     'int',         '', '',
-        'columnname',  'varchar',     '', 64,
-        'columnvalue', 'varchar', 'NULL', $char_d,
-        'columnflag',  'char',    'NULL', 1, 
+        'columnnum',   'serial',         '', '', '', '', 
+        'svcpart',     'int',         '', '', '', '', 
+        'columnname',  'varchar',     '', 64, '', '', 
+        'columnvalue', 'varchar', 'NULL', $char_d, '', '', 
+        'columnflag',  'char',    'NULL', 1, '', '', 
       ],
       'primary_key' => 'columnnum',
       'unique' => [ [ 'svcpart', 'columnname' ] ],
@@ -695,12 +707,12 @@ sub tables_hashref {
     #(this should be renamed to part_pop)
     'svc_acct_pop' => {
       'columns' => [
-        'popnum',    'serial',    '',   '',
-        'city',      'varchar',   '',   $char_d,
-        'state',     'varchar',   '',   $char_d,
-        'ac',        'char',   '',   3,
-        'exch',      'char',   '',   3,
-        'loc',       'char',   'NULL',   4, #NULL for legacy purposes
+        'popnum',    'serial',    '',   '', '', '', 
+        'city',      'varchar',   '',   $char_d, '', '', 
+        'state',     'varchar',   '',   $char_d, '', '', 
+        'ac',        'char',   '',   3, '', '', 
+        'exch',      'char',   '',   3, '', '', 
+        'loc',       'char',   'NULL',   4, '', '', #NULL for legacy purposes
       ],
       'primary_key' => 'popnum',
       'unique' => [],
@@ -709,12 +721,12 @@ sub tables_hashref {
 
     'part_pop_local' => {
       'columns' => [
-        'localnum',  'serial',     '',     '',
-        'popnum',    'int',     '',     '',
-        'city',      'varchar', 'NULL', $char_d,
-        'state',     'char',    'NULL', 2,
-        'npa',       'char',    '',     3,
-        'nxx',       'char',    '',     3,
+        'localnum',  'serial',     '',     '', '', '', 
+        'popnum',    'int',     '',     '', '', '', 
+        'city',      'varchar', 'NULL', $char_d, '', '', 
+        'state',     'char',    'NULL', 2, '', '', 
+        'npa',       'char',    '',     3, '', '', 
+        'nxx',       'char',    '',     3, '', '', 
       ],
       'primary_key' => 'localnum',
       'unique' => [],
@@ -723,20 +735,20 @@ sub tables_hashref {
 
     'svc_acct' => {
       'columns' => [
-        'svcnum',    'int',    '',   '',
-        'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
-        '_password', 'varchar',   '',   72, #13 for encryped pw's plus ' *SUSPENDED* (md5 passwords can be 34, blowfish 60)
-        'sec_phrase', 'varchar',  'NULL',   $char_d,
-        'popnum',    'int',    'NULL',   '',
-        'uid',       'int', 'NULL',   '',
-        'gid',       'int', 'NULL',   '',
-        'finger',    'varchar',   'NULL',   $char_d,
-        'dir',       'varchar',   'NULL',   $char_d,
-        'shell',     'varchar',   'NULL',   $char_d,
-        'quota',     'varchar',   'NULL',   $char_d,
-        'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
-        'seconds',   'int', 'NULL',   '', #uhhhh
-        'domsvc',    'int', '',   '',
+        'svcnum',    'int',    '',   '', '', '', 
+        'username',  'varchar',   '',   $username_len, '', '', #unique (& remove dup code)
+        '_password', 'varchar',   '',   72, '', '', #13 for encryped pw's plus ' *SUSPENDED* (md5 passwords can be 34, blowfish 60)
+        'sec_phrase', 'varchar',  'NULL',   $char_d, '', '', 
+        'popnum',    'int',    'NULL',   '', '', '', 
+        'uid',       'int', 'NULL',   '', '', '', 
+        'gid',       'int', 'NULL',   '', '', '', 
+        'finger',    'varchar',   'NULL',   $char_d, '', '', 
+        'dir',       'varchar',   'NULL',   $char_d, '', '', 
+        'shell',     'varchar',   'NULL',   $char_d, '', '', 
+        'quota',     'varchar',   'NULL',   $char_d, '', '', 
+        'slipip',    'varchar',   'NULL',   15, '', '', #four TINYINTs, bah.
+        'seconds',   'int', 'NULL',   '', '', '', #uhhhh
+        'domsvc',    'int', '',   '', '', '', 
       ],
       'primary_key' => 'svcnum',
       #'unique' => [ [ 'username', 'domsvc' ] ],
@@ -756,9 +768,9 @@ sub tables_hashref {
 
     'svc_domain' => {
       'columns' => [
-        'svcnum',    'int',    '',   '',
-        'domain',    'varchar',    '',   $char_d,
-        'catchall',  'int', 'NULL',    '',
+        'svcnum',    'int',    '',   '', '', '', 
+        'domain',    'varchar',    '',   $char_d, '', '', 
+        'catchall',  'int', 'NULL',    '', '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ['domain'] ],
@@ -767,14 +779,12 @@ sub tables_hashref {
 
     'domain_record' => {
       'columns' => [
-        'recnum',    'serial',     '',  '',
-        'svcnum',    'int',     '',  '',
-        #'reczone',   'varchar', '',  $char_d,
-        'reczone',   'varchar', '',  255,
-        'recaf',     'char',    '',  2,
-        'rectype',   'varchar',    '',  5,
-        #'recdata',   'varchar', '',  $char_d,
-        'recdata',   'varchar', '',  255,
+        'recnum',    'serial',     '',  '', '', '', 
+        'svcnum',    'int',     '',  '', '', '', 
+        'reczone',   'varchar', '',  255, '', '', 
+        'recaf',     'char',    '',  2, '', '', 
+        'rectype',   'varchar',    '',  5, '', '', 
+        'recdata',   'varchar', '',  255, '', '', 
       ],
       'primary_key' => 'recnum',
       'unique'      => [],
@@ -783,11 +793,11 @@ sub tables_hashref {
 
     'svc_forward' => {
       'columns' => [
-        'svcnum',   'int',            '',   '',
-        'srcsvc',   'int',        'NULL',   '',
-        'src',      'varchar',    'NULL',  255,
-        'dstsvc',   'int',        'NULL',   '',
-        'dst',      'varchar',    'NULL',  255,
+        'svcnum',   'int',            '',   '', '', '', 
+        'srcsvc',   'int',        'NULL',   '', '', '', 
+        'src',      'varchar',    'NULL',  255, '', '', 
+        'dstsvc',   'int',        'NULL',   '', '', '', 
+        'dst',      'varchar',    'NULL',  255, '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
@@ -796,9 +806,9 @@ sub tables_hashref {
 
     'svc_www' => {
       'columns' => [
-        'svcnum',   'int',    '',  '',
-        'recnum',   'int',    '',  '',
-        'usersvc',  'int',    '',  '',
+        'svcnum',   'int',    '',  '', '', '', 
+        'recnum',   'int',    '',  '', '', '', 
+        'usersvc',  'int',    '',  '', '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
@@ -820,11 +830,11 @@ sub tables_hashref {
 
     'prepay_credit' => {
       'columns' => [
-        'prepaynum',   'serial',     '',   '',
-        'identifier',  'varchar', '', $char_d,
-        'amount',      @money_type,
-        'seconds',     'int',     'NULL', '',
-        'agentnum',    'int',     'NULL', '',
+        'prepaynum',   'serial',     '',   '', '', '', 
+        'identifier',  'varchar', '', $char_d, '', '', 
+        'amount',      @money_type, '', '', 
+        'seconds',     'int',     'NULL', '', '', '', 
+        'agentnum',    'int',     'NULL', '', '', '', 
       ],
       'primary_key' => 'prepaynum',
       'unique'      => [ ['identifier'] ],
@@ -833,10 +843,10 @@ sub tables_hashref {
 
     'port' => {
       'columns' => [
-        'portnum',  'serial',     '',   '',
-        'ip',       'varchar', 'NULL', 15,
-        'nasport',  'int',     'NULL', '',
-        'nasnum',   'int',     '',   '',
+        'portnum',  'serial',     '',   '', '', '', 
+        'ip',       'varchar', 'NULL', 15, '', '', 
+        'nasport',  'int',     'NULL', '', '', '', 
+        'nasnum',   'int',     '',   '', '', '', 
       ],
       'primary_key' => 'portnum',
       'unique'      => [],
@@ -845,11 +855,11 @@ sub tables_hashref {
 
     'nas' => {
       'columns' => [
-        'nasnum',   'serial',     '',    '',
-        'nas',      'varchar', '',    $char_d,
-        'nasip',    'varchar', '',    15,
-        'nasfqdn',  'varchar', '',    $char_d,
-        'last',     'int',     '',    '',
+        'nasnum',   'serial',     '',    '', '', '', 
+        'nas',      'varchar', '',    $char_d, '', '', 
+        'nasip',    'varchar', '',    15, '', '', 
+        'nasfqdn',  'varchar', '',    $char_d, '', '', 
+        'last',     'int',     '',    '', '', '', 
       ],
       'primary_key' => 'nasnum',
       'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
@@ -858,11 +868,11 @@ sub tables_hashref {
 
     'session' => {
       'columns' => [
-        'sessionnum', 'serial',       '',   '',
-        'portnum',    'int',       '',   '',
-        'svcnum',     'int',       '',   '',
-        'login',      @date_type,
-        'logout',     @date_type,
+        'sessionnum', 'serial',       '',   '', '', '', 
+        'portnum',    'int',       '',   '', '', '', 
+        'svcnum',     'int',       '',   '', '', '', 
+        'login',      @date_type, '', '', 
+        'logout',     @date_type, '', '', 
       ],
       'primary_key' => 'sessionnum',
       'unique'      => [],
@@ -871,12 +881,12 @@ sub tables_hashref {
 
     'queue' => {
       'columns' => [
-        'jobnum', 'serial', '', '',
-        'job', 'text', '', '',
-        '_date', 'int', '', '',
-        'status', 'varchar', '', $char_d,
-        'statustext', 'text', 'NULL', '',
-        'svcnum', 'int', 'NULL', '',
+        'jobnum', 'serial', '', '', '', '', 
+        'job', 'text', '', '', '', '', 
+        '_date', 'int', '', '', '', '', 
+        'status', 'varchar', '', $char_d, '', '', 
+        'statustext', 'text', 'NULL', '', '', '', 
+        'svcnum', 'int', 'NULL', '', '', '', 
       ],
       'primary_key' => 'jobnum',
       'unique'      => [],
@@ -885,9 +895,9 @@ sub tables_hashref {
 
     'queue_arg' => {
       'columns' => [
-        'argnum', 'serial', '', '',
-        'jobnum', 'int', '', '',
-        'arg', 'text', 'NULL', '',
+        'argnum', 'serial', '', '', '', '', 
+        'jobnum', 'int', '', '', '', '', 
+        'arg', 'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'argnum',
       'unique'      => [],
@@ -896,9 +906,9 @@ sub tables_hashref {
 
     'queue_depend' => {
       'columns' => [
-        'dependnum', 'serial', '', '',
-        'jobnum', 'int', '', '',
-        'depend_jobnum', 'int', '', '',
+        'dependnum', 'serial', '', '', '', '', 
+        'jobnum', 'int', '', '', '', '', 
+        'depend_jobnum', 'int', '', '', '', '', 
       ],
       'primary_key' => 'dependnum',
       'unique'      => [],
@@ -907,9 +917,9 @@ sub tables_hashref {
 
     'export_svc' => {
       'columns' => [
-        'exportsvcnum' => 'serial', '', '',
-        'exportnum'    => 'int', '', '',
-        'svcpart'      => 'int', '', '',
+        'exportsvcnum' => 'serial', '', '', '', '', 
+        'exportnum'    => 'int', '', '', '', '', 
+        'svcpart'      => 'int', '', '', '', '', 
       ],
       'primary_key' => 'exportsvcnum',
       'unique'      => [ [ 'exportnum', 'svcpart' ] ],
@@ -918,11 +928,10 @@ sub tables_hashref {
 
     'part_export' => {
       'columns' => [
-        'exportnum', 'serial', '', '',
-        #'svcpart',   'int', '', '',
-        'machine', 'varchar', '', $char_d,
-        'exporttype', 'varchar', '', $char_d,
-        'nodomain',     'char', 'NULL', 1,
+        'exportnum', 'serial', '', '', '', '', 
+        'machine', 'varchar', '', $char_d, '', '', 
+        'exporttype', 'varchar', '', $char_d, '', '', 
+        'nodomain',     'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'exportnum',
       'unique'      => [],
@@ -931,10 +940,10 @@ sub tables_hashref {
 
     'part_export_option' => {
       'columns' => [
-        'optionnum', 'serial', '', '',
-        'exportnum', 'int', '', '',
-        'optionname', 'varchar', '', $char_d,
-        'optionvalue', 'text', 'NULL', '',
+        'optionnum', 'serial', '', '', '', '', 
+        'exportnum', 'int', '', '', '', '', 
+        'optionname', 'varchar', '', $char_d, '', '', 
+        'optionvalue', 'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'optionnum',
       'unique'      => [],
@@ -943,9 +952,9 @@ sub tables_hashref {
 
     'radius_usergroup' => {
       'columns' => [
-        'usergroupnum', 'serial', '', '',
-        'svcnum',       'int', '', '',
-        'groupname',    'varchar', '', $char_d,
+        'usergroupnum', 'serial', '', '', '', '', 
+        'svcnum',       'int', '', '', '', '', 
+        'groupname',    'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'usergroupnum',
       'unique'      => [],
@@ -954,10 +963,10 @@ sub tables_hashref {
 
     'msgcat' => {
       'columns' => [
-        'msgnum', 'serial', '', '',
-        'msgcode', 'varchar', '', $char_d,
-        'locale', 'varchar', '', 16,
-        'msg', 'text', '', '',
+        'msgnum', 'serial', '', '', '', '', 
+        'msgcode', 'varchar', '', $char_d, '', '', 
+        'locale', 'varchar', '', 16, '', '', 
+        'msg', 'text', '', '', '', '', 
       ],
       'primary_key' => 'msgnum',
       'unique'      => [ [ 'msgcode', 'locale' ] ],
@@ -966,12 +975,12 @@ sub tables_hashref {
 
     'cust_tax_exempt' => {
       'columns' => [
-        'exemptnum', 'serial', '', '',
-        'custnum',   'int', '', '',
-        'taxnum',    'int', '', '',
-        'year',      'int', '', '',
-        'month',     'int', '', '',
-        'amount',   @money_type,
+        'exemptnum', 'serial', '', '', '', '', 
+        'custnum',   'int', '', '', '', '', 
+        'taxnum',    'int', '', '', '', '', 
+        'year',      'int', '', '', '', '', 
+        'month',     'int', '', '', '', '', 
+        'amount',   @money_type, '', '', 
       ],
       'primary_key' => 'exemptnum',
       'unique'      => [ [ 'custnum', 'taxnum', 'year', 'month' ] ],
@@ -980,13 +989,13 @@ sub tables_hashref {
 
     'cust_tax_exempt_pkg' => {
       'columns' => [
-        'exemptpkgnum',  'serial', '', '',
-        #'custnum',      'int', '', '',
-        'billpkgnum',   'int', '', '',
-        'taxnum',       'int', '', '',
-        'year',         'int', '', '',
-        'month',        'int', '', '',
-        'amount',       @money_type,
+        'exemptpkgnum',  'serial', '', '', '', '', 
+        #'custnum',      'int', '', '', '', ''
+        'billpkgnum',   'int', '', '', '', '', 
+        'taxnum',       'int', '', '', '', '', 
+        'year',         'int', '', '', '', '', 
+        'month',        'int', '', '', '', '', 
+        'amount',       @money_type, '', '', 
       ],
       'primary_key' => 'exemptpkgnum',
       'unique' => [],
@@ -998,9 +1007,9 @@ sub tables_hashref {
 
     'router' => {
       'columns' => [
-        'routernum', 'serial', '', '',
-        'routername', 'varchar', '', $char_d,
-        'svcnum', 'int', 'NULL', '',
+        'routernum', 'serial', '', '', '', '', 
+        'routername', 'varchar', '', $char_d, '', '', 
+        'svcnum', 'int', 'NULL', '', '', '', 
       ],
       'primary_key' => 'routernum',
       'unique'      => [],
@@ -1009,9 +1018,9 @@ sub tables_hashref {
 
     'part_svc_router' => {
       'columns' => [
-        'svcrouternum', 'serial', '', '',
-        'svcpart', 'int', '', '',
-	'routernum', 'int', '', '',
+        'svcrouternum', 'serial', '', '', '', '', 
+        'svcpart', 'int', '', '', '', '', 
+	'routernum', 'int', '', '', '', '', 
       ],
       'primary_key' => 'svcrouternum',
       'unique'      => [],
@@ -1020,10 +1029,10 @@ sub tables_hashref {
 
     'addr_block' => {
       'columns' => [
-        'blocknum', 'serial', '', '',
-	'routernum', 'int', '', '',
-        'ip_gateway', 'varchar', '', 15,
-        'ip_netmask', 'int', '', '',
+        'blocknum', 'serial', '', '', '', '', 
+	'routernum', 'int', '', '', '', '', 
+        'ip_gateway', 'varchar', '', 15, '', '', 
+        'ip_netmask', 'int', '', '', '', '', 
       ],
       'primary_key' => 'blocknum',
       'unique'      => [ [ 'blocknum', 'routernum' ] ],
@@ -1032,11 +1041,11 @@ sub tables_hashref {
 
     'svc_broadband' => {
       'columns' => [
-        'svcnum', 'int', '', '',
-        'blocknum', 'int', '', '',
-        'speed_up', 'int', '', '',
-        'speed_down', 'int', '', '',
-        'ip_addr', 'varchar', '', 15,
+        'svcnum', 'int', '', '', '', '', 
+        'blocknum', 'int', '', '', '', '', 
+        'speed_up', 'int', '', '', '', '', 
+        'speed_down', 'int', '', '', '', '', 
+        'ip_addr', 'varchar', '', 15, '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
@@ -1045,13 +1054,13 @@ sub tables_hashref {
 
     'part_virtual_field' => {
       'columns' => [
-        'vfieldpart', 'int', '', '',
-        'dbtable', 'varchar', '', 32,
-        'name', 'varchar', '', 32,
-        'check_block', 'text', 'NULL', '',
-        'length', 'int', 'NULL', '',
-        'list_source', 'text', 'NULL', '',
-        'label', 'varchar', 'NULL', 80,
+        'vfieldpart', 'int', '', '', '', '', 
+        'dbtable', 'varchar', '', 32, '', '', 
+        'name', 'varchar', '', 32, '', '', 
+        'check_block', 'text', 'NULL', '', '', '', 
+        'length', 'int', 'NULL', '', '', '', 
+        'list_source', 'text', 'NULL', '', '', '', 
+        'label', 'varchar', 'NULL', 80, '', '', 
       ],
       'primary_key' => 'vfieldpart',
       'unique' => [],
@@ -1060,10 +1069,10 @@ sub tables_hashref {
 
     'virtual_field' => {
       'columns' => [
-        'vfieldnum', 'serial', '', '',
-        'recnum', 'int', '', '',
-        'vfieldpart', 'int', '', '',
-        'value', 'varchar', '', 128,
+        'vfieldnum', 'serial', '', '', '', '', 
+        'recnum', 'int', '', '', '', '', 
+        'vfieldpart', 'int', '', '', '', '', 
+        'value', 'varchar', '', 128, '', '', 
       ],
       'primary_key' => 'vfieldnum',
       'unique' => [ [ 'vfieldpart', 'recnum' ] ],
@@ -1072,12 +1081,12 @@ sub tables_hashref {
 
     'acct_snarf' => {
       'columns' => [
-        'snarfnum',  'int', '', '',
-        'svcnum',    'int', '', '',
-        'machine',   'varchar', '', 255,
-        'protocol',  'varchar', '', $char_d,
-        'username',  'varchar', '', $char_d,
-        '_password', 'varchar', '', $char_d,
+        'snarfnum',  'int', '', '', '', '', 
+        'svcnum',    'int', '', '', '', '', 
+        'machine',   'varchar', '', 255, '', '', 
+        'protocol',  'varchar', '', $char_d, '', '', 
+        'username',  'varchar', '', $char_d, '', '', 
+        '_password', 'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'snarfnum',
       'unique' => [],
@@ -1086,9 +1095,9 @@ sub tables_hashref {
 
     'svc_external' => {
       'columns' => [
-        'svcnum', 'int', '', '',
-        'id',     'int', 'NULL', '',
-        'title',  'varchar', 'NULL', $char_d,
+        'svcnum', 'int', '', '', '', '', 
+        'id',     'int', 'NULL', '', '', '', 
+        'title',  'varchar', 'NULL', $char_d, '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
@@ -1097,11 +1106,11 @@ sub tables_hashref {
 
     'cust_pay_refund' => {
       'columns' => [
-        'payrefundnum', 'serial', '', '',
-        'paynum',  'int', '', '',
-        'refundnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
+        'payrefundnum', 'serial', '', '', '', '', 
+        'paynum',  'int', '', '', '', '', 
+        'refundnum',  'int', '', '', '', '', 
+        '_date',    @date_type, '', '', 
+        'amount',   @money_type, '', '', 
       ],
       'primary_key' => 'payrefundnum',
       'unique' => [],
@@ -1110,10 +1119,10 @@ sub tables_hashref {
 
     'part_pkg_option' => {
       'columns' => [
-        'optionnum', 'serial', '', '',
-        'pkgpart', 'int', '', '',
-        'optionname', 'varchar', '', $char_d,
-        'optionvalue', 'text', 'NULL', '',
+        'optionnum', 'serial', '', '', '', '', 
+        'pkgpart', 'int', '', '', '', '', 
+        'optionname', 'varchar', '', $char_d, '', '', 
+        'optionvalue', 'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'optionnum',
       'unique'      => [],
@@ -1122,8 +1131,8 @@ sub tables_hashref {
 
     'rate' => {
       'columns' => [
-        'ratenum',  'serial', '', '',
-        'ratename', 'varchar', '', $char_d,
+        'ratenum',  'serial', '', '', '', '', 
+        'ratename', 'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'ratenum',
       'unique'      => [],
@@ -1132,13 +1141,13 @@ sub tables_hashref {
 
     'rate_detail' => {
       'columns' => [
-        'ratedetailnum',   'serial', '', '',
-        'ratenum',         'int',     '', '',
-        'orig_regionnum',  'int', 'NULL', '',
-        'dest_regionnum',  'int',     '', '',
-        'min_included',    'int',     '', '',
-        'min_charge',      @money_type,
-        'sec_granularity', 'int',     '', '',
+        'ratedetailnum',   'serial', '', '', '', '', 
+        'ratenum',         'int',     '', '', '', '', 
+        'orig_regionnum',  'int', 'NULL', '', '', '', 
+        'dest_regionnum',  'int',     '', '', '', '', 
+        'min_included',    'int',     '', '', '', '', 
+        'min_charge',      @money_type, '', '', 
+        'sec_granularity', 'int',     '', '', '', '', 
         #time period (link to table of periods)?
       ],
       'primary_key' => 'ratedetailnum',
@@ -1148,8 +1157,8 @@ sub tables_hashref {
 
     'rate_region' => {
       'columns' => [
-        'regionnum',   'serial',      '', '',
-        'regionname',  'varchar',     '', $char_d,
+        'regionnum',   'serial',      '', '', '', '', 
+        'regionname',  'varchar',     '', $char_d, '', '', 
       ],
       'primary_key' => 'regionnum',
       'unique'      => [],
@@ -1158,11 +1167,11 @@ sub tables_hashref {
 
     'rate_prefix' => {
       'columns' => [
-        'prefixnum',   'serial',    '', '',
-        'regionnum',   'int',       '', '',,
-        'countrycode', 'varchar',     '', 3,
-        'npa',         'varchar', 'NULL', 6,
-        'nxx',         'varchar', 'NULL', 3,
+        'prefixnum',   'serial',    '', '', '', '', 
+        'regionnum',   'int',       '', '',, '', '', 
+        'countrycode', 'varchar',     '', 3, '', '', 
+        'npa',         'varchar', 'NULL', 6, '', '', 
+        'nxx',         'varchar', 'NULL', 3, '', '', 
       ],
       'primary_key' => 'prefixnum',
       'unique'      => [],
@@ -1171,9 +1180,9 @@ sub tables_hashref {
 
     'reg_code' => {
       'columns' => [
-        'codenum',   'serial',    '', '',
-        'code',      'varchar',   '', $char_d,
-        'agentnum',  'int',       '', '',
+        'codenum',   'serial',    '', '', '', '', 
+        'code',      'varchar',   '', $char_d, '', '', 
+        'agentnum',  'int',       '', '', '', '', 
       ],
       'primary_key' => 'codenum',
       'unique'      => [ [ 'agentnum', 'code' ] ],
@@ -1182,9 +1191,9 @@ sub tables_hashref {
 
     'reg_code_pkg' => {
       'columns' => [
-        'codepkgnum', 'serial', '', '',
-        'codenum',   'int',    '', '',
-        'pkgpart',   'int',    '', '',
+        'codepkgnum', 'serial', '', '', '', '', 
+        'codenum',   'int',    '', '', '', '', 
+        'pkgpart',   'int',    '', '', '', '', 
       ],
       'primary_key' => 'codepkgnum',
       'unique'      => [ [ 'codenum', 'pkgpart' ] ],
@@ -1193,9 +1202,9 @@ sub tables_hashref {
 
     'clientapi_session' => {
       'columns' => [
-        'sessionnum',  'serial',  '', '',
-        'sessionid',  'varchar',  '', $char_d,
-        'namespace',  'varchar',  '', $char_d,
+        'sessionnum',  'serial',  '', '', '', '', 
+        'sessionid',  'varchar',  '', $char_d, '', '', 
+        'namespace',  'varchar',  '', $char_d, '', '', 
       ],
       'primary_key' => 'sessionnum',
       'unique'      => [ [ 'sessionid', 'namespace' ] ],
@@ -1204,10 +1213,10 @@ sub tables_hashref {
 
     'clientapi_session_field' => {
       'columns' => [
-        'fieldnum',    'serial',     '', '',
-        'sessionnum',     'int',     '', '',
-        'fieldname',  'varchar',     '', $char_d,
-        'fieldvalue',    'text', 'NULL', '',
+        'fieldnum',    'serial',     '', '', '', '', 
+        'sessionnum',     'int',     '', '', '', '', 
+        'fieldname',  'varchar',     '', $char_d, '', '', 
+        'fieldvalue',    'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'fieldnum',
       'unique'      => [ [ 'sessionnum', 'fieldname' ] ],
@@ -1216,12 +1225,12 @@ sub tables_hashref {
 
     'payment_gateway' => {
       'columns' => [
-        'gatewaynum',       'serial',   '',     '',
-        'gateway_module',   'varchar',  '',     $char_d,
-        'gateway_username', 'varchar',  'NULL', $char_d,
-        'gateway_password', 'varchar',  'NULL', $char_d,
-        'gateway_action',   'varchar',  'NULL', $char_d,
-        'disabled',   'char',  'NULL',   1,
+        'gatewaynum',       'serial',   '',     '', '', '', 
+        'gateway_module',   'varchar',  '',     $char_d, '', '', 
+        'gateway_username', 'varchar',  'NULL', $char_d, '', '', 
+        'gateway_password', 'varchar',  'NULL', $char_d, '', '', 
+        'gateway_action',   'varchar',  'NULL', $char_d, '', '', 
+        'disabled',   'char',  'NULL',   1, '', '', 
       ],
       'primary_key' => 'gatewaynum',
       'unique' => [],
@@ -1230,10 +1239,10 @@ sub tables_hashref {
 
     'payment_gateway_option' => {
       'columns' => [
-        'optionnum',   'serial',  '',     '',
-        'gatewaynum',  'int',     '',     '',
-        'optionname',  'varchar', '',     $char_d,
-        'optionvalue', 'text',    'NULL', '',
+        'optionnum',   'serial',  '',     '', '', '', 
+        'gatewaynum',  'int',     '',     '', '', '', 
+        'optionname',  'varchar', '',     $char_d, '', '', 
+        'optionvalue', 'text',    'NULL', '', '', '', 
       ],
       'primary_key' => 'optionnum',
       'unique'      => [],
@@ -1242,11 +1251,11 @@ sub tables_hashref {
 
     'agent_payment_gateway' => {
       'columns' => [
-        'agentgatewaynum', 'serial', '', '',
-        'agentnum',        'int', '', '',
-        'gatewaynum',      'int', '', '',
-        'cardtype',        'varchar', 'NULL', $char_d,
-        'taxclass',        'varchar', 'NULL', $char_d,
+        'agentgatewaynum', 'serial', '', '', '', '', 
+        'agentnum',        'int', '', '', '', '', 
+        'gatewaynum',      'int', '', '', '', '', 
+        'cardtype',        'varchar', 'NULL', $char_d, '', '', 
+        'taxclass',        'varchar', 'NULL', $char_d, '', '', 
       ],
       'primary_key' => 'agentgatewaynum',
       'unique'      => [],
@@ -1255,13 +1264,13 @@ sub tables_hashref {
 
     'banned_pay' => {
       'columns' => [
-        'bannum',  'serial',   '',     '',
-        'payby',   'char',     '',       4,
-        'payinfo', 'varchar',  '',     128, #say, a 512-big digest _hex encoded
-	#'paymask', 'varchar',  'NULL', $char_d,
-        '_date',   @date_type,
-        'otaker',  'varchar',  '',     32,
-        'reason',  'varchar',  'NULL', $char_d,
+        'bannum',  'serial',   '',     '', '', '', 
+        'payby',   'char',     '',       4, '', '', 
+        'payinfo', 'varchar',  '',     128, '', '', #say, a 512-big digest _hex encoded
+	#'paymask', 'varchar',  'NULL', $char_d, '', ''
+        '_date',   @date_type, '', '', 
+        'otaker',  'varchar',  '',     32, '', '', 
+        'reason',  'varchar',  'NULL', $char_d, '', '', 
       ],
       'primary_key' => 'bannum',
       'unique'      => [ [ 'payby', 'payinfo' ] ],
@@ -1270,9 +1279,9 @@ sub tables_hashref {
 
     'cancel_reason' => {
       'columns' => [
-        'reasonnum', 'serial',  '',     '',
-        'reason',    'varchar', '',     $char_d,
-        'disabled',  'char',    'NULL', 1,
+        'reasonnum', 'serial',  '',     '', '', '', 
+        'reason',    'varchar', '',     $char_d, '', '', 
+        'disabled',  'char',    'NULL', 1, '', '', 
       ],
       'primary_key' => 'reasonnum',
       'unique' => [],
@@ -1281,14 +1290,129 @@ sub tables_hashref {
 
     'pkg_class' => {
       'columns' => [
-        'classnum',   'serial',  '', '',
-        'classname',  'varchar', '', $char_d,
+        'classnum',   'serial',  '', '', '', '', 
+        'classname',  'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'classnum',
       'unique' => [],
       'index' => [],
     },
 
+    'cdr' => {
+      'columns' => [
+        # qw( name type null length default local );
+
+        ###
+        #asterisk fields
+        ###
+
+        'acctid',   'bigserial',  '', '', '', '', 
+        'calldate', 'TIMESTAMP with time zone', '', '', \'now()', '',
+        'clid',        'varchar',  '', $char_d, \"''", '', 
+        'src',         'varchar',  '', $char_d, \"''", '', 
+        'dst',         'varchar',  '', $char_d, \"''", '', 
+        'dcontext',    'varchar',  '', $char_d, \"''", '', 
+        'channel',     'varchar',  '', $char_d, \"''", '', 
+        'dstchannel',  'varchar',  '', $char_d, \"''", '', 
+        'lastapp',     'varchar',  '', $char_d, \"''", '', 
+        'lastdata',    'varchar',  '', $char_d, \"''", '', 
+
+        #these don't seem to be logged by most of the SQL cdr_* modules
+        #except tds under sql-illegal names, so;
+        # ... don't rely on them for rating?
+        # and, what they hey, i went ahead and changed the names and data types
+        # to freeside-style dates...
+          #'start',  'timestamp', 'NULL',  '',    '', '',
+          #'answer', 'timestamp', 'NULL',  '',    '', '',
+          #'end',    'timestamp', 'NULL',  '',    '', '',
+        'startdate',  @date_type, '', '', 
+        'answerdate', @date_type, '', '', 
+        'enddate',    @date_type, '', '', 
+        #
+
+        'duration',    'int',      '',      '',     0, '',
+        'billsec',     'int',      '',      '',     0, '', 
+        'disposition', 'varchar',  '',      45, \"''", '',
+        'amaflags',    'int',      '',      '',     0, '',
+        'accountcode', 'varchar',  '',      20, \"''", '',
+        'uniqueid',    'varchar',  '',      32, \"''", '',
+        'userfield',   'varchar',  '',     255, \"''", '',
+
+        ###
+        # fields for unitel/RSLCOM/convergent that don't map well to asterisk
+        # defaults
+        ###
+
+        #cdr_type: Usage = 1, S&E = 7, OC&C = 8
+        'cdrtypenum',              'int', 'NULL',      '', '', '',
+
+        'charged_party',       'varchar', 'NULL', $char_d, '', '',
+
+        'upstream_currency',      'char', 'NULL',       3, '', '',
+        'upstream_price',      'decimal', 'NULL',  '10,2', '', '', 
+        'upstream_rateplanid',     'int', 'NULL',      '', '', '', #?
+
+        'distance',            'decimal', 'NULL',      '', '', '',
+        'islocal',                 'int', 'NULL',      '', '', '', # '',  '', 0, '' instead?
+
+        #cdr_calltype: the big list in appendix 2
+        'calltypenum',             'int', 'NULL',      '', '', '',
+
+        'description',         'varchar', 'NULL', $char_d, '', '',
+        'quantity',                'int', 'NULL',      '', '', '', 
+
+        #cdr_carrier: Telstra =1, Optus = 2, RSL COM = 3
+        'carrierid',               'int', 'NULL',      '', '', '',
+
+        'upstream_rateid',         'int', 'NULL',      '', '', '',
+        
+        ###
+        #and now for our own fields
+        ###
+
+        # a svcnum... right..?
+        'svcnum',             'int',   'NULL',     '',   '', '', 
+
+        #NULL, done, skipped, pushed_downstream (or something)
+        'freesidestatus', 'varchar',   'NULL',     32,   '', '', 
+
+      ],
+      'primary_key' => 'acctid',
+      'unique' => [],
+      'index' => [ [ 'calldate' ], [ 'dst' ], [ 'accountcode' ], [ 'freesidestatus' ] ],
+    },
+
+    'cdr_calltype' => {
+      'columns' => [
+        'calltypenum',   'serial',  '', '', '', '', 
+        'calltypename',  'varchar', '', $char_d, '', '', 
+      ],
+      'primary_key' => 'calltypenum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'cdr_type' => {
+      'columns' => [
+        'cdrtypenum'  => 'serial',  '', '', '', '',
+        'cdrtypename' => 'varchar', '', '', '', '',
+      ],
+      'primary_key' => 'cdrtypenum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'cdr_carrier' => {
+      'columns' => [
+        'carrierid'   => 'serial',  '', '', '', '',
+        'carriername' => 'varchar', '', '', '', '',
+      ],
+      'primary_key' => 'carrierid',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+
   };
 
 }
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
new file mode 100644
index 000000000..2d40177f5
--- /dev/null
+++ b/FS/FS/cdr.pm
@@ -0,0 +1,385 @@
+package FS::cdr;
+
+use strict;
+use vars qw( @ISA );
+use Date::Parse;
+use FS::UID qw( dbh );
+use FS::Record qw( qsearch qsearchs );
+use FS::cdr_type;
+use FS::cdr_calltype;
+use FS::cdr_carrier;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::cdr - Object methods for cdr records
+
+=head1 SYNOPSIS
+
+  use FS::cdr;
+
+  $record = new FS::cdr \%hash;
+  $record = new FS::cdr { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cdr object represents an Call Data Record, typically from a telephony
+system or provider of some sort.  FS::cdr inherits from FS::Record.  The
+following fields are currently supported:
+
+=over 4
+
+=item acctid - primary key
+
+=item calldate - Call timestamp (SQL timestamp)
+
+=item clid - Caller*ID with text
+
+=item src - Caller*ID number / Source number
+
+=item dst - Destination extension
+
+=item dcontext - Destination context
+
+=item channel - Channel used
+
+=item dstchannel - Destination channel if appropriate
+
+=item lastapp - Last application if appropriate
+
+=item lastdata - Last application data
+
+=item startdate - Start of call (UNIX-style integer timestamp)
+
+=item answerdate - Answer time of call (UNIX-style integer timestamp)
+
+=item enddate - End time of call (UNIX-style integer timestamp)
+
+=item duration - Total time in system, in seconds
+
+=item billsec - Total time call is up, in seconds
+
+=item disposition - What happened to the call: ANSWERED, NO ANSWER, BUSY 
+
+=item amaflags - What flags to use: BILL, IGNORE etc, specified on a per channel basis like accountcode. 
+
+=cut
+
+  #ignore the "omit" and "documentation" AMAs??
+  #AMA = Automated Message Accounting. 
+  #default: Sets the system default. 
+  #omit: Do not record calls. 
+  #billing: Mark the entry for billing 
+  #documentation: Mark the entry for documentation.
+
+=back
+
+=item accountcode - CDR account number to use: account
+
+=item uniqueid - Unique channel identifier (Unitel/RSLCOM Event ID)
+
+=item userfield - CDR user-defined field
+
+=item cdr_type - CDR type - see L<FS::cdr_type> (Usage = 1, S&E = 7, OC&C = 8)
+
+=item charged_party - Service number to be billed
+
+=item upstream_currency - Wholesale currency from upstream
+
+=item upstream_price - Wholesale price from upstream
+
+=item upstream_rateplanid - Upstream rate plan ID
+
+=item distance - km (need units field?)
+
+=item islocal - Local - 1, Non Local = 0
+
+=item calltypenum - Type of call - see L<FS::cdr_calltype>
+
+=item description - Description (cdr_type 7&8 only) (used for cust_bill_pkg.itemdesc)
+
+=item quantity - Number of items (cdr_type 7&8 only)
+
+=item carrierid - Upstream Carrier ID (see L<FS::cdr_carrier>) 
+
+=cut
+
+#Telstra =1, Optus = 2, RSL COM = 3
+
+=back
+
+=item upstream_rateid - Upstream Rate ID
+
+=item svcnum - Link to customer service (see L<FS::cust_svc>)
+
+=item freesidestatus - NULL, done, skipped, pushed_downstream (or something)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new CDR.  To add the CDR to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cdr'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid CDR.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+Note: Unlike most types of records, we don't want to "reject" a CDR and we want
+to process them as quickly as possible, so we allow the database to check most
+of the data.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+# we don't want to "reject" a CDR like other sorts of input...
+#  my $error = 
+#    $self->ut_numbern('acctid')
+##    || $self->ut_('calldate')
+#    || $self->ut_text('clid')
+#    || $self->ut_text('src')
+#    || $self->ut_text('dst')
+#    || $self->ut_text('dcontext')
+#    || $self->ut_text('channel')
+#    || $self->ut_text('dstchannel')
+#    || $self->ut_text('lastapp')
+#    || $self->ut_text('lastdata')
+#    || $self->ut_numbern('startdate')
+#    || $self->ut_numbern('answerdate')
+#    || $self->ut_numbern('enddate')
+#    || $self->ut_number('duration')
+#    || $self->ut_number('billsec')
+#    || $self->ut_text('disposition')
+#    || $self->ut_number('amaflags')
+#    || $self->ut_text('accountcode')
+#    || $self->ut_text('uniqueid')
+#    || $self->ut_text('userfield')
+#    || $self->ut_numbern('cdrtypenum')
+#    || $self->ut_textn('charged_party')
+##    || $self->ut_n('upstream_currency')
+##    || $self->ut_n('upstream_price')
+#    || $self->ut_numbern('upstream_rateplanid')
+##    || $self->ut_n('distance')
+#    || $self->ut_numbern('islocal')
+#    || $self->ut_numbern('calltypenum')
+#    || $self->ut_textn('description')
+#    || $self->ut_numbern('quantity')
+#    || $self->ut_numbern('carrierid')
+#    || $self->ut_numbern('upstream_rateid')
+#    || $self->ut_numbern('svcnum')
+#    || $self->ut_textn('freesidestatus')
+#  ;
+#  return $error if $error;
+
+  #check the foreign keys even?
+  #do we want to outright *reject* the CDR?
+  my $error =
+       $self->ut_numbern('acctid')
+
+    #Usage = 1, S&E = 7, OC&C = 8
+    || $self->ut_foreign_keyn('cdrtypenum',  'cdr_type',     'cdrtypenum' )
+
+    #the big list in appendix 2
+    || $self->ut_foreign_keyn('calltypenum', 'cdr_calltype', 'calltypenum' )
+
+    # Telstra =1, Optus = 2, RSL COM = 3
+    || $self->ut_foreign_keyn('carrierid', 'cdr_carrier', 'carrierid' )
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+my %formats = (
+  'asterisk' => [
+    'accountcode',
+    'src',
+    'dst',
+    'dcontext',
+    'clid',
+    'channel',
+    'dstchannel',
+    'lastapp',
+    'lastdata',
+    'startdate', # XXX will need massaging
+    'answer',    # XXX same
+    'end',       # XXX same
+    'duration',
+    'billsec',
+    'disposition',
+    'amaflags',
+    'uniqueid',
+    'userfield',
+  ],
+  'unitel' => [
+    'uniqueid',
+    'cdr_type',
+    'calldate', # XXX may need massaging
+    'billsec', #XXX duration and billsec?
+               # sub { $_[0]->billsec(  $_[1] );
+               #       $_[0]->duration( $_[1] );
+               #     },
+    'src',
+    'dst',
+    'charged_party',
+    'upstream_currency',
+    'upstream_price',
+    'upstream_rateplanid',
+    'distance',
+    'islocal',
+    'calltypenum',
+    'startdate', # XXX will definitely need massaging
+    'enddate',   # XXX same
+    'description',
+    'quantity',
+    'carrierid',
+    'upstream_rateid',
+  ]
+);
+
+sub batch_import {
+  my $param = shift;
+
+  my $fh = $param->{filehandle};
+  my $format = $param->{format};
+
+  return "Unknown format $format" unless exists $formats{$format};
+
+  eval "use Text::CSV_XS;";
+  die $@ if $@;
+
+  my $csv = new Text::CSV_XS;
+
+  my $imported = 0;
+  #my $columns;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+  
+  my $line;
+  while ( defined($line=<$fh>) ) {
+
+    $csv->parse($line) or do {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't parse: ". $csv->error_input();
+    };
+
+    my @columns = $csv->fields();
+    #warn join('-',@columns);
+
+    my @later = ();
+    my %cdr =
+      map {
+
+        my $field_or_sub = $_;
+        if ( ref($field_or_sub) ) {
+          push @later, $field_or_sub, shift(@columns);
+          ();
+        } else {
+          ( $field_or_sub => shift @columns );
+        }
+
+      }
+      @{ $formats{$format} }
+    ;
+
+    my $cdr = new FS::cdr ( \%cdr );
+
+    while ( scalar(@later) ) {
+      my $sub = shift @later;
+      my $data = shift @later;
+      &{$sub}($cdr, $data);  # $cdr->&{$sub}($data); 
+    }
+
+    my $error = $cdr->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+
+      #or just skip?
+      #next;
+    }
+
+    $imported++;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  #might want to disable this if we skip records for any reason...
+  return "Empty file!" unless $imported;
+
+  '';
+
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cdr_calltype.pm b/FS/FS/cdr_calltype.pm
new file mode 100644
index 000000000..fe456086f
--- /dev/null
+++ b/FS/FS/cdr_calltype.pm
@@ -0,0 +1,115 @@
+package FS::cdr_calltype;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::cdr_calltype - Object methods for cdr_calltype records
+
+=head1 SYNOPSIS
+
+  use FS::cdr_calltype;
+
+  $record = new FS::cdr_calltype \%hash;
+  $record = new FS::cdr_calltype { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cdr_calltype object represents an CDR call type.  FS::cdr_calltype
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item calltypenum - primary key
+
+=item calltypename - CDR call type name
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new call type.  To add the call type to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cdr_calltype'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid call type.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('calltypenum')
+    || $self->ut_text('calltypename')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cdr_carrier.pm b/FS/FS/cdr_carrier.pm
new file mode 100644
index 000000000..609c93923
--- /dev/null
+++ b/FS/FS/cdr_carrier.pm
@@ -0,0 +1,116 @@
+package FS::cdr_carrier;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::cdr_carrier - Object methods for cdr_carrier records
+
+=head1 SYNOPSIS
+
+  use FS::cdr_carrier;
+
+  $record = new FS::cdr_carrier \%hash;
+  $record = new FS::cdr_carrier { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cdr_carrier object represents an CDR carrier or upstream.
+FS::cdr_carrier inherits from FS::Record.  The following fields are currently
+supported:
+
+=over 4
+
+=item carrierid - primary key
+
+=item carriername - Carrier name
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new carrier.  To add the carrier to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cdr_carrier'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid carrier.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('carrierid')
+    || $self->ut_text('carriername')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cdr_type.pm b/FS/FS/cdr_type.pm
new file mode 100644
index 000000000..e258bf878
--- /dev/null
+++ b/FS/FS/cdr_type.pm
@@ -0,0 +1,119 @@
+package FS::cdr_type;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::cdr_type - Object methods for cdr_type records
+
+=head1 SYNOPSIS
+
+  use FS::cdr_type;
+
+  $record = new FS::cdr_type \%hash;
+  $record = new FS::cdr_type { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cdr_type object represents an CDR type.  FS::cdr_type inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item cdrtypenum - primary key
+
+=item typename - CDR type name
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new CDR type.  To add the CDR type to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cdr_type'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid CDR type.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('cdrtypenum')
+    || $self->ut_text('typename')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 973fe7c81..50faeb422 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -16,6 +16,7 @@ BEGIN {
 }
 use Digest::MD5 qw(md5_base64);
 use Date::Format;
+use Date::Parse;
 #use Date::Manip;
 use String::Approx qw(amatch);
 use Business::CreditCard 0.28;
@@ -3964,8 +3965,6 @@ sub batch_import {
   my $pkgpart = $param->{pkgpart};
   my @fields = @{$param->{fields}};
 
-  eval "use Date::Parse;";
-  die $@ if $@;
   eval "use Text::CSV_XS;";
   die $@ if $@;
 
@@ -4071,8 +4070,6 @@ sub batch_charge {
   my $fh = $param->{filehandle};
   my @fields = @{$param->{fields}};
 
-  eval "use Date::Parse;";
-  die $@ if $@;
   eval "use Text::CSV_XS;";
   die $@ if $@;
 
diff --git a/FS/FS/part_pkg/voip_sqlradacct.pm b/FS/FS/part_pkg/voip_sqlradacct.pm
index fd9c1ddb5..bf18003ab 100644
--- a/FS/FS/part_pkg/voip_sqlradacct.pm
+++ b/FS/FS/part_pkg/voip_sqlradacct.pm
@@ -41,6 +41,7 @@ sub calc_setup {
   $self->option('setup_fee');
 }
 
+#false laziness w/voip_cdr... resolve it if this one ever gets used again
 sub calc_recur {
   my($self, $cust_pkg, $sdate, $details ) = @_;
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 452041e35..f6f833589 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -122,6 +122,7 @@ FS/part_pkg/sql_generic.pm
 FS/part_pkg/sqlradacct_hour.pm
 FS/part_pkg/subscription.pm
 FS/part_pkg/voip_sqlradacct.pm
+FS/part_pkg/voip_cdr.pm
 FS/part_pop_local.pm
 FS/part_referral.pm
 FS/part_svc.pm
@@ -261,7 +262,7 @@ t/part_pkg-sql_external.t
 t/part_pkg-sql_generic.t
 t/part_pkg-sqlradacct_hour.t
 t/part_pkg-subscription.t
-t/part_pkg-voip_sqlradacct.t
+t/part_pkg-voip_cdr.t
 t/part_pop_local.t
 t/part_referral.t
 t/part_svc.t
@@ -308,3 +309,11 @@ t/banned_pay.t
 FS/cancel_reason.pm
 t/cancel_reason.t
 bin/freeside-prepaidd
+FS/cdr.pm
+t/cdr.t
+FS/cdr_calltype.pm
+t/cdr_calltype.t
+FS/cdr_type.pm
+t/cdr_type.t
+FS/cdr_carrier.pm
+t/cdr_carrier.t
diff --git a/FS/t/cdr.t b/FS/t/cdr.t
new file mode 100644
index 000000000..1d1f3eb4e
--- /dev/null
+++ b/FS/t/cdr.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cdr;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cdr_calltype.t b/FS/t/cdr_calltype.t
new file mode 100644
index 000000000..d4e13943e
--- /dev/null
+++ b/FS/t/cdr_calltype.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cdr_calltype;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cdr_carrier.t b/FS/t/cdr_carrier.t
new file mode 100644
index 000000000..1e2161558
--- /dev/null
+++ b/FS/t/cdr_carrier.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cdr_carrier;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/cdr_type.t b/FS/t/cdr_type.t
new file mode 100644
index 000000000..9dff15a32
--- /dev/null
+++ b/FS/t/cdr_type.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cdr_type;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-voip_cdr.t b/FS/t/part_pkg-voip_cdr.t
new file mode 100644
index 000000000..2d988a34f
--- /dev/null
+++ b/FS/t/part_pkg-voip_cdr.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::voip_cdr;
+$loaded=1;
+print "ok 1\n";
diff --git a/README.1.7.0 b/README.1.7.0
new file mode 100644
index 000000000..834972ae2
--- /dev/null
+++ b/README.1.7.0
@@ -0,0 +1,19 @@
+
+install DBIx::DBSchema 0.29 (or later)
+
+make install-perl-modules
+run "freeside-upgrade username" to uprade your database schema
+
+(if freeside-upgrade hangs, try stopping Apache, all Freeside processes, and
+ anything else connected to your database, especially on older Pg versions)
+
+If you have any records in the cust_tax_exempt table, you *MUST* migrate them
+to the new cust_tax_exempt_pkg table.  An example script to get you started is
+in bin/fs-migrate-cust_tax_exempt - it may need to be customized for your
+specific data.
+
+------
+
+make install-docs
+ (or "make deploy" if you've got everything setup in the Makefile)
+
diff --git a/README.2.0.0 b/README.2.0.0
deleted file mode 100644
index 3f5f1158f..000000000
--- a/README.2.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-
-make install-perl-modules
-run "freeside-upgrade username" to uprade your database schema
-
-(if freeside-upgrade hangs, try stopping Apache, all Freeside processes, and
- anything else connected to your database, especially on older Pg versions)
-
-If you have any records in the cust_tax_exempt table, you *MUST* migrate them
-to the new cust_tax_exempt_pkg table.  An example script to get you started is
-in bin/fs-migrate-cust_tax_exempt - it may need to be customized for your
-specific data.
-
-------
-
-make install-docs
- (or "make deploy" if you've got everything setup in the Makefile)
-
diff --git a/bin/cdr_calltype.import b/bin/cdr_calltype.import
new file mode 100755
index 000000000..a998284f6
--- /dev/null
+++ b/bin/cdr_calltype.import
@@ -0,0 +1,41 @@
+#!/usr/bin/perl -w
+#
+# bin/cdr_calltype.import ivan ~ivan/convergent/newspecs/fixed_inbound/calltypes.csv
+
+use strict;
+use FS::UID qw(dbh adminsuidsetup);
+use FS::cdr_calltype;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+while (<>) {
+
+  chomp;
+  my $line = $_;
+
+  #$line =~ /^(\d+),"([^"]+)"$/ or do {
+  $line =~ /^(\d+),"([^"]+)"/ or do {
+    warn "unparsable line: $line\n";
+    next;
+  };
+
+  my $cdr_calltype = new FS::cdr_calltype {
+    'calltypenum'  => $1,
+    'calltypename' => $2,
+  };
+  
+  #my $error = $cdr_calltype->check;
+  my $error = $cdr_calltype->insert;
+  if ( $error ) {
+    warn "********** $error FOR LINE: $line\n";
+    dbh->commit;
+    #my $wait = scalar(<STDIN>);
+  }
+
+}
+
+sub usage {
+  "Usage:\n\ncdr_calltype.import username filename ...\n";
+}
+
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 06060b20a..1bbea16d1 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -88,7 +88,7 @@ sub handler
     #rar
     { package HTML::Mason::Commands;
       use strict;
-      use vars qw( $cgi $p );
+      use vars qw( $cgi $p $fsurl);
       use vars qw( %session );
       use CGI 2.47 qw(-private_tempfiles);
       #use CGI::Carp qw(fatalsToBrowser);
@@ -118,8 +118,8 @@ sub handler
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
       use FS::Record qw(qsearch qsearchs fields dbdef);
       use FS::Conf;
-      use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-                     small_custview myexit http_header);
+      use FS::CGI qw(header menubar popurl rooturl table itable ntable idiot
+                     eidiot small_custview myexit http_header);
       use FS::UI::Web;
       use FS::Msgcat qw(gettext geterror);
       use FS::Misc qw( send_email send_fax );
@@ -172,6 +172,7 @@ sub handler
       use FS::agent_payment_gateway;
       use FS::XMLRPC;
       use FS::payby;
+      use FS::cdr;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
@@ -234,9 +235,9 @@ sub handler
         &cgisuidsetup($cgi);
         #&cgisuidsetup($r);
         $p = popurl(2);
+        $fsurl = rooturl();
       }
 
-
       sub include {
         use vars qw($m);
         $m->scomp(@_);
diff --git a/httemplate/misc/cdr-import.html b/httemplate/misc/cdr-import.html
new file mode 100644
index 000000000..dc1733249
--- /dev/null
+++ b/httemplate/misc/cdr-import.html
@@ -0,0 +1,15 @@
+<%= include("/elements/header.html",'Call Detail Record Import') %>
+<FORM ACTION="process/cdr-import.html" METHOD="POST" ENCTYPE="multipart/form-data">
+Import a CSV file containing Call Detail Records (CDRs).<BR><BR>
+CDR Format: <SELECT NAME="format">
+<!-- <OPTION VALUE="asterisk">Asterisk</OPTION> -->
+<OPTION VALUE="unitel">Unitel/RSLCOM</OPTION>
+</SELECT><BR><BR>
+
+Filename: <INPUT TYPE="file" NAME="csvfile"><BR><BR>
+
+<INPUT TYPE="submit" VALUE="Upload">
+</FORM>
+
+<%= include('/elements/footer.html') %>
+
diff --git a/httemplate/misc/process/cdr-import.html b/httemplate/misc/process/cdr-import.html
new file mode 100644
index 000000000..381b07820
--- /dev/null
+++ b/httemplate/misc/process/cdr-import.html
@@ -0,0 +1,26 @@
+<%
+
+  my $fh = $cgi->upload('csvfile');
+
+  my $error = defined($fh)
+    ? FS::cdr::batch_import( {
+        'filehandle' => $fh,
+        'format'     => $cgi->param('format'),
+      } )
+    : 'No file';
+
+  if ( $error ) {
+    %>
+    <!-- mason kludge -->
+    <%
+    eidiot($error);
+#    $cgi->param('error', $error);
+#    print $cgi->redirect( "${p}cust_main-import.cgi
+  } else {
+    %>
+    <!-- mason kludge -->
+    <%= include("/elements/header.html",'Import sucessful') %>
+    <!-- XXX redirect to batch search like the payment entry... -->
+    <%= include("/elements/footer.html",'Import sucessful') %> <%
+  }
+%>
diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html
new file mode 100644
index 000000000..75049b443
--- /dev/null
+++ b/httemplate/search/cdr.html
@@ -0,0 +1,20 @@
+<%
+
+my $hashref = {};
+#process params for CDR search, populate $hashref...
+
+my $count_query = 'SELECT COUNT(*) FROM cdr';
+# and fixup $count_query
+
+%><%= include( 'elements/search.html',
+               'title' => 'Call Detail Records',
+               'name'  => 'call detail records',
+               'query' => { 'table'   => 'cdr',
+                            'hashref' => $hashref
+                          },
+               'count_query' => $count_query,
+               'header' => [ fields('cdr') ], #XXX fill in some nice names
+               'fields' => [ fields('cdr') ], #XXX fill in some pretty-print
+                                              # processing, etc.
+             )
+%>
diff --git a/httemplate/search/report_cdr.html b/httemplate/search/report_cdr.html
new file mode 100644
index 000000000..b9ad55e10
--- /dev/null
+++ b/httemplate/search/report_cdr.html
@@ -0,0 +1,7 @@
+<%= include('/elements/header.html', 'Call Detail Record Search' ) %>
+
+<FORM ACTION="cdr.html" METHOD="GET">
+<INPUT TYPE="submit" VALUE="Search Call Detail Records">
+
+<%= include('/elements/footer.html') %>
+
-- 
cgit v1.2.1


From 53bf3dff4149408fde4f1d0d87fd18c6033bc71f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 Feb 2006 07:12:28 +0000
Subject: a better CGI::rooturl(), will have to do for now

---
 FS/FS/CGI.pm | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 9dc635ad2..f1f2a3dca 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -9,7 +9,7 @@ use URI::URL;
 use FS::UID;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable
+@EXPORT_OK = qw(header menubar idiot eidiot popurl rooturl table itable ntable
                 small_custview myexit http_header);
 
 =head1 NAME
@@ -225,6 +225,34 @@ sub popurl {
   $x;
 }
 
+=item rooturl 
+
+=cut
+
+sub rooturl {
+  #this doesn't work so well...
+  #'%%%FREESIDE_URL%%%';
+
+  # better to start with the client-provided URL
+  my $cgi = &FS::UID::cgi;
+  my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+  $url_string =~ s/\?.*//;
+
+  #even though this is kludgy
+  $url_string =~
+    s{
+       (browse|config|docs|edit|graph|misc|search|view)
+       /
+       (process/)?
+       ([\w\-\.]+)
+       $
+     }
+     {}x;
+
+  $url_string;
+
+}
+
 =item table
 
 Returns HTML tag for beginning a table.
-- 
cgit v1.2.1


From e9b7648aa4f838e45de95128dc22053aa8eafdb4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 Feb 2006 13:07:48 +0000
Subject: add vonage click2call feature

---
 FS/FS/Conf.pm                                 |  20 ++++++++++++++++++
 httemplate/elements/phonenumber.html          |  23 +++++++++++++++++++++
 httemplate/images/red_telephone_mimooh_01.png | Bin 0 -> 921 bytes
 httemplate/view/cust_main/contacts.html       |  28 ++++++++++++++++++++------
 4 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 httemplate/elements/phonenumber.html
 create mode 100644 httemplate/images/red_telephone_mimooh_01.png

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 88dbdf082..a5add28d8 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1661,6 +1661,26 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  #these should become per-user...
+  {
+    'key'         => 'vonage-username',
+    'section'     => '',
+    'description' => 'Vonage Click2Call username (see <a href="https://secure.click2callu.com/">https://secure.click2callu.com/</a>)',
+    'type'        => 'text',
+  },
+  {
+    'key'         => 'vonage-password',
+    'section'     => '',
+    'description' => 'Vonage Click2Call username (see <a href="https://secure.click2callu.com/">https://secure.click2callu.com/</a>)',
+    'type'        => 'text',
+  },
+  {
+    'key'         => 'vonage-fromnumber',
+    'section'     => '',
+    'description' => 'Vonage Click2Call number (see <a href="https://secure.click2callu.com/">https://secure.click2callu.com/</a>)',
+    'type'        => 'text',
+  },
+
 );
 
 1;
diff --git a/httemplate/elements/phonenumber.html b/httemplate/elements/phonenumber.html
new file mode 100644
index 000000000..1330ca109
--- /dev/null
+++ b/httemplate/elements/phonenumber.html
@@ -0,0 +1,23 @@
+<%
+  my( $number, %opt ) = @_;
+  my $conf = new FS::Conf;
+  ( my $snumber = $number ) =~ s/\D//g;
+%>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript">
+function OLiframeContent(src, width, height, name) {
+  return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
+   +(name?' name="'+name+'" id="'+name+'"':'')+' scrolling="auto">'
+   +'<div>[iframe not supported]</div></iframe>');
+}
+</SCRIPT>
+<% if ( length($number) ) { %>
+  <%= $number %>
+  <% if ( $opt{'callable'} && $conf->config('vonage-username') ) { %>
+      <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('https://secure.click2callu.com/tpcc/makecall?username=<%= $conf->config('vonage-username') %>&password=<%= $conf->config('vonage-password') %>&fromnumber=<%= $conf->config('vonage-fromnumber')%>&tonumber=1<%= $snumber %>', 240, 64, 'call_popup'), CAPTION, 'Initiating call', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE, WIDTH, 240, HEIGHT, 64 ); return false;" TITLE="Call this number"><IMG SRC="<%=$fsurl%>images/red_telephone_mimooh_01.png" BORDER=0 ALT="Call this number"></A>
+  <% } %>
+<% } else { %>
+  &nbsp;
+<% } %>
diff --git a/httemplate/images/red_telephone_mimooh_01.png b/httemplate/images/red_telephone_mimooh_01.png
new file mode 100644
index 000000000..2212ff0e8
Binary files /dev/null and b/httemplate/images/red_telephone_mimooh_01.png differ
diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 456d117a6..89926ea64 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -51,14 +51,22 @@ Billing address
 %>
 <TR>
   <TD ALIGN="right"><%= $daytime_label %></TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->daytime || '&nbsp' %>
+  <TD COLSPAN=6 BGCOLOR="#ffffff">
+    <%= include('/elements/phonenumber.html',
+                  $cust_main->daytime,
+                  'callable'=>1
+               )
+    %>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right"><%= $night_label %></TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->night || '&nbsp' %>
+  <TD COLSPAN=6 BGCOLOR="#ffffff">
+    <%= include('/elements/phonenumber.html',
+                  $cust_main->night,
+                  'callable'=>1
+               )
+    %>
   </TD>
 </TR>
 <TR>
@@ -111,13 +119,21 @@ Service address
 <TR>
   <TD ALIGN="right"><%= $daytime_label %></TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->get("${pre}daytime") || '&nbsp' %>
+    <%= include('/elements/phonenumber.html',
+                  $cust_main->get("${pre}daytime"),
+                  'callable'=>1
+               )
+    %>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right"><%= $night_label %></TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->get("${pre}night") || '&nbsp' %>
+    <%= include('/elements/phonenumber.html',
+                  $cust_main->get("${pre}night"),
+                  'callable'=>1
+               )
+    %>
   </TD>
 </TR>
 <TR>
-- 
cgit v1.2.1


From ec3dc4ea9ac60ba99adb6c067452e5aac30957c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 Feb 2006 19:34:01 +0000
Subject: update POD docs regarding new price plans

---
 FS/FS/part_pkg.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index a5e3c2170..30a97227e 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -759,15 +759,16 @@ sub plan_info {
 
 =head1 NEW PLAN CLASSES
 
-A module should be added in FS/FS/part_pkg/ (an example may be found in
-eg/plan_template.pm)
+A module should be added in FS/FS/part_pkg/  Eventually, an example may be
+found in eg/plan_template.pm.  Until then, it is suggested that you use the
+other modules in FS/FS/part_pkg/ as a guide.
 
 =head1 BUGS
 
 The delete method is unimplemented.
 
 setup and recur semantics are not yet defined (and are implemented in
-FS::cust_bill.  hmm.).
+FS::cust_bill.  hmm.).  now they're deprecated and need to go.
 
 plandata should go
 
-- 
cgit v1.2.1


From 02ffd747f8cbc05815c0d96f437c507cfac04ba6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 3 Mar 2006 15:02:33 +0000
Subject: agent-specific sales/credit/receipts summary

---
 FS/FS/Report/Table/Monthly.pm         | 102 ++++++++++++++++++++--------------
 httemplate/graph/money_time-graph.cgi |   7 +++
 httemplate/graph/money_time.cgi       |  29 +++++++---
 3 files changed, 89 insertions(+), 49 deletions(-)

diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index 89d44f92f..9ef108c44 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -45,6 +45,7 @@ sub data {
   my $syear = $self->{'start_year'};
   my $emonth = $self->{'end_month'};
   my $eyear = $self->{'end_year'};
+  my $agentnum = $self->{'agentnum'};
 
   my %data;
 
@@ -59,7 +60,7 @@ sub data {
     push @{$data{eperiod}}, $eperiod;
   
     foreach my $item ( @{$self->{'items'}} ) {
-      push @{$data{$item}}, $self->$item($speriod, $eperiod);
+      push @{$data{$item}}, $self->$item($speriod, $eperiod, $agentnum);
     }
 
   }
@@ -69,53 +70,60 @@ sub data {
 }
 
 sub invoiced { #invoiced
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
   $self->scalar_sql("
-    SELECT SUM(charged) FROM cust_bill
-    WHERE ". $self->in_time_period($speriod, $eperiod)
+    SELECT SUM(charged)
+      FROM cust_bill
+        LEFT JOIN cust_main USING ( custnum )
+      WHERE ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum)
   );
 }
 
 sub netsales { #net sales
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
 
   my $credited = $self->scalar_sql("
     SELECT SUM(cust_credit_bill.amount)
-    FROM cust_credit_bill, cust_bill
-    WHERE cust_bill.invnum = cust_credit_bill.invnum
-      AND ".  $self->in_time_period($speriod, $eperiod, 'cust_bill')
+      FROM cust_credit_bill
+        LEFT JOIN cust_bill USING ( invnum  )
+        LEFT JOIN cust_main USING ( custnum )
+    WHERE ".  $self->in_time_period_and_agent($speriod, $eperiod, $agentnum, 'cust_bill')
   );
 
   #horrible local kludge
   my $expenses = !$expenses_kludge ? 0 : $self->scalar_sql("
     SELECT SUM(cust_bill_pkg.setup)
-    FROM cust_bill_pkg, cust_bill, cust_pkg, part_pkg
-    WHERE cust_bill.invnum = cust_bill_pkg.invnum
-    AND ". $self->in_time_period($speriod, $eperiod, 'cust_bill'). "
-    AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum
-    AND cust_pkg.pkgpart = part_pkg.pkgpart
-    AND LOWER(part_pkg.pkg) LIKE 'expense _%'
+      FROM cust_bill_pkg
+        LEFT JOIN cust_bill USING ( invnum  )
+        LEFT JOIN cust_main USING ( custnum )
+        LEFT JOIN cust_pkg  USING ( pkgnum  )
+        LEFT JOIN part_pkg  USING ( pkgpart )
+      WHERE ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum, 'cust_bill'). "
+        AND LOWER(part_pkg.pkg) LIKE 'expense _%'
   ");
 
-  $self->invoiced($speriod,$eperiod) - $credited - $expenses;
+  $self->invoiced($speriod,$eperiod,$agentnum) - $credited - $expenses;
 }
 
 #deferred revenue
 
 sub receipts { #cashflow
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
 
   my $refunded = $self->scalar_sql("
-    SELECT SUM(refund) FROM cust_refund
-    WHERE ". $self->in_time_period($speriod, $eperiod)
+    SELECT SUM(refund)
+      FROM cust_refund
+        LEFT JOIN cust_main USING ( custnum )
+      WHERE ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum)
   );
 
   #horrible local kludge that doesn't even really work right
   my $expenses = !$expenses_kludge ? 0 : $self->scalar_sql("
     SELECT SUM(cust_bill_pay.amount)
-    FROM cust_bill_pay, cust_bill
-    WHERE cust_bill_pay.invnum = cust_bill.invnum
-    AND ". $self->in_time_period($speriod, $eperiod, 'cust_bill_pay'). "
+      FROM cust_bill_pay
+        LEFT JOIN cust_bill USING ( invnum  )
+        LEFT JOIN cust_main USING ( custnum )
+    WHERE ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum, 'cust_bill_pay'). "
     AND 0 < ( SELECT COUNT(*) from cust_bill_pkg, cust_pkg, part_pkg
               WHERE cust_bill.invnum = cust_bill_pkg.invnum
               AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum
@@ -125,40 +133,48 @@ sub receipts { #cashflow
   ");
   #    my $expenses_sql2 = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
   
-  $self->payments($speriod, $eperiod) - $refunded - $expenses;
+  $self->payments($speriod, $eperiod, $agentnum) - $refunded - $expenses;
 }
 
 sub payments {
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
   $self->scalar_sql("
-    SELECT SUM(paid) FROM cust_pay
-    WHERE ". $self->in_time_period($speriod, $eperiod)
+    SELECT SUM(paid)
+      FROM cust_pay
+        LEFT JOIN cust_main USING ( custnum )
+      WHERE ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum)
   );
 }
 
 sub credits {
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
   $self->scalar_sql("
-    SELECT SUM(amount) FROM cust_credit
-    WHERE ". $self->in_time_period($speriod, $eperiod)
+    SELECT SUM(amount)
+      FROM cust_credit
+        LEFT JOIN cust_main USING ( custnum )
+      WHERE ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum)
   );
 }
 
+# NEEDS TO BE AGENTNUM-capable
 sub canceled { #active
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
   $self->scalar_sql("
-    SELECT COUNT(*) FROM cust_pkg
-    WHERE cust_pkg.custnum = cust_main.custnum
-    AND 0 = ( SELECT COUNT(*) FROM cust_pkg
-              WHERE cust_pkg.custnum = cust_main.custnum
-              AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-            )
-    AND cust_pkg.cancel > $speriod AND cust_pkg.cancel < $eperiod
+    SELECT COUNT(*)
+      FROM cust_pkg
+        LEFT JOIN cust_main USING ( custnum )
+      WHERE 0 = ( SELECT COUNT(*)
+                    FROM cust_pkg
+                    WHERE cust_pkg.custnum = cust_main.custnum
+                      AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
+                )
+        AND cust_pkg.cancel > $speriod AND cust_pkg.cancel < $eperiod
   ");
 }
  
+# NEEDS TO BE AGENTNUM-capable
 sub newaccount { #newaccount
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
   $self->scalar_sql("
      SELECT COUNT(*) FROM cust_pkg
      WHERE cust_pkg.custnum = cust_main.custnum
@@ -168,8 +184,9 @@ sub newaccount { #newaccount
   ");
 }
  
+# NEEDS TO BE AGENTNUM-capable
 sub suspended { #suspended
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
   $self->scalar_sql("
      SELECT COUNT(*) FROM cust_pkg
      WHERE cust_pkg.custnum = cust_main.custnum
@@ -182,10 +199,13 @@ sub suspended { #suspended
   ");
 }
 
-sub in_time_period {
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+sub in_time_period_and_agent {
+  my( $self, $speriod, $eperiod, $agentnum ) = splice(@_, 0, 4);
   my $table = @_ ? shift().'.' : '';
-  "${table}_date >= $speriod AND ${table}_date < $eperiod";
+  my $sql = "${table}_date >= $speriod AND ${table}_date < $eperiod";
+  $sql .= " AND agentnum = $agentnum"
+    if $agentnum;
+  $sql;
 }
 
 sub scalar_sql {
diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index bb3d23aae..fc8207a81 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -12,6 +12,12 @@ my $eyear = $cgi->param('eyear') || 1900+$curyear;
 my $emonth = $cgi->param('emonth') || $curmon+1;
 #if ( $emonth++>12 ) { $emonth-=12; $eyear++; }
 
+# XXX or virtual
+my $agentnum = '';
+if ( $cgi->param('agentnum') =~ /^(\d*)$/ ) {
+  $agentnum = $1;
+}
+
 #my @labels;
 #my %data;
 
@@ -37,6 +43,7 @@ my $report = new FS::Report::Table::Monthly (
   'start_year'  => $syear,
   'end_month'   => $emonth,
   'end_year'    => $eyear,
+  'agentnum'    => $agentnum,
 );
 my %data = %{$report->data};
 
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index 1c7d54266..874f58b09 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -12,13 +12,23 @@ my $smonth = $cgi->param('smonth') || $curmon+1;
 my $eyear = $cgi->param('eyear') || 1900+$curyear;
 my $emonth = $cgi->param('emonth') || $curmon+1;
 
+#XXX or virtual
+my( $agentnum, $agent ) = ('', '');
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  $agentnum = $1;
+  $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+  die "agentnum $agentnum not found!" unless $agent;
+}
+my $agentname = $agent ? $agent->agent.' ' : '';
+warn $agentname;
+
+%>
+
+<%= include('/elements/header.html',
+              $agentname. 'Sales, Credits and Receipts Summary'
+           )
 %>
 
-<HTML>
-  <HEAD>
-    <TITLE>Sales, Credits and Receipts Summary</TITLE>
-  </HEAD>
-<BODY BGCOLOR="#e8e8e8">
 <IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="976" HEIGHT="384">
 <BR>
 
@@ -41,9 +51,9 @@ my %color = (
   'receipts' => '00cc00', #green
 );
 my %link = (
-  'invoiced' => "${p}search/cust_bill.html?",
-  'credits'  => "${p}search/cust_credit.html?",
-  'payments' => "${p}search/cust_pay.cgi?magic=_date;",
+  'invoiced' => "${p}search/cust_bill.html?agentnum=$agentnum;",
+  'credits'  => "${p}search/cust_credit.html?agentnum=$agentnum;",
+  'payments' => "${p}search/cust_pay.cgi?magic=_date;agentnum=$agentnum;",
 );
 
 my $report = new FS::Report::Table::Monthly (
@@ -52,6 +62,7 @@ my $report = new FS::Report::Table::Monthly (
   'start_year'  => $syear,
   'end_month'   => $emonth,
   'end_year'    => $eyear,
+  'agentnum'    => $agentnum,
 );
 my $data = $report->data;
 
@@ -119,6 +130,8 @@ From <SELECT NAME="smonth">
 <% } %>
 </SELECT>
 
+for agent: <%= include('/elements/select-agent.html', $agentnum) %>
+
 <INPUT TYPE="submit" VALUE="Redisplay">
 </FORM>
 </BODY>
-- 
cgit v1.2.1


From 5809a99d862a6bd0da6742479f18728aae8216a2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Mar 2006 08:21:37 +0000
Subject: add space in error msg

---
 FS/FS/agent.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index 83f0ce5b5..849dafa2a 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -195,7 +195,7 @@ sub num_sql {
   my( $self, $sql ) = @_;
   my $statement = "SELECT COUNT(*) FROM cust_main WHERE agentnum = ? AND $sql";
   my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
-  $sth->execute($self->agentnum) or die $sth->errstr. "executing $statement";
+  $sth->execute($self->agentnum) or die $sth->errstr. " executing $statement";
   $sth->fetchrow_arrayref->[0];
 }
 
-- 
cgit v1.2.1


From 600a0939e7e7e589dae4f4f5bfef3650728940b7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Mar 2006 10:05:01 +0000
Subject: Add a new table for inventory with for DIDs/serials/etc., and an
 additional new table for inventory category (i.e. to distinguish DIDs,
 serials, MACs, etc.)

---
 FS/FS/Schema.pm                               |  41 ++++++-
 FS/FS/inventory_class.pm                      | 164 ++++++++++++++++++++++++++
 FS/FS/inventory_item.pm                       | 126 ++++++++++++++++++++
 FS/MANIFEST                                   |   5 +
 FS/t/inventory_class.t                        |   5 +
 FS/t/inventory_item.t                         |   5 +
 bin/generate-table-module                     |   1 +
 htetc/handler.pl                              |  10 +-
 httemplate/edit/elements/edit.html            | 118 ++++++++++++++++++
 httemplate/edit/inventory_class.html          |   9 ++
 httemplate/edit/process/elements/process.html |  46 ++++++++
 httemplate/edit/process/inventory_class.html  |   4 +
 httemplate/search/elements/search.html        |  80 ++++++++++++-
 httemplate/search/inventory_class.html        |  58 +++++++++
 httemplate/search/inventory_item.html         |  35 ++++++
 15 files changed, 700 insertions(+), 7 deletions(-)
 create mode 100644 FS/FS/inventory_class.pm
 create mode 100644 FS/FS/inventory_item.pm
 create mode 100644 FS/t/inventory_class.t
 create mode 100644 FS/t/inventory_item.t
 create mode 100644 httemplate/edit/elements/edit.html
 create mode 100644 httemplate/edit/inventory_class.html
 create mode 100644 httemplate/edit/process/elements/process.html
 create mode 100644 httemplate/edit/process/inventory_class.html
 create mode 100644 httemplate/search/inventory_class.html
 create mode 100644 httemplate/search/inventory_item.html

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 3ca599b49..a049b8bad 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -443,7 +443,7 @@ sub tables_hashref {
       #'index' => [ ['last'], ['company'] ],
       'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ],
                    [ 'daytime' ], [ 'night' ], [ 'fax' ], [ 'refnum' ],
-                   [ 'county' ], [ 'state' ], [ 'country' ]
+                   [ 'county' ], [ 'state' ], [ 'country' ], [ 'zip' ],
                  ],
     },
 
@@ -1352,6 +1352,10 @@ sub tables_hashref {
         'upstream_price',      'decimal', 'NULL',  '10,2', '', '', 
         'upstream_rateplanid',     'int', 'NULL',      '', '', '', #?
 
+        # how it was rated internally...
+        'ratedetailnum',           'int', 'NULL',      '', '', '',
+        'rated_price',         'decimal', 'NULL',  '10,2', '', '',
+
         'distance',            'decimal', 'NULL',      '', '', '',
         'islocal',                 'int', 'NULL',      '', '', '', # '',  '', 0, '' instead?
 
@@ -1373,7 +1377,7 @@ sub tables_hashref {
         # a svcnum... right..?
         'svcnum',             'int',   'NULL',     '',   '', '', 
 
-        #NULL, done, skipped, pushed_downstream (or something)
+        #NULL, done (or something)
         'freesidestatus', 'varchar',   'NULL',     32,   '', '', 
 
       ],
@@ -1412,6 +1416,39 @@ sub tables_hashref {
       'index'       => [],
     },
 
+    #map upstream rateid (XXX or rateplanid?) to ours...
+    'cdr_upstream_rate' => { # XXX or 'cdr_upstream_rateplan' ??
+      'columns' => [
+        # XXX or 'upstream_rateplanid' ??
+        'upstream_rateid', 'int', 'NULL', '', '', '',
+        'ratedetailnum',   'int', 'NULL', '', '', '',
+      ],
+      'primary_key' => '', #XXX need a primary key
+      'unique' => [ [ 'upstream_rateid' ] ], #unless we add another field, yeah
+      'index'  => [],
+    },
+
+    'inventory_item' => {
+      'columns' => [
+        'itemnum',  'serial',      '',      '', '', '',
+        'classnum', 'int',         '',      '', '', '',
+        'item',     'varchar',     '', $char_d, '', '',
+        'svcnum',   'int',     'NULL',      '', '', '',
+      ],
+      'primary_key' => 'itemnum',
+      'unique' => [ [ 'classnum', 'item' ] ],
+      'index'  => [ [ 'classnum' ], [ 'svcnum' ] ],
+    },
+
+    'inventory_class' => {
+      'columns' => [
+        'classnum',  'serial',       '', '', '', '',
+        'classname', 'varchar', $char_d, '', '', '',
+      ],
+      'primary_key' => 'classnum',
+      'unique' => [],
+      'index'  => [],
+    },
 
   };
 
diff --git a/FS/FS/inventory_class.pm b/FS/FS/inventory_class.pm
new file mode 100644
index 000000000..04ee207d3
--- /dev/null
+++ b/FS/FS/inventory_class.pm
@@ -0,0 +1,164 @@
+package FS::inventory_class;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( dbh qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::inventory_class - Object methods for inventory_class records
+
+=head1 SYNOPSIS
+
+  use FS::inventory_class;
+
+  $record = new FS::inventory_class \%hash;
+  $record = new FS::inventory_class { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::inventory_class object represents a class of inventory, such as "DID 
+numbers" or "physical equipment serials".  FS::inventory_class inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item classnum - primary key
+
+=item classname - Name of this class
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new inventory class.  To add the class to the database, see
+L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'inventory_class'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid inventory class.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('classnum')
+    || $self->ut_textn('classname')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=item num_avail 
+
+Returns the number of available (unused/unallocated) inventory items of this
+class (see L<FS::inventory_item>).
+
+=cut
+
+sub num_avail {
+  shift->num_sql('( svcnum IS NULL OR svcnum = 0 )');
+}
+
+sub num_sql {
+  my( $self, $sql ) = @_;
+  my $sql = "AND $sql" if length($sql);
+  my $statement =
+    "SELECT COUNT(*) FROM inventory_item WHERE classnum = ? $sql";
+  my $sth = dbh->prepare($statement) or die dbh->errstr. " preparing $statement";
+  $sth->execute($self->classnum) or die $sth->errstr. " executing $statement";
+  $sth->fetchrow_arrayref->[0];
+}
+
+=item num_used
+
+Returns the number of used (allocated) inventory items of this class (see
+L<FS::inventory_class>).
+
+=cut
+
+sub num_used {
+  shift->num_sql("svcnum IS NOT NULL AND svcnum > 0 ");
+}
+
+=item num_total
+
+Returns the total number of inventory items of this class (see
+L<FS::inventory_class>).
+
+=cut
+
+sub num_total {
+  shift->num_sql('');
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::inventory_item>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/inventory_item.pm b/FS/FS/inventory_item.pm
new file mode 100644
index 000000000..5312d95f1
--- /dev/null
+++ b/FS/FS/inventory_item.pm
@@ -0,0 +1,126 @@
+package FS::inventory_item;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::inventory_class;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::inventory_item - Object methods for inventory_item records
+
+=head1 SYNOPSIS
+
+  use FS::inventory_item;
+
+  $record = new FS::inventory_item \%hash;
+  $record = new FS::inventory_item { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::inventory_item object represents a specific piece of (real or virtual)
+inventory, such as a specific DID or serial number.  FS::inventory_item
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item itemnum - primary key
+
+=item classnum - Inventory class (see L<FS::inventory_class>)
+
+=item item - Item identifier (unique within its inventory class)
+
+=item svcnum - Customer servcie (see L<FS::cust_svc>)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new item.  To add the item to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'inventory_item'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid item.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('itemnum')
+    || $self->ut_foreign_key('classnum', 'inventory_class', 'classnum' )
+    || $self->ut_text('item')
+    || $self->ut_numbern('svcnum')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index f6f833589..6360d5303 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -262,6 +262,7 @@ t/part_pkg-sql_external.t
 t/part_pkg-sql_generic.t
 t/part_pkg-sqlradacct_hour.t
 t/part_pkg-subscription.t
+t/part_pkg-voip_sqlradacct.t
 t/part_pkg-voip_cdr.t
 t/part_pop_local.t
 t/part_referral.t
@@ -317,3 +318,7 @@ FS/cdr_type.pm
 t/cdr_type.t
 FS/cdr_carrier.pm
 t/cdr_carrier.t
+FS/inventory_class.pm
+t/inventory_class.t
+FS/inventory_item.pm
+t/inventory_item.t
diff --git a/FS/t/inventory_class.t b/FS/t/inventory_class.t
new file mode 100644
index 000000000..80b2fa210
--- /dev/null
+++ b/FS/t/inventory_class.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::inventory_class;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/inventory_item.t b/FS/t/inventory_item.t
new file mode 100644
index 000000000..8ce9d677c
--- /dev/null
+++ b/FS/t/inventory_item.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::inventory_item;
+$loaded=1;
+print "ok 1\n";
diff --git a/bin/generate-table-module b/bin/generate-table-module
index fcc3f1d1f..b3204fa06 100755
--- a/bin/generate-table-module
+++ b/bin/generate-table-module
@@ -13,6 +13,7 @@ my %ut = ( #just guesses
   'number'  => 'float',
   'varchar' => 'text',
   'text'    => 'text',
+  'serial'  => 'number',
 );
 
 my $dbdef_table = dbdef_dist->table($table)
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 1bbea16d1..15f9203f8 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -173,6 +173,8 @@ sub handler
       use FS::XMLRPC;
       use FS::payby;
       use FS::cdr;
+      use FS::inventory_class;
+      use FS::inventory_item;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
@@ -245,8 +247,10 @@ sub handler
 
       sub redirect {
         my( $location ) = @_;
+        warn 'redir1 $m='.$m;
         use vars qw($m);
         $m->clear_buffer;
+        warn 'redir3-prof';
         #false laziness w/above
         if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
 
@@ -263,10 +267,14 @@ sub handler
           );
           dbh->{'private_profile'} = {};
 
-          $m->abort(200);
+          warn 'redir9-prof';
+          my $rv = $m->abort(200);
+          warn "redir10-prof: $rv";
+          $rv;
 
         } else { #normal redirect
 
+          warn 'redir9-redirect';
           $m->redirect($location);
 
         }
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
new file mode 100644
index 000000000..ce6e2dbb1
--- /dev/null
+++ b/httemplate/edit/elements/edit.html
@@ -0,0 +1,118 @@
+<%
+
+  # options example...
+  #
+  # 'name'  =>
+  # 'table' =>
+  # #? 'primary_key' => #required when the dbdef doesn't know...???
+  # 'labels' => {
+  #               'column' => 'Label',
+  #             }
+  #
+  # listref - each item is a literal column name (or method) or (notyet) coderef
+  # if not specified all columns (except for the primary key) will be editable
+  # 'fields' => [
+  #             ]
+  #
+  # 'menubar'     => '', #menubar arrayref
+
+  my(%opt) = @_;
+
+  #false laziness w/process.html
+  my $table = $opt{'table'};
+  my $class = "FS::$table";
+  my $pkey = dbdef->table($table)->primary_key; #? $opt{'primary_key'} || 
+  my $fields = $opt{'fields'}
+               #|| [ grep { $_ ne $pkey } dbdef->table($table)->columns ];
+               || [ grep { $_ ne $pkey } fields($table) ];
+
+  my $object;
+  if ( $cgi->param('error') ) {
+
+    $object = $class->new( {
+      map { $_ => scalar($cgi->param($_)) } fields($table)
+    });
+
+  } elsif ( $cgi->keywords ) { #editing
+
+    my( $query ) = $cgi->keywords;
+    $query =~ /^(\d+)$/;
+    $object = qsearchs( $table, { $pkey => $1 } );
+
+  } else { #adding
+
+    $object = $class->new( {} );
+
+  }
+
+  my $action = $object->$pkey() ? 'Edit' : 'Add';
+
+  my $title = "$action $opt{'name'}";
+
+  my @menubar = ();
+  if ( $opt{'menubar'} ) {
+    @menubar = @{ $opt{'menubar'} };
+  } else {
+    @menubar = (
+      'Main menu' => $p, #eventually get rid of this when the ACL/UI update is done
+      "View all $opt{'name'}s" => "${p}search/$table.html", #eventually use Lingua::bs to pluralize
+    );
+  }
+
+%>
+
+
+<%= include("/elements/header.html", $title,
+              include( '/elements/menubar.html', @menubar )
+           )
+%>
+
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
+<% } %>
+
+<FORM ACTION="<%= popurl(1) %>process/<%= $table %>.html" METHOD=POST>
+<INPUT TYPE="hidden" NAME="<%= $pkey %>" VALUE="<%= $object->$pkey() %>">
+<%= ( $opt{labels} && exists $opt{labels}->{$pkey} )
+      ? $opt{labels}->{$pkey}
+      : $pkey
+%>
+#<%= $object->$pkey() || "(NEW)" %>
+
+<%= ntable("#cccccc",2) %>
+
+<% foreach my $field ( @$fields ) { %>
+
+  <TR>
+
+    <TD ALIGN="right">
+      <%= ( $opt{labels} && exists $opt{labels}->{$field} )
+              ? $opt{labels}->{$field}
+              : $field
+      %>
+    </TD>
+
+    <%
+      #just text in one size for now... eventually more options for
+      # uneditable, hidden, <SELECT>, etc. fields
+    %>
+
+    <TD>
+      <INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= $object->$field() %>">
+    <TD>
+
+  </TR>
+
+<% } %>
+
+</TABLE>
+
+<BR>
+
+<INPUT TYPE="submit" VALUE="<%= $object->$pkey() ? "Apply changes" : "Add $opt{'name'}" %>">
+
+</FORM>
+
+<%= include("/elements/footer.html") %>
+
diff --git a/httemplate/edit/inventory_class.html b/httemplate/edit/inventory_class.html
new file mode 100644
index 000000000..5dde2e595
--- /dev/null
+++ b/httemplate/edit/inventory_class.html
@@ -0,0 +1,9 @@
+<%= include( 'elements/edit.html',
+                 'name'   => 'Inventory Class',
+                 'table'  => 'inventory_class',
+                 'labels' => { 
+                               'classnum'  => 'Class number',
+                               'classname' => 'Class name',
+                             },
+           )
+%>
diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
new file mode 100644
index 000000000..52c876720
--- /dev/null
+++ b/httemplate/edit/process/elements/process.html
@@ -0,0 +1,46 @@
+<%
+
+  # options example...
+  # 
+  # 'table' => 
+  # #? 'primary_key' => #required when the dbdef doesn't know...???
+  # #? 'fields' => []
+
+  my(%opt) = @_;
+
+  #false laziness w/edit.html
+  my $table = $opt{'table'};
+  my $class = "FS::$table";
+  my $pkey = dbdef->table($table)->primary_key; #? $opt{'primary_key'} || 
+  my $fields = $opt{'fields'}
+               #|| [ grep { $_ ne $pkey } dbdef->table($table)->columns ];
+               || [ fields($table) ];
+
+  my $pkeyvalue = $cgi->param($pkey);
+
+  my $old = qsearchs( $table, { $pkey => $pkeyvalue } ) if $pkeyvalue;
+
+  my $new = $class->new( {
+    map {
+      $_, scalar($cgi->param($_));
+    } @$fields
+  } );
+
+  my $error;
+  if ( $pkeyvalue ) {
+    $error = $new->replace($old);
+  } else {
+    warn $new;
+    $error = $new->insert;
+    warn $error;
+    $pkeyvalue = $new->getfield($pkey);
+  }
+
+  if ( $error ) {
+    $cgi->param('error', $error);
+    print $cgi->redirect(popurl(2). "$table.html?". $cgi->query_string );
+  } else { 
+    print $cgi->redirect(popurl(3). "search/$table.html");
+  }
+
+%>
diff --git a/httemplate/edit/process/inventory_class.html b/httemplate/edit/process/inventory_class.html
new file mode 100644
index 000000000..e30e74e7b
--- /dev/null
+++ b/httemplate/edit/process/inventory_class.html
@@ -0,0 +1,4 @@
+<%= include( 'elements/process.html',
+               'table' => 'inventory_class',
+           )
+%>
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index d19fb4acd..b14bded10 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -1,5 +1,73 @@
 <%
 
+  # options example...  
+  # (everything not commented required is optional)
+  #
+  # # basic options, required
+  # 'title'       => 'Page title',
+  # 'name'        => 'items', #name for the records returned
+  #
+  # # some HTML callbacks...
+  # 'menubar'     => '', #menubar arrayref
+  # 'html_init'   => '', #after the header/menubar and before the pager
+  #
+  # #literal SQL query string or qsearch hashref, required
+  # 'query'       => {
+  #                    'table'     => 'tablename',
+  #                    #everything else is optional...
+  #                    'hashref'   => { 'field' => 'value',
+  #                                     'field' => { 'op'    => '<',
+  #                                                  'value' => '54',
+  #                                                },
+  #                                   },
+  #                    'select'    => '*',
+  #                    'addl_from' => '', #'LEFT JOIN othertable USING ( key )',
+  #                    'extra_sql' => '', #'AND otherstuff', #'WHERE onlystuff',
+  #                    
+  #
+  #                  },
+  #                  # "select * from tablename";
+  #
+  # #required unless 'query' is an SQL query string (shouldn't be...)
+  # 'count_query' => 'SELECT COUNT(*) FROM tablename',
+  #
+  # 'count_addl' => [], #additional count fields listref of sprintf strings
+  #                     # [ $money_char.'%.2f total paid', ],
+  #
+  # #listref of column labels, <TH>
+  # #required unless 'query' is an SQL query string
+  # # (if not specified the database column names will be used)
+  # 'header'      => [ '#', 'Item' ],
+  #
+  # #listref - each item is a literal column name (or method) or coderef
+  # #if not specified all columns will be shown
+  # 'fields'      => [
+  #                    'column',
+  #                    sub { my $row = shift; $row->column; },
+  #                  ],
+  #
+  # #listref of column footers
+  # 'footer'      => [],
+  # 
+  # #listref - each item is the empty string, or a listref of ...
+  # 'links'       =>
+  #
+  #
+  # 'align'       => 'lrc.', #one letter for each column, left/right/center/none
+  #                          # can also pass a listref with full values:
+  #                          # [ 'left', 'right', 'center', '' ]
+  #
+  # #listrefs...
+  # #currently only HTML, maybe eventually Excel too
+  # 'color'       => [],
+  # 'size'        => [],
+  # 'style'       => [],
+  # 
+  # #redirect if there's only one item...
+  # # listref of URL base and column name (or method)
+  # # or a coderef that returns the same
+  # 'redirect' =>
+
   my(%opt) = @_;
   #warn join(' / ', map { "$_ => $opt{$_}" } keys %opt ). "\n";
 
@@ -189,7 +257,9 @@
       redirect( $url. $rows->[0]->$method() );
     } else {
       ( my $xlsname = $opt{'name'} ) =~ s/\W//g;
-      $opt{'name'} =~ s/s$// if $total == 1;
+      #$opt{'name'} =~ s/s$// if $total == 1;
+      $opt{'name'} =~ s/((s)e)?s$/$2/ if $total == 1;  #should use Lingua::bs
+                                                       # to "depluralize"
 
       my @menubar = ();
       if ( $opt{'menubar'} ) {
@@ -197,6 +267,8 @@
       } else {
         @menubar = ( 'Main menu' => $p );
       }
+
+
   %>
   <%= include( '/elements/header.html', $opt{'title'},
                  include( '/elements/menubar.html', @menubar )
@@ -239,7 +311,8 @@
             <%= include('/elements/table-grid.html') %>
 
               <TR>
-              <% foreach my $header ( @$header ) { %>
+              <% 
+                 foreach my $header ( @$header ) { %>
                    <TH CLASS="grid" BGCOLOR="#cccccc"><%= $header %></TH>
               <% } %>
               </TR>
@@ -386,7 +459,6 @@
       </TABLE>
   
   <% } %>
-  </BODY>
-  </HTML>
+  <%= include( '/elements/footer.html' ) %>
   <% } %>
 <% } %>
diff --git a/httemplate/search/inventory_class.html b/httemplate/search/inventory_class.html
new file mode 100644
index 000000000..1bf1bcbce
--- /dev/null
+++ b/httemplate/search/inventory_class.html
@@ -0,0 +1,58 @@
+<%
+
+tie my %labels, 'Tie::IxHash',
+  'num_avail' => 'Available', #  <FONT SIZE="-1"><A HREF="eventually">(upload batch)</A></FONT>',
+  'num_used'  => 'In use', #'Used', #'Allocated',
+  'num_total' => 'Total',
+;
+my %inv_action_link = (
+  'num_avail' => 'eventually'
+);
+my %inv_action_label = (
+  'num_avail' => 'upload_batch'
+);
+
+my $link = [ "${p}edit/inventory_class.html?", 'classnum' ];
+
+%><%= include( 'elements/search.html',
+                 'title'       => 'Inventory Classes',
+                 'name'        => 'inventory classes',
+                 'menubar'     => [ 'Add a new inventory class' =>
+                                      $p.'edit/inventory_class.html',
+                                  ],
+                 'query'       => { 'table' => 'inventory_class', },
+                 'count_query' => 'SELECT COUNT(*) FROM inventory_class',
+                 'header'      => [ '#', 'Inventory class', 'Inventory' ],
+                 'fields'      => [ 'classnum',
+                                    'classname',
+                                    sub {
+                                          #my $inventory_class = shift;
+                                          my $i_c = shift;
+
+                                          [ map {
+                                                  [
+                                                    {
+                                                      'data'  => '<B>'. $i_c->$_(). '</B>',
+                                                      'align' => 'right',
+                                                    },
+                                                    {
+                                                      'data'  => $labels{$_},
+                                                      'align' => 'left',
+                                                    },
+                                                    { 'data'  => ( exists($inv_action_link{$_})
+                                                                   ? '<FONT SIZE="-1">(<A HREF="'. $inv_action_link{$_}. '">'. $inv_action_label{$_}. '</A>)</FONT>'
+                                                                   : ''
+                                                                 ),
+                                                      'align'  => 'left',
+                                                    },
+                                                  ]
+                                                } keys %labels
+                                          ];
+                                        },
+                                  ],
+                 'links'       => [ $link,
+                                    $link,
+                                    '',
+                                  ],
+             )
+%>
diff --git a/httemplate/search/inventory_item.html b/httemplate/search/inventory_item.html
new file mode 100644
index 000000000..ff7f1fadf
--- /dev/null
+++ b/httemplate/search/inventory_item.html
@@ -0,0 +1,35 @@
+<%
+
+my $classnum = $cgi->param('classnum');
+$classnum =~ /^(\d+)$/ or eidiot "illegal agentnum $agentnum";
+$classnum = $1;
+my $inventory_class = qsearchs('inventory_class', { 'classnum' => $classnum } );
+
+my $count_query =
+  "SELECT COUNT(*) FROM inventory_class WHERE classnum = $classnum";
+
+%><%= include( 'elements/search.html',
+                 'title'       => $inventory_class->classname. ' Inventory',
+
+                 #less lame to use Lingua:: something to pluralize
+                 'name'        => $inventory_class->classname. 's',
+
+                 'query'       => {
+                                    'table'   => 'inventory_item',
+                                    'hashref' => { 'classnum' => $classnum },
+                                  },
+
+                 'count_query' => $count_query,
+
+                 # XXX proper full service/customer link ala svc_acct
+                 'header'      => [ '#', $inventory_class->classname, 'svcnum' ],
+
+                 'fields'      => [
+                   'itemnum',
+                   'item',
+                   'svcnum', #XXX proper full service customer link ala svc_acct
+                             # "unallocated" ?  "available" ?
+                 ],
+
+             )
+%>
-- 
cgit v1.2.1


From 6d2cd8e6fc566b4fccd0075156e3e1ddd59fa042 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Mar 2006 12:14:04 +0000
Subject:  Add an option to the web interface to batch upload new entries to
 the inventory_item table.

---
 FS/FS/inventory_item.pm                            | 83 +++++++++++++++++++++-
 httemplate/misc/inventory_item-import.html         | 20 ++++++
 httemplate/misc/process/inventory_item-import.html | 27 +++++++
 httemplate/search/inventory_class.html             | 49 ++++++++++---
 httemplate/search/inventory_item.html              | 25 +++++--
 5 files changed, 188 insertions(+), 16 deletions(-)
 create mode 100644 httemplate/misc/inventory_item-import.html
 create mode 100644 httemplate/misc/process/inventory_item-import.html

diff --git a/FS/FS/inventory_item.pm b/FS/FS/inventory_item.pm
index 5312d95f1..23bacf040 100644
--- a/FS/FS/inventory_item.pm
+++ b/FS/FS/inventory_item.pm
@@ -2,8 +2,9 @@ package FS::inventory_item;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( dbh qsearch qsearchs );
 use FS::inventory_class;
+use FS::cust_svc;
 
 @ISA = qw(FS::Record);
 
@@ -105,20 +106,96 @@ sub check {
     $self->ut_numbern('itemnum')
     || $self->ut_foreign_key('classnum', 'inventory_class', 'classnum' )
     || $self->ut_text('item')
-    || $self->ut_numbern('svcnum')
+    || $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum' )
   ;
   return $error if $error;
 
   $self->SUPER::check;
 }
 
+=item cust_svc
+
+Returns the customer service associated with this inventory item, if the
+item has been used (see L<FS::cust_svc>).
+
+=cut
+
+sub cust_svc {
+  my $self = shift;
+  return '' unless $self->svcnum;
+  qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
+}
+
+=back
+
+=head1 CLASS METHODS
+
+=over 4
+
+=item batch_import
+
+=cut
+
+sub batch_import {
+  my $param = shift;
+
+  my $fh = $param->{filehandle};
+
+  my $imported = 0;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+  
+  my $line;
+  while ( defined($line=<$fh>) ) {
+
+    chomp $line;
+
+    my $inventory_item = new FS::inventory_item {
+      'classnum' => $param->{'classnum'},
+      'item'     => $line,
+    };
+
+    my $error = $inventory_item->insert;
+
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+
+      #or just skip?
+      #next;
+    }
+
+    $imported++;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  #might want to disable this if we skip records for any reason...
+  return "Empty file!" unless $imported;
+
+  '';
+
+}
+
 =back
 
 =head1 BUGS
 
+maybe batch_import should be a regular method in FS::inventory_class
+
 =head1 SEE ALSO
 
-L<FS::Record>, schema.html from the base documentation.
+L<inventory_class>, L<cust_svc>, L<FS::Record>, schema.html from the base
+documentation.
 
 =cut
 
diff --git a/httemplate/misc/inventory_item-import.html b/httemplate/misc/inventory_item-import.html
new file mode 100644
index 000000000..a702fbc49
--- /dev/null
+++ b/httemplate/misc/inventory_item-import.html
@@ -0,0 +1,20 @@
+<%
+
+my $classnum = $cgi->param('classnum');
+$classnum =~ /^(\d+)$/ or eidiot "illegal classnum $classnum";
+$classnum = $1;
+my $inventory_class = qsearchs('inventory_class', { 'classnum' => $classnum } );
+
+%><%= include("/elements/header.html", $inventory_class->classname. 's') %>
+
+<FORM ACTION="process/inventory_item-import.html" METHOD="POST" ENCTYPE="multipart/form-data">
+<INPUT TYPE="hidden" NAME="classnum" VALUE="<%= $classnum %>">
+Import a file containing <%= $inventory_class->classname %>s, one per line.<BR><BR>
+
+Filename: <INPUT TYPE="file" NAME="filename"><BR><BR>
+
+<INPUT TYPE="submit" VALUE="Upload">
+</FORM>
+
+<%= include('/elements/footer.html') %>
+
diff --git a/httemplate/misc/process/inventory_item-import.html b/httemplate/misc/process/inventory_item-import.html
new file mode 100644
index 000000000..8a58203c2
--- /dev/null
+++ b/httemplate/misc/process/inventory_item-import.html
@@ -0,0 +1,27 @@
+<%
+
+  my $fh = $cgi->upload('filename');
+
+  my $error = defined($fh)
+    ? FS::inventory_item::batch_import( {
+        'filehandle' => $fh,
+        'classnum'   => $cgi->param('classnum'),
+      } )
+    : 'No file';
+
+  if ( $error ) {
+    %>
+    <!-- mason kludge -->
+    <%
+    eidiot($error);
+#    $cgi->param('error', $error);
+#    print $cgi->redirect( "${p}cust_main-import.cgi
+  } else {
+    %>
+    <!-- mason kludge -->
+    <%= include("/elements/header.html",'Import sucessful') %>
+    <!-- XXX redirect to batch search like the payment entry... -->
+    <%= include("/elements/footer.html",'Import sucessful') %> <%
+  }
+%>
+
diff --git a/httemplate/search/inventory_class.html b/httemplate/search/inventory_class.html
index 1bf1bcbce..37735f3c9 100644
--- a/httemplate/search/inventory_class.html
+++ b/httemplate/search/inventory_class.html
@@ -5,11 +5,18 @@ tie my %labels, 'Tie::IxHash',
   'num_used'  => 'In use', #'Used', #'Allocated',
   'num_total' => 'Total',
 ;
-my %inv_action_link = (
-  'num_avail' => 'eventually'
+
+my %link = (
+  'num_avail' => ';avail=1',
+  'num_used'  => ';avail=1',
+  'num_total' => '',
 );
-my %inv_action_label = (
-  'num_avail' => 'upload_batch'
+
+my %inv_action_link = (
+  'num_avail' => [ 'upload batch',
+                   $p.'misc/inventory_item-import.html?classnum=',
+                   'classnum'
+                 ],
 );
 
 my $link = [ "${p}edit/inventory_class.html?", 'classnum' ];
@@ -29,20 +36,44 @@ my $link = [ "${p}edit/inventory_class.html?", 'classnum' ];
                                           #my $inventory_class = shift;
                                           my $i_c = shift;
 
+                                          my $link =
+                                            $p. 'search/inventory_item.html?'.
+                                            'classnum='. $i_c->classnum;
+
+                                          my %actioncol = ();
+                                          foreach ( keys %inv_action_link ) {
+                                            my($label, $baseurl, $method) =
+                                              @{ $inv_action_link{$_} };
+                                            my $url = $baseurl. $i_c->$method();
+                                            $actioncol{$_} =
+                                              '<FONT SIZE="-1">'.
+                                              '('.
+                                              '<A HREF="'.$url.'">'.
+                                              $label.
+                                              '</A>'.
+                                              ')'.
+                                              '</FONT>';
+                                          }
+
+                                          my %num = map { 
+                                            $_ => $i_c->$_();
+                                          } keys %labels;
+
                                           [ map {
                                                   [
                                                     {
-                                                      'data'  => '<B>'. $i_c->$_(). '</B>',
+                                                      'data'  => '<B>'. $num{$_}. '</B>',
                                                       'align' => 'right',
                                                     },
                                                     {
                                                       'data'  => $labels{$_},
                                                       'align' => 'left',
-                                                    },
-                                                    { 'data'  => ( exists($inv_action_link{$_})
-                                                                   ? '<FONT SIZE="-1">(<A HREF="'. $inv_action_link{$_}. '">'. $inv_action_label{$_}. '</A>)</FONT>'
-                                                                   : ''
+                                                      'link'  => ( $num{$_}
+                                                                     ? $link.$link{$_}
+                                                                     : ''
                                                                  ),
+                                                    },
+                                                    { 'data'  => $actioncol{$_},
                                                       'align'  => 'left',
                                                     },
                                                   ]
diff --git a/httemplate/search/inventory_item.html b/httemplate/search/inventory_item.html
index ff7f1fadf..bd74f5619 100644
--- a/httemplate/search/inventory_item.html
+++ b/httemplate/search/inventory_item.html
@@ -1,15 +1,31 @@
 <%
 
 my $classnum = $cgi->param('classnum');
-$classnum =~ /^(\d+)$/ or eidiot "illegal agentnum $agentnum";
+$classnum =~ /^(\d+)$/ or eidiot "illegal classnum $classnum";
 $classnum = $1;
-my $inventory_class = qsearchs('inventory_class', { 'classnum' => $classnum } );
+
+my $inventory_class = qsearchs( {
+  'table'     => 'inventory_class',
+  'hashref'   => { 'classnum' => $classnum },
+} );
+
+my $title = $inventory_class->classname. ' Inventory';
+
+#little false laziness with SQL fragments in inventory_class.pm
+my $extra_sql = '';
+if ( $cgi->param('avail') ) {
+  $extra_sql = 'AND ( svcnum IS NULL OR svcnum = 0 )';
+  $title .= ' - Available';
+} elsif ( $cgi->param('used') ) {
+  $extra_sql = 'AND svcnum IS NOT NULL AND svcnum > 0';
+  $title .= ' - In use';
+}
 
 my $count_query =
-  "SELECT COUNT(*) FROM inventory_class WHERE classnum = $classnum";
+  "SELECT COUNT(*) FROM inventory_item WHERE classnum = $classnum $extra_sql";
 
 %><%= include( 'elements/search.html',
-                 'title'       => $inventory_class->classname. ' Inventory',
+                 'title'       => $title,
 
                  #less lame to use Lingua:: something to pluralize
                  'name'        => $inventory_class->classname. 's',
@@ -17,6 +33,7 @@ my $count_query =
                  'query'       => {
                                     'table'   => 'inventory_item',
                                     'hashref' => { 'classnum' => $classnum },
+                                    'extra_sql' => $extra_sql,
                                   },
 
                  'count_query' => $count_query,
-- 
cgit v1.2.1


From b3d608b436cdf673a5552acf9e4b4601f4f79b9d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 Mar 2006 11:48:06 +0000
Subject: don't use a table with WIDTH="100%", it shoves the custnum and
 "billing information" boxes way out to the right

---
 httemplate/view/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 4975c52fd..082a93bb7 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -92,12 +92,12 @@ print "This customer's signup URL: ".
 %>
 
 <A NAME="cust_main"></A>
-<%= &itable() %>
+<TABLE BORDER=0>
 <TR>
   <TD VALIGN="top">
     <%= include('cust_main/contacts.html', $cust_main ) %>
   </TD>
-  <TD VALIGN="top">
+  <TD VALIGN="top" STYLE="padding-left: 54px">
     <%= include('cust_main/misc.html', $cust_main ) %>
     <% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
       <BR>
-- 
cgit v1.2.1


From 9f69daa6b11920b84840c17bf95955dee959367e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 Mar 2006 13:42:40 +0000
Subject: fix that
 blank-page-instead-of-profiling-redirect-when-called-from-an-include bug
 triggered by mason 1.32 :)

---
 htetc/handler.pl | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 15f9203f8..9b808e68c 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -247,10 +247,8 @@ sub handler
 
       sub redirect {
         my( $location ) = @_;
-        warn 'redir1 $m='.$m;
         use vars qw($m);
         $m->clear_buffer;
-        warn 'redir3-prof';
         #false laziness w/above
         if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
 
@@ -267,14 +265,13 @@ sub handler
           );
           dbh->{'private_profile'} = {};
 
-          warn 'redir9-prof';
-          my $rv = $m->abort(200);
-          warn "redir10-prof: $rv";
-          $rv;
+          #whew.  removing this is all that's needed to fix the annoying
+          #blank-page-instead-of-profiling-redirect-when-called-from-an-include
+          #bug triggered by mason 1.32
+          #my $rv = $m->abort(200);
 
         } else { #normal redirect
 
-          warn 'redir9-redirect';
           $m->redirect($location);
 
         }
-- 
cgit v1.2.1


From b29780b983dd91fb679e8d01b91902b0ce186e9f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 Mar 2006 22:28:17 +0000
Subject: want to know who *called* this without the required second arg

---
 FS/FS/UI/Web.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index 49e3fbf7e..dc45e0188 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -131,6 +131,7 @@ package FS::UI::Web::JSRPC;
 
 use strict;
 use vars qw($DEBUG);
+use Carp;
 use Storable qw(nfreeze);
 use MIME::Base64;
 use JSON;
@@ -150,7 +151,7 @@ sub new {
 
         bless $self, $class;
 
-        die "CGI object required as second argument" unless $self->{'cgi'};
+        croak "CGI object required as second argument" unless $self->{'cgi'};
 
         return $self;
 }
-- 
cgit v1.2.1


From 5f155263a2c9837640d2fab0817d1f36b8cb3f8c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 Mar 2006 22:30:48 +0000
Subject: fix to (hopefully) allow multiple progress-init's in a page, also add
 second $cgi arg to all these progressbar calls...

---
 httemplate/elements/progress-init.html   | 8 ++++----
 httemplate/misc/email_invoice_events.cgi | 2 +-
 httemplate/misc/email_invoices.cgi       | 2 +-
 httemplate/misc/fax_invoice_events.cgi   | 2 +-
 httemplate/misc/fax_invoices.cgi         | 2 +-
 httemplate/misc/print_invoice_events.cgi | 2 +-
 httemplate/misc/print_invoices.cgi       | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index 7844f5678..ba9f6edd6 100644
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -14,7 +14,7 @@
 <%= include('/elements/xmlhttp.html',
               'method' => 'POST',
               'url'    => $action,
-              'subs'   => [ 'start_job' ],
+              'subs'   => [ $key.'start_job' ],
            )
 %>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
@@ -32,7 +32,7 @@ function <%=$key%>process () {
 
   document.<%=$formname%>.submit.disabled=true;
 
-  overlib( 'Submitting job to server...', WIDTH, 432, HEIGHT, 136, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
+  overlib( 'Submitting job to server...', WIDTH, 444, HEIGHT, 168, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
 
   var Hash = new Array();
   var x = 0;
@@ -68,13 +68,13 @@ function <%=$key%>process () {
 
   //alert('start_job( ' + Hash + ', <%=$key%>myCallback )' );
   //alert('start_job()' );
-  start_job( Hash, <%=$key%>myCallback );
+  <%=$key%>start_job( Hash, <%=$key%>myCallback );
 
 }
 
 function <%=$key%>myCallback( jobnum ) {
 
-  overlib( OLiframeContent('<%=$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%=$url_or_message_link%>;formname=<%=$formname%>' , 432, 136, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
+  overlib( OLiframeContent('<%=$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%=$url_or_message_link%>;formname=<%=$formname%>' , 444, 168, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
 
 }
 
diff --git a/httemplate/misc/email_invoice_events.cgi b/httemplate/misc/email_invoice_events.cgi
index 12d58d608..b5e66d5ac 100644
--- a/httemplate/misc/email_invoice_events.cgi
+++ b/httemplate/misc/email_invoice_events.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reemail';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reemail', $cgi;
 $server->process;
 
 %>
diff --git a/httemplate/misc/email_invoices.cgi b/httemplate/misc/email_invoices.cgi
index 0a3978395..bd231261c 100644
--- a/httemplate/misc/email_invoices.cgi
+++ b/httemplate/misc/email_invoices.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reemail';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reemail', $cgi;
 $server->process;
 
 %>
diff --git a/httemplate/misc/fax_invoice_events.cgi b/httemplate/misc/fax_invoice_events.cgi
index a8ded0550..9a5e8aaea 100644
--- a/httemplate/misc/fax_invoice_events.cgi
+++ b/httemplate/misc/fax_invoice_events.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_refax';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_refax', $cgi;
 $server->process;
 
 %>
diff --git a/httemplate/misc/fax_invoices.cgi b/httemplate/misc/fax_invoices.cgi
index f16ba8b5e..24bee7da9 100644
--- a/httemplate/misc/fax_invoices.cgi
+++ b/httemplate/misc/fax_invoices.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_refax';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_refax', $cgi;
 $server->process;
 
 %>
diff --git a/httemplate/misc/print_invoice_events.cgi b/httemplate/misc/print_invoice_events.cgi
index c6a7885a4..3cf4cf7c8 100644
--- a/httemplate/misc/print_invoice_events.cgi
+++ b/httemplate/misc/print_invoice_events.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reprint';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reprint', $cgi;
 $server->process;
 
 %>
diff --git a/httemplate/misc/print_invoices.cgi b/httemplate/misc/print_invoices.cgi
index d7b271c37..6d32eaaac 100644
--- a/httemplate/misc/print_invoices.cgi
+++ b/httemplate/misc/print_invoices.cgi
@@ -1,6 +1,6 @@
 <%
 
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reprint';
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reprint', $cgi;
 $server->process;
 
 %>
-- 
cgit v1.2.1


From 36d9b47e5c20ae3bc71c0bd0eaf289b566d0cf7c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Mar 2006 05:21:20 +0000
Subject: fix the progressbar bug with multiple progressbar forms on a page

---
 httemplate/elements/progress-init.html   | 3 ++-
 httemplate/elements/xmlhttp.html         | 5 +++--
 httemplate/misc/email_invoice_events.cgi | 5 +----
 httemplate/misc/email_invoices.cgi       | 5 +----
 httemplate/misc/fax_invoice_events.cgi   | 7 ++-----
 httemplate/misc/fax_invoices.cgi         | 7 ++-----
 httemplate/misc/print_invoice_events.cgi | 7 ++-----
 httemplate/misc/print_invoices.cgi       | 7 ++-----
 8 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index ba9f6edd6..efebe48e9 100644
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -14,7 +14,8 @@
 <%= include('/elements/xmlhttp.html',
               'method' => 'POST',
               'url'    => $action,
-              'subs'   => [ $key.'start_job' ],
+              'subs'   => [ 'start_job' ],
+              'key'    => $key,
            )
 %>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
diff --git a/httemplate/elements/xmlhttp.html b/httemplate/elements/xmlhttp.html
index 28130e501..e03438822 100644
--- a/httemplate/elements/xmlhttp.html
+++ b/httemplate/elements/xmlhttp.html
@@ -4,6 +4,7 @@
   my $url = $opt{'url'};
   my $method = exists($opt{'method'}) ? $opt{'method'} : 'GET';
   #my @subs = @{ $opt{'subs'};
+  my $key = exists($opt{'key'}) ? $opt{'key'} : '';
 
   $url .= ( ($url =~ /\?/) ? '&' : '?' )
     if $method eq 'GET';
@@ -38,10 +39,10 @@
 
   %>
 
-    function <%=$func%>() {
+    function <%=$key%><%=$func%>() {
         // count args; build URL
         var url = "<%=$furl%>";
-        var a = <%=$func%>.arguments;
+        var a = <%=$key%><%=$func%>.arguments;
 
         var args;
         var len;
diff --git a/httemplate/misc/email_invoice_events.cgi b/httemplate/misc/email_invoice_events.cgi
index b5e66d5ac..3a39bcd19 100644
--- a/httemplate/misc/email_invoice_events.cgi
+++ b/httemplate/misc/email_invoice_events.cgi
@@ -1,6 +1,3 @@
 <%
-
 my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reemail', $cgi;
-$server->process;
-
-%>
+%><%= $server->process %>
diff --git a/httemplate/misc/email_invoices.cgi b/httemplate/misc/email_invoices.cgi
index bd231261c..490c42f52 100644
--- a/httemplate/misc/email_invoices.cgi
+++ b/httemplate/misc/email_invoices.cgi
@@ -1,6 +1,3 @@
 <%
-
 my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reemail', $cgi;
-$server->process;
-
-%>
+%><%= $server->process %>
diff --git a/httemplate/misc/fax_invoice_events.cgi b/httemplate/misc/fax_invoice_events.cgi
index 9a5e8aaea..778c4291e 100644
--- a/httemplate/misc/fax_invoice_events.cgi
+++ b/httemplate/misc/fax_invoice_events.cgi
@@ -1,6 +1,3 @@
-<%
-
+<% 
 my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_refax', $cgi;
-$server->process;
-
-%>
+%><%= $server->process %>
diff --git a/httemplate/misc/fax_invoices.cgi b/httemplate/misc/fax_invoices.cgi
index 24bee7da9..b3238885f 100644
--- a/httemplate/misc/fax_invoices.cgi
+++ b/httemplate/misc/fax_invoices.cgi
@@ -1,6 +1,3 @@
-<%
-
+<% 
 my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_refax', $cgi;
-$server->process;
-
-%>
+%><%= $server->process %>
diff --git a/httemplate/misc/print_invoice_events.cgi b/httemplate/misc/print_invoice_events.cgi
index 3cf4cf7c8..897c39ede 100644
--- a/httemplate/misc/print_invoice_events.cgi
+++ b/httemplate/misc/print_invoice_events.cgi
@@ -1,6 +1,3 @@
 <%
-
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reprint', $cgi;
-$server->process;
-
-%>
+my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reprint', $cgi; %>
+<%= $server->process %>
diff --git a/httemplate/misc/print_invoices.cgi b/httemplate/misc/print_invoices.cgi
index 6d32eaaac..218262077 100644
--- a/httemplate/misc/print_invoices.cgi
+++ b/httemplate/misc/print_invoices.cgi
@@ -1,6 +1,3 @@
-<%
-
+<% 
 my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reprint', $cgi;
-$server->process;
-
-%>
+%><%= $server->process %>
-- 
cgit v1.2.1


From d6a8b9a62765dbfe757e97c35a1c3ba2e0a32b42 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Mar 2006 07:27:40 +0000
Subject: some pages from ui hoohaw have leaked footer include, need something
 here for now

---
 httemplate/elements/footer.html | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 httemplate/elements/footer.html

diff --git a/httemplate/elements/footer.html b/httemplate/elements/footer.html
new file mode 100644
index 000000000..6029d7637
--- /dev/null
+++ b/httemplate/elements/footer.html
@@ -0,0 +1,2 @@
+  </BODY>
+</HTML>
-- 
cgit v1.2.1


From c1bc54f7523d2af6114d7445bbbe5618f1429794 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Mar 2006 22:32:51 +0000
Subject: fix progress hoohaw for internet exploder again, whew.  also make
 sure error/finish messages are centered, looks better

---
 httemplate/elements/progress-init.html  |  4 +++-
 httemplate/elements/progress-popup.html | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index efebe48e9..ec485f438 100644
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -31,7 +31,9 @@ function <%=$key%>process () {
 
   //alert('<%=$key%>process for form <%=$formname%>');
 
-  document.<%=$formname%>.submit.disabled=true;
+  if ( document.<%=$formname%>.submit.disabled == false ) {
+    document.<%=$formname%>.submit.disabled=true;
+  }
 
   overlib( 'Submitting job to server...', WIDTH, 444, HEIGHT, 168, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
 
diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html
index 200f97d9b..544440138 100644
--- a/httemplate/elements/progress-popup.html
+++ b/httemplate/elements/progress-popup.html
@@ -45,7 +45,9 @@ function updateStatus( status_statustext ) {
     document.getElementById("progress_bar").innerHTML = '';
     document.getElementById("progress_percent").innerHTML = '<INPUT TYPE="button" VALUE="OK" onClick="parent.nd(1);">';
     document.getElementById("progress_jobnum").innerHTML = '';
-    parent.document.<%=$formname%>.submit.disabled=false;
+    if ( parent.document.<%=$formname%>.submit.disabled == true ) {
+      parent.document.<%=$formname%>.submit.disabled=false;
+    }
 <% } elsif ( $url ) { %>
     window.top.location.href = '<%= $url %>';
 <% } else { %>
@@ -56,7 +58,9 @@ function updateStatus( status_statustext ) {
     document.getElementById("progress_bar").innerHTML = '';
     document.getElementById("progress_percent").innerHTML = '<INPUT TYPE="button" VALUE="OK" onClick="parent.nd(1);">';
     document.getElementById("progress_jobnum").innerHTML = '';
-    parent.document.<%=$formname%>.submit.disabled=false;
+    if ( parent.document.<%=$formname%>.submit.disabled == true ) {
+      parent.document.<%=$formname%>.submit.disabled=false;
+    }
   } else {
     alert('XXX unknown status returned from server: ' + status);
   }
@@ -64,7 +68,7 @@ function updateStatus( status_statustext ) {
 }
 </SCRIPT>
 
-    <TABLE>
+    <TABLE WIDTH="100%">
       <TR>
         <TD ALIGN="center" ID="progress_message">
           Server processing job...
-- 
cgit v1.2.1


From a1f6d8a9fde8eb15e0c0e3161f4e2e740d45d47b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Mar 2006 04:17:08 +0000
Subject: handle BIGSERIAL like SERIAL for the cdr table, and normalize
 canadian zip codes as well as us ones

---
 FS/FS/Record.pm | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 4a0fe3fd2..a7af708a3 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -285,7 +285,7 @@ sub qsearch {
         if ( $op eq '=' ) {
           if ( driver_name eq 'Pg' ) {
             my $type = dbdef->table($table)->column($column)->type;
-            if ( $type =~ /(int|serial)/i ) {
+            if ( $type =~ /(int|(big)?serial)/i ) {
               qq-( $column IS NULL )-;
             } else {
               qq-( $column IS NULL OR $column = '' )-;
@@ -296,7 +296,7 @@ sub qsearch {
         } elsif ( $op eq '!=' ) {
           if ( driver_name eq 'Pg' ) {
             my $type = dbdef->table($table)->column($column)->type;
-            if ( $type =~ /(int|serial)/i ) {
+            if ( $type =~ /(int|(big)?serial)/i ) {
               qq-( $column IS NOT NULL )-;
             } else {
               qq-( $column IS NOT NULL AND $column != '' )-;
@@ -365,7 +365,7 @@ sub qsearch {
     grep defined( $record->{$_} ) && $record->{$_} ne '', @real_fields
   ) {
     if ( $record->{$field} =~ /^\d+(\.\d+)?$/
-         && dbdef->table($table)->column($field)->type =~ /(int|serial)/i
+         && dbdef->table($table)->column($field)->type =~ /(int|(big)?serial)/i
     ) {
       $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_INTEGER } );
     } else {
@@ -695,7 +695,7 @@ sub insert {
     my $col = $self->dbdef_table->column($primary_key);
     
     $db_seq =
-      uc($col->type) eq 'SERIAL'
+      uc($col->type) =~ /^(BIG)?SERIAL\d?/
       || ( driver_name eq 'Pg'
              && defined($col->default)
              && $col->default =~ /^nextval\(/i
@@ -1026,7 +1026,7 @@ sub replace {
          #false laziness w/qsearch
          if ( driver_name eq 'Pg' ) {
             my $type = $old->dbdef_table->column($_)->type;
-            if ( $type =~ /(int|serial)/i ) {
+            if ( $type =~ /(int|(big)?serial)/i ) {
               qq-( $_ IS NULL )-;
             } else {
               qq-( $_ IS NULL OR $_ = '' )-;
@@ -1498,12 +1498,23 @@ my @zip_reqd_countries = qw( CA ); #US implicit...
 
 sub ut_zip {
   my( $self, $field, $country ) = @_;
+
   if ( $country eq 'US' ) {
-    $self->getfield($field) =~ /\s*(\d{5}(\-\d{4})?)\s*$/
+
+    $self->getfield($field) =~ /^\s*(\d{5}(\-\d{4})?)\s*$/
+      or return gettext('illegal_zip'). " $field for country $country: ".
+                $self->getfield($field);
+    $self->setfield($field, $1);
+
+  } elsif ( $country eq 'CA' ) {
+
+    $self->getfield($field) =~ /^\s*([A-Z]\d[A-Z])\s*(\d[A-Z]\d)\s*$/i
       or return gettext('illegal_zip'). " $field for country $country: ".
                 $self->getfield($field);
-    $self->setfield($field,$1);
+    $self->setfield($field, "$1 $2");
+
   } else {
+
     if ( $self->getfield($field) =~ /^\s*$/
          && ( !$country || ! grep { $_ eq $country } @zip_reqd_countries )
        )
@@ -1514,7 +1525,9 @@ sub ut_zip {
         or return gettext('illegal_zip'). " $field: ". $self->getfield($field);
       $self->setfield($field,$1);
     }
+
   }
+
   '';
 }
 
-- 
cgit v1.2.1


From 28dce0fc53d43134dcfcbfab1d8805094ae89789 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Mar 2006 07:34:58 +0000
Subject: initial commit of this just cause i want a revision history

---
 FS/FS/part_pkg/voip_cdr.pm | 258 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 258 insertions(+)
 create mode 100644 FS/FS/part_pkg/voip_cdr.pm

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
new file mode 100644
index 000000000..385fcb2e5
--- /dev/null
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -0,0 +1,258 @@
+package FS::part_pkg::voip_cdr;
+
+use strict;
+use vars qw(@ISA $DEBUG %info);
+use Date::Format;
+use Tie::IxHash;
+use FS::Record qw(qsearchs qsearch);
+use FS::part_pkg::flat;
+#use FS::rate;
+use FS::rate_prefix;
+
+@ISA = qw(FS::part_pkg::flat);
+
+$DEBUG = 1;
+
+tie my %region_method, 'Tie::IxHash',
+  'prefix' => 'Rate calls by using destination prefix to look up a region and rate according to the internal prefix and rate tables',
+  'upstream_rateid' => 'Rate calls by mapping the upstream rate ID (# rate plan ID?) directly to an internal rate (rate_detail)', #upstream_rateplanid
+;
+
+#tie my %cdr_location, 'Tie::IxHash',
+#  'internal' => 'Internal: CDR records imported into the internal CDR table',
+#  'external' => 'External: CDR records queried directly from an external '.
+#                'Asterisk (or other?) CDR table',
+#;
+
+%info = (
+  'name' => 'VoIP rating by plan of CDR records in an internal (or external?) SQL table',
+  'fields' => {
+    'setup_fee'     => { 'name' => 'Setup fee for this package',
+                         'default' => 0,
+                       },
+    'recur_flat'     => { 'name' => 'Base recurring fee for this package',
+                          'default' => 0,
+                        },
+    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
+                                   ' of service at cancellation',
+                         'type' => 'checkbox',
+                       },
+    'ratenum'   => { 'name' => 'Rate plan',
+                     'type' => 'select',
+                     'select_table' => 'rate',
+                     'select_key'   => 'ratenum',
+                     'select_label' => 'ratename',
+                   },
+    'region_method' => { 'name' => 'Region rating method',
+                         'type' => 'select',
+                         'select_options' => \%region_method,
+                       },
+
+    #XXX also have option for an external db??
+#    'cdr_location' => { 'name' => 'CDR database location'
+#                        'type' => 'select',
+#                        'select_options' => \%cdr_location,
+#                        'select_callback' => {
+#                          'external' => {
+#                            'enable' => [ 'datasrc', 'username', 'password' ],
+#                          },
+#                          'internal' => {
+#                            'disable' => [ 'datasrc', 'username', 'password' ],
+#                          }
+#                        },
+#                      },
+#    'datasrc' => { 'name' => 'DBI data source for external CDR table',
+#                   'disabled' => 'Y',
+#                 },
+#    'username' => { 'name' => 'External database username',
+#                    'disabled' => 'Y',
+#                  },
+#    'password' => { 'name' => 'External database password',
+#                    'disabled' => 'Y',
+#                  },
+
+  },
+  'fieldorder' => [qw( setup_fee recur_flat unused_credit ratenum ignore_unrateable )],
+  'weight' => 40,
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+#false laziness w/voip_sqlradacct... resolve it if that one ever gets used again
+sub calc_recur {
+  my($self, $cust_pkg, $sdate, $details ) = @_;
+
+  my $last_bill = $cust_pkg->last_bill;
+
+  my $ratenum = $cust_pkg->part_pkg->option('ratenum');
+
+  my %included_min = ();
+
+  my $charges = 0;
+
+  # also look for a specific domain??? (username@telephonedomain)
+  foreach my $cust_svc (
+    grep { $_->part_svc->svcdb eq 'svc_acct' } $cust_pkg->cust_svc
+  ) {
+
+    foreach my $cdr (
+      $cust_svc->get_cdrs( $last_bill, $$sdate )
+    ) {
+      if ( $DEBUG > 1 ) {
+        warn "rating CDR $cdr\n".
+             join('', map { "  $_ => ". $cdr->{$_}. "\n" } keys %$cdr );
+      }
+
+      my( $regionnum, $rate_detail );
+      if ( $self->option('region_method') eq 'prefix'
+           || ! $self->option('region_method')
+         )
+      {
+
+        ###
+        # look up rate details based on called station id
+        ###
+  
+        my $dest = $cdr->{'calledstationid'};  # XXX
+  
+        #remove non-phone# stuff and whitespace
+        $dest =~ s/\s//g;
+        my $proto = '';
+        $dest =~ s/^(\w+):// and $proto = $1; #sip:
+        my $siphost = '';
+        $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
+  
+        #determine the country code
+        my $countrycode;
+        if (    $dest =~ /^011(((\d)(\d))(\d))(\d+)$/
+             || $dest =~ /^\+(((\d)(\d))(\d))(\d+)$/
+           )
+        {
+  
+          my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
+          #first look for 1 digit country code
+          if ( qsearch('rate_prefix', { 'countrycode' => $one } ) ) {
+            $countrycode = $one;
+            $dest = $u1.$u2.$rest;
+          } elsif ( qsearch('rate_prefix', { 'countrycode' => $two } ) ) { #or 2
+            $countrycode = $two;
+            $dest = $u2.$rest;
+          } else { #3 digit country code
+            $countrycode = $three;
+            $dest = $rest;
+          }
+  
+        } else {
+          $countrycode = '1';
+          $dest =~ s/^1//;# if length($dest) > 10;
+        }
+  
+        warn "rating call to +$countrycode $dest\n" if $DEBUG;
+  
+        #find a rate prefix, first look at most specific (4 digits) then 3, etc.,
+        # finally trying the country code only
+        my $rate_prefix = '';
+        for my $len ( reverse(1..6) ) {
+          $rate_prefix = qsearchs('rate_prefix', {
+            'countrycode' => $countrycode,
+            #'npa'         => { op=> 'LIKE', value=> substr($dest, 0, $len) }
+            'npa'         => substr($dest, 0, $len),
+          } ) and last;
+        }
+        $rate_prefix ||= qsearchs('rate_prefix', {
+          'countrycode' => $countrycode,
+          'npa'         => '',
+        });
+  
+        die "Can't find rate for call to +$countrycode $dest\n"
+          unless $rate_prefix;
+  
+        $regionnum = $rate_prefix->regionnum;
+        $rate_detail = qsearchs('rate_detail', {
+          'ratenum'        => $ratenum,
+          'dest_regionnum' => $regionnum,
+        } );
+  
+        warn "  found rate for regionnum $regionnum ".
+             "and rate detail $rate_detail\n"
+          if $DEBUG;
+
+      } elsif ( $self->option('region_method') eq 'upstream_rateid' ) { #upstream_rateplanid
+
+        $regionnum = ''; #XXXXX regionnum should be something
+
+        $rate_detail = $cdr->cdr_upstream_rate->rate_detail;
+
+        warn "  found rate for ". #regionnum $regionnum and ".
+             "rate detail $rate_detail\n"
+          if $DEBUG;
+
+      } else {
+        die "don't know how to rate CDRs using method: ".
+            $self->option('region_method'). "\n";
+      }
+
+      ###
+      # find the price and add detail to the invoice
+      ###
+
+      $included_min{$regionnum} = $rate_detail->min_included
+        unless exists $included_min{$regionnum};
+
+      my $granularity = $rate_detail->sec_granularity;
+      my $seconds = $cdr->{'acctsessiontime'}; # XXX
+      $seconds += $granularity - ( $seconds % $granularity );
+      my $minutes = sprintf("%.1f", $seconds / 60);
+      $minutes =~ s/\.0$// if $granularity == 60;
+
+      $included_min{$regionnum} -= $minutes;
+
+      my $charge = 0;
+      if ( $included_min{$regionnum} < 0 ) {
+        my $charge_min = 0 - $included_min{$regionnum};
+        $included_min{$regionnum} = 0;
+        $charge = sprintf('%.2f', $rate_detail->min_charge * $charge_min );
+        $charges += $charge;
+      }
+
+      # XXXXXXX
+#      my $rate_region = $rate_prefix->rate_region;
+#      warn "  (rate region $rate_region)\n" if $DEBUG;
+#
+#      my @call_details = (
+#        #time2str("%Y %b %d - %r", $session->{'acctstarttime'}),
+#        time2str("%c", $cdr->{'acctstarttime'}),  #XXX
+#        $minutes.'m',
+#        '$'.$charge,
+#        "+$countrycode $dest",
+#        $rate_region->regionname,
+#      );
+#
+#      warn "  adding details on charge to invoice: ".
+#           join(' - ', @call_details )
+#        if $DEBUG;
+#
+#      push @$details, join(' - ', @call_details); #\@call_details,
+
+    } # $cdr
+
+  } # $cust_svc
+
+  $self->option('recur_flat') + $charges;
+
+}
+
+sub is_free {
+  0;
+}
+
+sub base_recur {
+  my($self, $cust_pkg) = @_;
+  $self->option('recur_flat');
+}
+
+1;
+
-- 
cgit v1.2.1


From 96fde39e747fdc5c618b5a92ec354384931cf317 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Mar 2006 14:56:27 +0000
Subject: use IO::File, lucky this never threw an error...

---
 FS/FS/Daemon.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/Daemon.pm b/FS/FS/Daemon.pm
index 3e64f79e9..7e0d45c20 100644
--- a/FS/FS/Daemon.pm
+++ b/FS/FS/Daemon.pm
@@ -5,6 +5,7 @@ use vars qw( $pid_dir $me $pid_file $sigint $sigterm $logfile );
 use Exporter;
 use Fcntl qw(:flock);
 use POSIX qw(setsid);
+use IO::File;
 use Date::Format;
 
 #this is a simple refactoring of the stuff from freeside-queued, just to
-- 
cgit v1.2.1


From ff24bc786a5fd479f2252260e0da580a736f97be Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Mar 2006 19:13:27 +0000
Subject: add price plan to bill on internal or external CDRs directly, add
 option to export CDRs to a per-customer downstream file

---
 FS/FS/Conf.pm                          |  14 ++
 FS/FS/Schema.pm                        |  14 +-
 FS/FS/cdr.pm                           | 208 +++++++++++++++++++--
 FS/FS/cdr_upstream_rate.pm             | 138 ++++++++++++++
 FS/FS/cust_main.pm                     |  34 +++-
 FS/FS/cust_svc.pm                      |  45 +++++
 FS/FS/part_pkg/voip_cdr.pm             | 331 +++++++++++++++++++++------------
 FS/FS/rate_detail.pm                   |  30 ++-
 FS/FS/svc_acct.pm                      |  64 ++++++-
 FS/MANIFEST                            |   2 +
 FS/t/cdr_upstream_rate.t               |   5 +
 bin/cdr_upstream_rate.import           | 142 ++++++++++++++
 httemplate/edit/cust_main/billing.html |  10 +-
 httemplate/edit/part_pkg.cgi           |  39 +++-
 httemplate/edit/rate.cgi               |   7 +-
 httemplate/search/cdr.html             |  21 ++-
 httemplate/search/report_cdr.html      |   5 +
 httemplate/view/cust_main/billing.html |   6 +
 18 files changed, 951 insertions(+), 164 deletions(-)
 create mode 100644 FS/FS/cdr_upstream_rate.pm
 create mode 100644 FS/t/cdr_upstream_rate.t
 create mode 100755 bin/cdr_upstream_rate.import

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index a5add28d8..6be6db5c5 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1681,6 +1681,20 @@ httemplate/docs/config.html
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'echeck-nonus',
+    'section'     => 'billing',
+    'description' => 'Disable ABA-format account checking for Electronic Check payment info',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'voip-cust_cdr_spools',
+    'section'     => '',
+    'description' => 'Enable the per-customer option for individual CDR spools.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index a049b8bad..9125758d0 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -437,6 +437,7 @@ sub tables_hashref {
         'refnum',   'int',  '',     '', '', '', 
         'referral_custnum', 'int',  'NULL', '', '', '', 
         'comments', 'text', 'NULL', '', '', '', 
+        'spool_cdr','char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'custnum',
       'unique' => [],
@@ -1146,7 +1147,8 @@ sub tables_hashref {
         'orig_regionnum',  'int', 'NULL', '', '', '', 
         'dest_regionnum',  'int',     '', '', '', '', 
         'min_included',    'int',     '', '', '', '', 
-        'min_charge',      @money_type, '', '', 
+        #'min_charge',      @money_type, '', '', 
+        'min_charge',      'decimal', '', '10,5', '', '', 
         'sec_granularity', 'int',     '', '', '', '', 
         #time period (link to table of periods)?
       ],
@@ -1416,14 +1418,14 @@ sub tables_hashref {
       'index'       => [],
     },
 
-    #map upstream rateid (XXX or rateplanid?) to ours...
-    'cdr_upstream_rate' => { # XXX or 'cdr_upstream_rateplan' ??
+    #map upstream rateid to ours...
+    'cdr_upstream_rate' => {
       'columns' => [
-        # XXX or 'upstream_rateplanid' ??
-        'upstream_rateid', 'int', 'NULL', '', '', '',
+        'upstreamratenum', 'serial',  '', '', '', '',
+        'upstream_rateid', 'varchar', '', $char_d, '', '', 
         'ratedetailnum',   'int', 'NULL', '', '', '',
       ],
-      'primary_key' => '', #XXX need a primary key
+      'primary_key' => 'upstreamratenum', #XXX need a primary key
       'unique' => [ [ 'upstream_rateid' ] ], #unless we add another field, yeah
       'index'  => [],
     },
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 2d40177f5..70c8a0f09 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -3,11 +3,13 @@ package FS::cdr;
 use strict;
 use vars qw( @ISA );
 use Date::Parse;
+use Date::Format;
 use FS::UID qw( dbh );
 use FS::Record qw( qsearch qsearchs );
 use FS::cdr_type;
 use FS::cdr_calltype;
 use FS::cdr_carrier;
+use FS::cdr_upstream_rate;
 
 @ISA = qw(FS::Record);
 
@@ -99,6 +101,8 @@ following fields are currently supported:
 
 =item upstream_rateplanid - Upstream rate plan ID
 
+=item rated_price - Rated (or re-rated) price
+
 =item distance - km (need units field?)
 
 =item islocal - Local - 1, Non Local = 0
@@ -121,7 +125,7 @@ following fields are currently supported:
 
 =item svcnum - Link to customer service (see L<FS::cust_svc>)
 
-=item freesidestatus - NULL, done, skipped, pushed_downstream (or something)
+=item freesidestatus - NULL, done (or something)
 
 =back
 
@@ -241,7 +245,184 @@ sub check {
   $self->SUPER::check;
 }
 
-my %formats = (
+=item set_status_and_rated_price STATUS [ RATED_PRICE ]
+
+Sets the status to the provided string.  If there is an error, returns the
+error, otherwise returns false.
+
+=cut
+
+sub set_status_and_rated_price {
+  my($self, $status, $rated_price) = @_;
+  $self->status($status);
+  $self->rated_price($rated_price);
+  $self->replace();
+}
+
+=item calldate_unix 
+
+Parses the calldate in SQL string format and returns a UNIX timestamp.
+
+=cut
+
+sub calldate_unix {
+  str2time(shift->calldate);
+}
+
+=item cdr_carrier
+
+Returns the FS::cdr_carrier object associated with this CDR, or false if no
+carrierid is defined.
+
+=cut
+
+my %carrier_cache = ();
+
+sub cdr_carrier {
+  my $self = shift;
+  return '' unless $self->carrierid;
+  $carrier_cache{$self->carrierid} ||=
+    qsearchs('cdr_carrier', { 'carrierid' => $self->carrierid } );
+}
+
+=item carriername 
+
+Returns the carrier name (see L<FS::cdr_carrier>), or the empty string if
+no FS::cdr_carrier object is assocated with this CDR.
+
+=cut
+
+sub carriername {
+  my $self = shift;
+  my $cdr_carrier = $self->cdr_carrier;
+  $cdr_carrier ? $cdr_carrier->carriername : '';
+}
+
+=item cdr_calltype
+
+Returns the FS::cdr_calltype object associated with this CDR, or false if no
+calltypenum is defined.
+
+=cut
+
+my %calltype_cache = ();
+
+sub cdr_calltype {
+  my $self = shift;
+  return '' unless $self->calltypenum;
+  $calltype_cache{$self->calltypenum} ||=
+    qsearchs('cdr_calltype', { 'calltypenum' => $self->calltypenum } );
+}
+
+=item calltypename 
+
+Returns the call type name (see L<FS::cdr_calltype>), or the empty string if
+no FS::cdr_calltype object is assocated with this CDR.
+
+=cut
+
+sub calltypename {
+  my $self = shift;
+  my $cdr_calltype = $self->cdr_calltype;
+  $cdr_calltype ? $cdr_calltype->calltypename : '';
+}
+
+=item cdr_upstream_rate
+
+Returns the upstream rate mapping (see L<FS::cdr_upstream_rate>), or the empty
+string if no FS::cdr_upstream_rate object is associated with this CDR.
+
+=cut
+
+sub cdr_upstream_rate {
+  my $self = shift;
+  return '' unless $self->upstream_rateid;
+  qsearchs('cdr_upstream_rate', { 'upstream_rateid' => $self->upstream_rateid })
+    or '';
+}
+
+=item _convergent_format COLUMN [ COUNTRYCODE ]
+
+Returns the number in COLUMN formatted as follows:
+
+If the country code does not match COUNTRYCODE (default "61"), it is returned
+unchanged.
+
+If the country code does match COUNTRYCODE (default "61"), it is removed.  In
+addiiton, "0" is prepended unless the number starts with 13, 18 or 19. (???)
+
+=cut
+
+sub _convergent_format {
+  my( $self, $field ) = ( shift, shift );
+  my $countrycode = scalar(@_) ? shift : '61'; #+61 = australia
+  #my $number = $self->$field();
+  my $number = $self->get($field);
+  #if ( $number =~ s/^(\+|011)$countrycode// ) {
+  if ( $number =~ s/^\+$countrycode// ) {
+    $number = "0$number"
+      unless $number =~ /^1[389]/; #???
+  }
+  $number;
+}
+
+=item downstream_csv [ OPTION => VALUE, ... ]
+
+=cut
+
+my %export_formats = (
+  'convergent' => [
+    'carriername', #CARRIER
+    sub { shift->_convergent_format('src') }, #SERVICE_NUMBER
+    sub { shift->_convergent_format('charged_party') }, #CHARGED_NUMBER
+    sub { time2str('%Y-%m-%d', shift->calldate_unix ) }, #DATE
+    sub { time2str('%T',       shift->calldate_unix ) }, #TIME
+    'billsec', #'duration', #DURATION
+    sub { shift->_convergent_format('dst') }, #NUMBER_DIALED
+    '', #XXX add (from prefixes in most recent email) #FROM_DESC
+    '', #XXX add (from prefixes in most recent email) #TO_DESC
+    'calltypename', #CLASS_CODE
+    'rated_price', #PRICE
+    sub { shift->rated_price ? 'Y' : 'N' }, #RATED
+    '', #OTHER_INFO
+  ],
+);
+
+sub downstream_csv {
+  my( $self, %opt ) = @_;
+
+  my $format = $opt{'format'}; # 'convergent';
+  return "Unknown format $format" unless exists $export_formats{$format};
+
+  eval "use Text::CSV_XS;";
+  die $@ if $@;
+  my $csv = new Text::CSV_XS;
+
+  my @columns =
+    map {
+          ref($_) ? &{$_}($self) : $self->$_();
+        }
+    @{ $export_formats{$format} };
+
+  my $status = $csv->combine(@columns);
+  die "FS::CDR: error combining ". $csv->error_input(). "into downstream CSV"
+    unless $status;
+
+  $csv->string;
+
+}
+
+=back
+
+=head1 CLASS METHODS
+
+=over 4
+
+=item batch_import
+
+=cut
+
+my %import_formats = (
   'asterisk' => [
     'accountcode',
     'src',
@@ -264,14 +445,15 @@ my %formats = (
   ],
   'unitel' => [
     'uniqueid',
-    'cdr_type',
-    'calldate', # XXX may need massaging
-    'billsec', #XXX duration and billsec?
-               # sub { $_[0]->billsec(  $_[1] );
-               #       $_[0]->duration( $_[1] );
-               #     },
+    #'cdr_type',
+    'cdrtypenum',
+    'calldate', # may need massaging?  huh maybe not...
+    #'billsec', #XXX duration and billsec?
+                sub { $_[0]->billsec(  $_[1] );
+                      $_[0]->duration( $_[1] );
+                    },
     'src',
-    'dst',
+    'dst', # XXX needs to have "+61" prepended unless /^\+/ ???
     'charged_party',
     'upstream_currency',
     'upstream_price',
@@ -279,8 +461,8 @@ my %formats = (
     'distance',
     'islocal',
     'calltypenum',
-    'startdate', # XXX will definitely need massaging
-    'enddate',   # XXX same
+    'startdate',  #XXX needs massaging
+    'enddate',    #XXX same
     'description',
     'quantity',
     'carrierid',
@@ -294,7 +476,7 @@ sub batch_import {
   my $fh = $param->{filehandle};
   my $format = $param->{format};
 
-  return "Unknown format $format" unless exists $formats{$format};
+  return "Unknown format $format" unless exists $import_formats{$format};
 
   eval "use Text::CSV_XS;";
   die $@ if $@;
@@ -339,7 +521,7 @@ sub batch_import {
         }
 
       }
-      @{ $formats{$format} }
+      @{ $import_formats{$format} }
     ;
 
     my $cdr = new FS::cdr ( \%cdr );
diff --git a/FS/FS/cdr_upstream_rate.pm b/FS/FS/cdr_upstream_rate.pm
new file mode 100644
index 000000000..2fd978203
--- /dev/null
+++ b/FS/FS/cdr_upstream_rate.pm
@@ -0,0 +1,138 @@
+package FS::cdr_upstream_rate;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::rate_detail;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::cdr_upstream_rate - Object methods for cdr_upstream_rate records
+
+=head1 SYNOPSIS
+
+  use FS::cdr_upstream_rate;
+
+  $record = new FS::cdr_upstream_rate \%hash;
+  $record = new FS::cdr_upstream_rate { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cdr_upstream_rate object represents an upstream rate mapping to 
+internal rate detail (see L<FS::rate_detail>).  FS::cdr_upstream_rate inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item upstreamratenum - primary key
+
+=item upstream_rateid - CDR upstream Rate ID (cdr.upstream_rateid - see L<FS::cdr>)
+
+=item ratedetailnum - Rate detail - see L<FS::rate_detail>
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new upstream rate mapping.  To add the upstream rate to the database,
+see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cdr_upstream_rate'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid upstream rate.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('upstreamratenum')
+    #|| $self->ut_number('upstream_rateid')
+    || $self->ut_alpha('upstream_rateid')
+    #|| $self->ut_text('upstream_rateid')
+    || $self->ut_foreign_key('ratedetailnum', 'rate_detail', 'ratedetailnum' )
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=item rate_detail
+
+Returns the internal rate detail object for this upstream rate (see
+L<FS::rate_detail>).
+
+=cut
+
+sub rate_detail {
+  my $self = shift;
+  qsearchs('rate_detail', { 'ratedetailnum' => $self->ratedetailnum } );
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 50faeb422..99d27dd5e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -284,6 +284,8 @@ sub paymask {
 
 =item referral_custnum - referring customer number
 
+=item spool_cdr - Enable individual CDR spooling, empty or `Y'
+
 =back
 
 =head1 METHODS
@@ -1257,7 +1259,11 @@ sub check {
 
     my $payinfo = $self->payinfo;
     $payinfo =~ s/[^\d\@]//g;
-    $payinfo =~ /^(\d+)\@(\d{9})$/ or return 'invalid echeck account@aba';
+    if ( $conf->exists('echeck-nonus') ) {
+      $payinfo =~ /^(\d+)\@(\d+)$/ or return 'invalid echeck account@aba';
+    } else {
+      $payinfo =~ /^(\d+)\@(\d{9})$/ or return 'invalid echeck account@aba';
+    }
     $payinfo = "$1\@$2";
     $self->payinfo($payinfo);
     $self->paycvv('') if $self->dbdef_table->column('paycvv');
@@ -1336,8 +1342,10 @@ sub check {
     $self->payname($1);
   }
 
-  $self->tax =~ /^(Y?)$/ or return "Illegal tax: ". $self->tax;
-  $self->tax($1);
+  foreach my $flag (qw( tax spool_cdr )) {
+    $self->$flag() =~ /^(Y?)$/ or return "Illegal $flag: ". $self->$flag();
+    $self->$flag($1);
+  }
 
   $self->otaker(getotaker) unless $self->otaker;
 
@@ -1640,6 +1648,7 @@ sub bill {
 
   my( $total_setup, $total_recur ) = ( 0, 0 );
   my %tax;
+  my @precommit_hooks = ();
 
   foreach my $cust_pkg (
     qsearch('cust_pkg', { 'custnum' => $self->custnum } )
@@ -1673,7 +1682,7 @@ sub bill {
       $setup = eval { $cust_pkg->calc_setup( $time ) };
       if ( $@ ) {
         $dbh->rollback if $oldAutoCommit;
-        return $@;
+        return "$@ running calc_setup for $cust_pkg\n";
       }
 
       $cust_pkg->setfield('setup', $time) unless $cust_pkg->setup;
@@ -1695,10 +1704,13 @@ sub bill {
       # XXX shared with $recur_prog
       $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
 
-      $recur = eval { $cust_pkg->calc_recur( \$sdate, \@details ) };
+      #over two params!  lets at least switch to a hashref for the rest...
+      my %param = ( 'precommit_hooks' => \@precommit_hooks, );
+
+      $recur = eval { $cust_pkg->calc_recur( \$sdate, \@details, \%param ) };
       if ( $@ ) {
         $dbh->rollback if $oldAutoCommit;
-        return $@;
+        return "$@ running calc_recur for $cust_pkg\n";
       }
 
       #change this bit to use Date::Manip? CAREFUL with timezones (see
@@ -1970,6 +1982,16 @@ sub bill {
     $dbh->rollback if $oldAutoCommit;
     return "can't update charged for invoice #$invnum: $error";
   }
+
+  foreach my $hook ( @precommit_hooks ) { 
+    eval {
+      &{$hook}; #($self) ?
+    };
+    if ( $@ ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "$@ running precommit hook $hook\n";
+    }
+  }
   
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index ad87cab7e..e7afa77ea 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -16,6 +16,7 @@ use FS::svc_broadband;
 use FS::svc_external;
 use FS::domain_record;
 use FS::part_export;
+use FS::cdr;
 
 @ISA = qw( FS::Record );
 
@@ -570,6 +571,50 @@ sub get_session_history {
 
 }
 
+=item get_cdrs_for_update
+
+Returns (and SELECTs "FOR UPDATE") all unprocessed (freesidestatus NULL) CDR
+objects (see L<FS::cdr>) associated with this service.
+
+Currently CDRs are associated with svc_acct services via a DID in the
+username.  This part is rather tenative and still subject to change...
+
+=cut
+
+sub get_cdrs_for_update {
+  my($self, %options) = @_;
+
+  my $default_prefix = $options{'default_prefix'};
+
+  #Currently CDRs are associated with svc_acct services via a DID in the
+  #username.  This part is rather tenative and still subject to change...
+  #return () unless $self->svc_x->isa('FS::svc_acct');
+  return () unless $self->part_svc->svcdb eq 'svc_acct';
+  my $number = $self->svc_x->username;
+
+  my @cdrs = 
+    qsearch(
+      'table'      => 'cdr',
+      'hashref'    => { 'freesidestatus' => '',
+                        'charged_party'  => $number
+                      },
+      'extra_sql'  => 'FOR UPDATE',
+    );
+
+  if ( length($default_prefix) ) {
+    push @cdrs,
+      qsearch(
+        'table'      => 'cdr',
+        'hashref'    => { 'freesidestatus' => '',
+                          'charged_party'  => "$default_prefix$number",
+                        },
+        'extra_sql'  => 'FOR UPDATE',
+      );
+  }
+
+  @cdrs;
+}
+
 =item pkg_svc
 
 Returns the pkg_svc record for for this service, if applicable.
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 385fcb2e5..15af77b4f 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -4,18 +4,19 @@ use strict;
 use vars qw(@ISA $DEBUG %info);
 use Date::Format;
 use Tie::IxHash;
+use FS::Conf;
 use FS::Record qw(qsearchs qsearch);
 use FS::part_pkg::flat;
 #use FS::rate;
-use FS::rate_prefix;
+#use FS::rate_prefix;
 
 @ISA = qw(FS::part_pkg::flat);
 
 $DEBUG = 1;
 
-tie my %region_method, 'Tie::IxHash',
+tie my %rating_method, 'Tie::IxHash',
   'prefix' => 'Rate calls by using destination prefix to look up a region and rate according to the internal prefix and rate tables',
-  'upstream_rateid' => 'Rate calls by mapping the upstream rate ID (# rate plan ID?) directly to an internal rate (rate_detail)', #upstream_rateplanid
+  'upstream' => 'Rate calls based on upstream data: If the call type is "1", map the upstream rate ID directly to an internal rate (rate_detail), otherwise, pass the upstream price through directly.',
 ;
 
 #tie my %cdr_location, 'Tie::IxHash',
@@ -43,11 +44,15 @@ tie my %region_method, 'Tie::IxHash',
                      'select_key'   => 'ratenum',
                      'select_label' => 'ratename',
                    },
-    'region_method' => { 'name' => 'Region rating method',
+    'rating_method' => { 'name' => 'Region rating method',
                          'type' => 'select',
-                         'select_options' => \%region_method,
+                         'select_options' => \%rating_method,
                        },
 
+    'default_prefix' => { 'name'    => 'Default prefix optionally prepended to customer DID numbers when searching for CDR records',
+                          'default' => '+1',
+                        },
+
     #XXX also have option for an external db??
 #    'cdr_location' => { 'name' => 'CDR database location'
 #                        'type' => 'select',
@@ -72,7 +77,7 @@ tie my %region_method, 'Tie::IxHash',
 #                  },
 
   },
-  'fieldorder' => [qw( setup_fee recur_flat unused_credit ratenum ignore_unrateable )],
+  'fieldorder' => [qw( setup_fee recur_flat unused_credit ratenum rating_method default_prefix )],
   'weight' => 40,
 );
 
@@ -83,164 +88,248 @@ sub calc_setup {
 
 #false laziness w/voip_sqlradacct... resolve it if that one ever gets used again
 sub calc_recur {
-  my($self, $cust_pkg, $sdate, $details ) = @_;
+  my($self, $cust_pkg, $sdate, $details, $param ) = @_;
 
   my $last_bill = $cust_pkg->last_bill;
 
   my $ratenum = $cust_pkg->part_pkg->option('ratenum');
 
+  my $spool_cdr = $cust_pkg->cust_main->spool_cdr;
+
   my %included_min = ();
 
   my $charges = 0;
 
+  my $downstream_cdr = '';
+
   # also look for a specific domain??? (username@telephonedomain)
   foreach my $cust_svc (
     grep { $_->part_svc->svcdb eq 'svc_acct' } $cust_pkg->cust_svc
   ) {
 
     foreach my $cdr (
-      $cust_svc->get_cdrs( $last_bill, $$sdate )
+      $cust_svc->get_cdrs_for_update()  # $last_bill, $$sdate )
     ) {
       if ( $DEBUG > 1 ) {
         warn "rating CDR $cdr\n".
              join('', map { "  $_ => ". $cdr->{$_}. "\n" } keys %$cdr );
       }
 
-      my( $regionnum, $rate_detail );
-      if ( $self->option('region_method') eq 'prefix'
-           || ! $self->option('region_method')
+      my $rate_detail;
+      my( $rate_region, $regionnum );
+      my $pretty_destnum;
+      my $charge = 0;
+      my @call_details = ();
+      if ( $self->option('rating_method') eq 'prefix'
+           || ! $self->option('rating_method')
          )
       {
 
-        ###
-        # look up rate details based on called station id
-        ###
-  
-        my $dest = $cdr->{'calledstationid'};  # XXX
-  
-        #remove non-phone# stuff and whitespace
-        $dest =~ s/\s//g;
-        my $proto = '';
-        $dest =~ s/^(\w+):// and $proto = $1; #sip:
-        my $siphost = '';
-        $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
-  
-        #determine the country code
-        my $countrycode;
-        if (    $dest =~ /^011(((\d)(\d))(\d))(\d+)$/
-             || $dest =~ /^\+(((\d)(\d))(\d))(\d+)$/
-           )
-        {
-  
-          my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
-          #first look for 1 digit country code
-          if ( qsearch('rate_prefix', { 'countrycode' => $one } ) ) {
-            $countrycode = $one;
-            $dest = $u1.$u2.$rest;
-          } elsif ( qsearch('rate_prefix', { 'countrycode' => $two } ) ) { #or 2
-            $countrycode = $two;
-            $dest = $u2.$rest;
-          } else { #3 digit country code
-            $countrycode = $three;
-            $dest = $rest;
-          }
-  
-        } else {
-          $countrycode = '1';
-          $dest =~ s/^1//;# if length($dest) > 10;
-        }
-  
-        warn "rating call to +$countrycode $dest\n" if $DEBUG;
-  
-        #find a rate prefix, first look at most specific (4 digits) then 3, etc.,
-        # finally trying the country code only
-        my $rate_prefix = '';
-        for my $len ( reverse(1..6) ) {
-          $rate_prefix = qsearchs('rate_prefix', {
-            'countrycode' => $countrycode,
-            #'npa'         => { op=> 'LIKE', value=> substr($dest, 0, $len) }
-            'npa'         => substr($dest, 0, $len),
-          } ) and last;
-        }
-        $rate_prefix ||= qsearchs('rate_prefix', {
-          'countrycode' => $countrycode,
-          'npa'         => '',
-        });
-  
-        die "Can't find rate for call to +$countrycode $dest\n"
-          unless $rate_prefix;
-  
-        $regionnum = $rate_prefix->regionnum;
-        $rate_detail = qsearchs('rate_detail', {
-          'ratenum'        => $ratenum,
-          'dest_regionnum' => $regionnum,
-        } );
-  
-        warn "  found rate for regionnum $regionnum ".
-             "and rate detail $rate_detail\n"
-          if $DEBUG;
+        die "rating_method 'prefix' not yet supported";
+
+#        ###
+#        # look up rate details based on called station id
+#        ###
+#  
+#        my $dest = $cdr->dst;
+#  
+#        #remove non-phone# stuff and whitespace
+#        $dest =~ s/\s//g;
+#        my $proto = '';
+#        $dest =~ s/^(\w+):// and $proto = $1; #sip:
+#        my $siphost = '';
+#        $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
+#  
+#        #determine the country code
+#        my $countrycode;
+#        if (    $dest =~ /^011(((\d)(\d))(\d))(\d+)$/
+#             || $dest =~ /^\+(((\d)(\d))(\d))(\d+)$/
+#           )
+#        {
+#  
+#          my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
+#          #first look for 1 digit country code
+#          if ( qsearch('rate_prefix', { 'countrycode' => $one } ) ) {
+#            $countrycode = $one;
+#            $dest = $u1.$u2.$rest;
+#          } elsif ( qsearch('rate_prefix', { 'countrycode' => $two } ) ) { #or 2
+#            $countrycode = $two;
+#            $dest = $u2.$rest;
+#          } else { #3 digit country code
+#            $countrycode = $three;
+#            $dest = $rest;
+#          }
+#  
+#        } else {
+#          $countrycode = '1';
+#          $dest =~ s/^1//;# if length($dest) > 10;
+#        }
+#  
+#        warn "rating call to +$countrycode $dest\n" if $DEBUG;
+#        $pretty_destnum = "+$countrycode $dest";
+#  
+#        #find a rate prefix, first look at most specific (4 digits) then 3, etc.,
+#        # finally trying the country code only
+#        my $rate_prefix = '';
+#        for my $len ( reverse(1..6) ) {
+#          $rate_prefix = qsearchs('rate_prefix', {
+#            'countrycode' => $countrycode,
+#            #'npa'         => { op=> 'LIKE', value=> substr($dest, 0, $len) }
+#            'npa'         => substr($dest, 0, $len),
+#          } ) and last;
+#        }
+#        $rate_prefix ||= qsearchs('rate_prefix', {
+#          'countrycode' => $countrycode,
+#          'npa'         => '',
+#        });
+#  
+#        die "Can't find rate for call to +$countrycode $dest\n"
+#          unless $rate_prefix;
+#  
+#        $regionnum = $rate_prefix->regionnum;
+#        $rate_detail = qsearchs('rate_detail', {
+#          'ratenum'        => $ratenum,
+#          'dest_regionnum' => $regionnum,
+#        } );
+#  
+#        $rate_region = $rate_prefix->rate_region;
+#
+#        warn "  found rate for regionnum $regionnum ".
+#             "and rate detail $rate_detail\n"
+#          if $DEBUG;
 
-      } elsif ( $self->option('region_method') eq 'upstream_rateid' ) { #upstream_rateplanid
+      } elsif ( $self->option('rating_method') eq 'upstream' ) {
 
-        $regionnum = ''; #XXXXX regionnum should be something
+        if ( $cdr->cdrtypenum == 1 ) { #rate based on upstream rateid
 
-        $rate_detail = $cdr->cdr_upstream_rate->rate_detail;
+          $rate_detail = $cdr->cdr_upstream_rate->rate_detail;
 
-        warn "  found rate for ". #regionnum $regionnum and ".
-             "rate detail $rate_detail\n"
-          if $DEBUG;
+          $regionnum = $rate_detail->dest_regionnum;
+          $rate_region = $rate_detail->dest_region;
+
+          $pretty_destnum = $cdr->dst;
+
+          warn "  found rate for regionnum $regionnum and ".
+               "rate detail $rate_detail\n"
+            if $DEBUG;
+
+        } else { #pass upstream price through
+
+          $charge = sprintf('%.2f', $cdr->upstream_price);
+  
+          @call_details = (
+            #time2str("%Y %b %d - %r", $cdr->calldate_unix ),
+            time2str("%c", $cdr->calldate_unix),  #XXX this should probably be a config option dropdown so they can select US vs- rest of world dates or whatnot
+            'N/A', #minutes...
+            '$'.$charge,
+            #$pretty_destnum,
+            $cdr->description, #$rate_region->regionname,
+          );
+
+        }
 
       } else {
         die "don't know how to rate CDRs using method: ".
-            $self->option('region_method'). "\n";
+            $self->option('rating_method'). "\n";
       }
 
       ###
       # find the price and add detail to the invoice
       ###
 
-      $included_min{$regionnum} = $rate_detail->min_included
-        unless exists $included_min{$regionnum};
-
-      my $granularity = $rate_detail->sec_granularity;
-      my $seconds = $cdr->{'acctsessiontime'}; # XXX
-      $seconds += $granularity - ( $seconds % $granularity );
-      my $minutes = sprintf("%.1f", $seconds / 60);
-      $minutes =~ s/\.0$// if $granularity == 60;
-
-      $included_min{$regionnum} -= $minutes;
+      # if $rate_detail is not found, skip this CDR... i.e. 
+      # don't add it to invoice, don't set its status to NULL,
+      # don't call downstream_csv or something on it...
+      # but DO emit a warning...
+      if ( ! $rate_detail && ! scalar(@call_details) ) {
+  
+        warn "no rate_detail found for CDR.acctid:  ". $cdr->acctid.
+             "; skipping\n"
+
+      } else { # there *is* a rate_detail (or call_details), proceed...
+
+        unless ( @call_details ) {
+    
+          $included_min{$regionnum} = $rate_detail->min_included
+            unless exists $included_min{$regionnum};
+      
+          my $granularity = $rate_detail->sec_granularity;
+          my $seconds = $cdr->billsec; # |ength($cdr->billsec) ? $cdr->billsec : $cdr->duration;
+          $seconds += $granularity - ( $seconds % $granularity );
+          my $minutes = sprintf("%.1f", $seconds / 60);
+          $minutes =~ s/\.0$// if $granularity == 60;
+      
+          $included_min{$regionnum} -= $minutes;
+      
+          if ( $included_min{$regionnum} < 0 ) {
+            my $charge_min = 0 - $included_min{$regionnum};
+            $included_min{$regionnum} = 0;
+            $charge = sprintf('%.2f', $rate_detail->min_charge * $charge_min );
+            $charges += $charge;
+          }
+      
+          # this is why we need regionnum/rate_region....
+          warn "  (rate region $rate_region)\n" if $DEBUG;
+      
+          @call_details = (
+            #time2str("%Y %b %d - %r", $cdr->calldate_unix ),
+            time2str("%c", $cdr->calldate_unix),  #XXX this should probably be a config option dropdown so they can select US vs- rest of world dates or whatnot
+            $minutes.'m',
+            '$'.$charge,
+            $pretty_destnum,
+            $rate_region->regionname,
+          );
 
-      my $charge = 0;
-      if ( $included_min{$regionnum} < 0 ) {
-        my $charge_min = 0 - $included_min{$regionnum};
-        $included_min{$regionnum} = 0;
-        $charge = sprintf('%.2f', $rate_detail->min_charge * $charge_min );
-        $charges += $charge;
+        }
+    
+        warn "  adding details on charge to invoice: ".
+             join(' - ', @call_details )
+          if $DEBUG;
+    
+        push @$details, join(' - ', @call_details); #\@call_details,
+  
+        # if the customer flag is on, call "downstream_csv" or something
+        # like it to export the call downstream!
+        # XXX price plan option to pick format, or something...
+        $downstream_cdr .= $cdr->downstream_csv( 'format' => 'convergent' )
+          if $spool_cdr;
+  
+        my $error = $cdr->set_status_and_rated_price('done', $charge);
+        die $error if $error;
+  
       }
-
-      # XXXXXXX
-#      my $rate_region = $rate_prefix->rate_region;
-#      warn "  (rate region $rate_region)\n" if $DEBUG;
-#
-#      my @call_details = (
-#        #time2str("%Y %b %d - %r", $session->{'acctstarttime'}),
-#        time2str("%c", $cdr->{'acctstarttime'}),  #XXX
-#        $minutes.'m',
-#        '$'.$charge,
-#        "+$countrycode $dest",
-#        $rate_region->regionname,
-#      );
-#
-#      warn "  adding details on charge to invoice: ".
-#           join(' - ', @call_details )
-#        if $DEBUG;
-#
-#      push @$details, join(' - ', @call_details); #\@call_details,
-
+  
     } # $cdr
 
   } # $cust_svc
 
+  if ( $spool_cdr && length($downstream_cdr) ) {
+
+    use FS::UID qw(datasrc);
+    my $dir = '/usr/local/etc/freeside/export.'. datasrc. '/cdr';
+    mkdir $dir, 0700 unless -d $dir;
+    $dir .= '/'. $cust_pkg->custnum.
+    mkdir $dir, 0700 unless -d $dir;
+    my $filename = time2str("$dir/CDR%Y%m%d-spool.CSV", time); #XXX invoice date instead?  would require changing the order things are generated in cust_main::bill insert cust_bill first - with transactions it could be done though
+
+    push @{ $param->{'precommit_hooks'} },
+         sub {
+               #lock the downstream spool file and append the records 
+               use Fcntl qw(:flock);
+               use IO::File;
+               my $spool = new IO::File ">>$filename"
+                 or die "can't open $filename: $!\n";
+               flock( $spool, LOCK_EX)
+                 or die "can't lock $filename: $!\n";
+               seek($spool, 0, 2)
+                 or die "can't seek to end of $filename: $!\n";
+               print $spool $downstream_cdr;
+               flock( $spool, LOCK_UN );
+               close $spool;
+             };
+
+  } #if ( $spool_cdr && length($downstream_cdr) )
+
   $self->option('recur_flat') + $charges;
 
 }
diff --git a/FS/FS/rate_detail.pm b/FS/FS/rate_detail.pm
index 1964be2f4..6f023f575 100644
--- a/FS/FS/rate_detail.pm
+++ b/FS/FS/rate_detail.pm
@@ -114,7 +114,11 @@ sub check {
     || $self->ut_foreign_keyn('orig_regionnum', 'rate_region', 'regionnum' )
     || $self->ut_foreign_key('dest_regionnum', 'rate_region', 'regionnum' )
     || $self->ut_number('min_included')
-    || $self->ut_money('min_charge')
+
+    #|| $self->ut_money('min_charge')
+    #good enough for now...
+    || $self->ut_float('min_charge')
+
     || $self->ut_number('sec_granularity')
   ;
   return $error if $error;
@@ -122,6 +126,30 @@ sub check {
   $self->SUPER::check;
 }
 
+=item orig_region 
+
+Returns the origination region (see L<FS::rate_region>) associated with this
+call plan rate.
+
+=cut
+
+sub orig_region {
+  my $self = shift;
+  qsearchs('rate_region', { 'regionnum' => $self->orig_regionnum } );
+}
+
+=item dest_region 
+
+Returns the destination region (see L<FS::rate_region>) associated with this
+call plan rate.
+
+=cut
+
+sub dest_region {
+  my $self = shift;
+  qsearchs('rate_region', { 'regionnum' => $self->dest_regionnum } );
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 759d7372e..a2b7a11c7 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -20,6 +20,7 @@ use Crypt::PasswdMD5 1.2;
 use FS::UID qw( datasrc );
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs fields dbh dbdef );
+use FS::Msgcat qw(gettext);
 use FS::svc_Common;
 use FS::cust_svc;
 use FS::part_svc;
@@ -31,9 +32,9 @@ use FS::queue;
 use FS::radius_usergroup;
 use FS::export_svc;
 use FS::part_export;
-use FS::Msgcat qw(gettext);
 use FS::svc_forward;
 use FS::svc_www;
+use FS::cdr;
 
 @ISA = qw( FS::svc_Common );
 
@@ -1344,6 +1345,67 @@ sub get_session_history {
   $self->cust_svc->get_session_history(@_);
 }
 
+=item get_cdrs TIMESTAMP_START TIMESTAMP_END [ 'OPTION' => 'VALUE ... ]
+
+=cut
+
+sub get_cdrs {
+  my($self, $start, $end, %opt ) = @_;
+
+  my $did = $self->username; #yup
+
+  my $prefix = $opt{'default_prefix'}; #convergent.au '+61'
+
+  my $for_update = $opt{'for_update'} ? 'FOR UPDATE' : '';
+
+  #SELECT $for_update * FROM cdr
+  #  WHERE calldate >= $start #need a conversion
+  #    AND calldate <  $end   #ditto
+  #    AND (    charged_party = "$did"
+  #          OR charged_party = "$prefix$did" #if length($prefix);
+  #          OR ( ( charged_party IS NULL OR charged_party = '' )
+  #               AND
+  #               ( src = "$did" OR src = "$prefix$did" ) # if length($prefix)
+  #             )
+  #        )
+  #    AND ( freesidestatus IS NULL OR freesidestatus = '' )
+
+  my $charged_or_src;
+  if ( length($prefix) ) {
+    $charged_or_src =
+      " AND (    charged_party = '$did' 
+              OR charged_party = '$prefix$did'
+              OR ( ( charged_party IS NULL OR charged_party = '' )
+                   AND
+                   ( src = '$did' OR src = '$prefix$did' )
+                 )
+            )
+      ";
+  } else {
+    $charged_or_src = 
+      " AND (    charged_party = '$did' 
+              OR ( ( charged_party IS NULL OR charged_party = '' )
+                   AND
+                   src = '$did'
+                 )
+            )
+      ";
+
+  }
+
+  qsearch(
+    'select'    => "$for_update *",
+    'table'     => 'cdr',
+    'hashref'   => {
+                     #( freesidestatus IS NULL OR freesidestatus = '' )
+                     'freesidestatus' => '',
+                   },
+    'extra_sql' => $charged_or_src,
+
+  );
+
+}
+
 =item radius_groups
 
 Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 6360d5303..a70be40e4 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -322,3 +322,5 @@ FS/inventory_class.pm
 t/inventory_class.t
 FS/inventory_item.pm
 t/inventory_item.t
+FS/cdr_upstream_rate.pm
+t/cdr_upstream_rate.t
diff --git a/FS/t/cdr_upstream_rate.t b/FS/t/cdr_upstream_rate.t
new file mode 100644
index 000000000..f9458c527
--- /dev/null
+++ b/FS/t/cdr_upstream_rate.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cdr_upstream_rate;
+$loaded=1;
+print "ok 1\n";
diff --git a/bin/cdr_upstream_rate.import b/bin/cdr_upstream_rate.import
new file mode 100755
index 000000000..fda3883b5
--- /dev/null
+++ b/bin/cdr_upstream_rate.import
@@ -0,0 +1,142 @@
+#!/usr/bin/perl -w
+#
+# Usage: bin/cdr_upstream_rate.import username ratenum filename 
+#
+# records will be imported into cdr_upstream_rate, rate_detail and rate_region
+# 
+# Example: bin/cdr_upstream_rate.import ivan 1 ~ivan/convergent/sample_rate_table.csv
+#
+#   username: a freeside login (from /usr/local/etc/freeside/mapsecrets)
+#   ratenum: rate plan (FS::rate) created with the web UI
+#   filename: CSV file
+#
+#     the following fields are currently used:
+#       - Class Code         => cdr_upstream_rate.rateid
+#       - Description        => rate_region.regionname
+#                               (rate_detail->dest_region)
+#       - 1_rate             => ( * 60 / 1_rate_seconds ) => rate_detail.min_charge
+#       - 1_rate_seconds     => (used above)
+#       - 1_second_increment => rate_detail.sec_granularity
+#
+#     the following fields are not (yet) used:
+#       - Flagfall           => what's this for?
+#
+#       - 1_cap_time         => freeside doesn't have voip time caps yet...
+#       - 1_cap_cost         => freeside doesn't have voip cost caps yet...
+#       - 1_repeat           => not sure what this is for, sample data is all 0
+#
+#       - 2_rate             => \
+#       - 2_rate_seconds     =>  |
+#       - 2_second_increment =>  | not sure what the second set of rate data
+#       - 2_cap_time         =>  | is supposed to be for...
+#       - 2_cap_cost         =>  |
+#       - 2_repeat           => /
+#
+#       - Carrier            => probably not needed?
+#       - Start Date         => not necessary?
+
+use strict;
+use vars qw( $DEBUG );
+use Text::CSV_XS;
+use FS::UID qw(dbh adminsuidsetup);
+use FS::Record qw(qsearchs);
+use FS::rate;
+use FS::cdr_upstream_rate;
+use FS::rate_detail;
+use FS::rate_region;
+
+$DEBUG = 1;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+my $ratenum = shift or die &usage;
+
+my $rate = qsearchs( 'rate', { 'ratenum' => $ratenum } );
+die "rate plan $ratenum not found in rate table\n"
+  unless $rate;
+
+my $csv = new Text::CSV_XS;
+my $hline = scalar(<>);
+chomp($hline);
+$csv->parse($hline) or die "can't parse header: $hline\n";
+my @header = $csv->fields();
+
+$FS::UID::AutoCommit = 0;
+
+while (<>) {
+
+  chomp;
+  my $line = $_;
+
+#  #$line =~ /^(\d+),"([^"]+)"$/ or do {
+#  #}
+#  $line =~ /^(\d+),"([^"]+)"/ or do {
+#    warn "unparsable line: $line\n";
+#    next;
+#  };
+
+  $csv->parse($line) or die "can't parse line: $line\n";
+  my @line = $csv->fields();
+
+  my %hash = map { $_ => shift(@line) } @header;
+
+  warn join('', map { "$_ => $hash{$_}\n" } keys %hash )
+    if $DEBUG > 1;
+
+  my $rate_region = new FS::rate_region {
+    'regionname' => $hash{'Description'}
+  };
+
+  my $error = $rate_region->insert;
+  if ( $error ) {
+    dbh->rollback;
+    die "error inserting into rate_region: $error\n";
+  }
+  my $dest_regionnum = $rate_region->regionnum;
+  warn "rate_region $dest_regionnum inserted\n"
+    if $DEBUG;
+
+  my $rate_detail = new FS::rate_detail {
+    'ratenum'         => $ratenum,
+    'dest_regionnum'  => $dest_regionnum,
+    'min_included'    => 0,
+    #'min_charge',     => sprintf('%.5f', 60 * $hash{'1_rate'} / $hash{'1_rate_seconds'} ),
+    'min_charge',     => sprintf('%.5f', $hash{'1_rate'} /
+                                         ( $hash{'1_rate_seconds'} / 60 )
+                                ),
+    'sec_granularity' => $hash{'1_second_increment'},
+  };
+  $error = $rate_detail->insert;
+  if ( $error ) {
+    dbh->rollback;
+    die "error inserting into rate_detail: $error\n";
+  }
+  my $ratedetailnum = $rate_detail->ratedetailnum;
+  warn "rate_detail $ratedetailnum inserted\n"
+    if $DEBUG;
+
+  my $cdr_upstream_rate = new FS::cdr_upstream_rate {
+    'upstream_rateid'  => $hash{'Class Code'},
+    'ratedetailnum'    => $rate_detail->ratedetailnum,
+  };
+  $error = $cdr_upstream_rate->insert;
+  if ( $error ) {
+    dbh->rollback;
+    die "error inserting into cdr_upstream_rate: $error\n";
+  }
+  warn "cdr_upstream_rate ". $cdr_upstream_rate->upstreamratenum. " inserted\n"
+    if $DEBUG;
+
+  dbh->commit or die "can't commit: ". dbh->errstr;
+
+  warn "\n" if $DEBUG;
+
+}
+
+dbh->commit or die "can't commit: ". dbh->errstr;
+
+sub usage {
+  "Usage:\n\ncdr_upstream_rate.import username ratenum filename\n";
+}
+
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 96f777baa..790f41f00 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -348,7 +348,7 @@ if ( $payby_default eq 'HIDE' ) {
 
   );
 
-
+  #this should use FS::payby
   my %allopt = (
     'CARD' => 'Credit card',
     'CHEK' => 'Electronic check',
@@ -433,6 +433,14 @@ if ( $payby_default eq 'HIDE' ) {
       <TD WIDTH="408"><INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) %>"></TD>
     </TR>
 
+    <% if ( $conf->exists('voip-cust_cdr_spools') ) { %>
+      <TR>
+       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="spool_cdr" VALUE="Y" <%= $cust_main->spool_cdr eq "Y" ? 'CHECKED' : '' %>> Spool CDRs</TD>
+      </TR>
+    <% } else { %>
+      <INPUT TYPE="hidden" NAME="spool_cdr" VALUE="<%= $cust_main->spool_cdr %>">
+    <% } %>
+
   </TABLE>
 
   </FORM>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 61e4086be..158c6e2ff 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -297,16 +297,35 @@ my $widget = new HTML::Widgets::SelectLayers(
         $html .= ' MULTIPLE'
           if $href->{$field}{'type'} eq 'select_multiple';
         $html .= qq! NAME="$field" onChange="fchanged(this)">!;
-        foreach my $record (
-          qsearch( $href->{$field}{'select_table'},
-                   $href->{$field}{'select_hash'}   )
-        ) {
-          my $value = $record->getfield($href->{$field}{'select_key'});
-          $html .= qq!<OPTION VALUE="$value"!.
-                   (  $plandata{$field} =~ /(^|, *)$value *(,|$)/
-                        ? ' SELECTED'
-                        : ''          ).
-                   '>'. $record->getfield($href->{$field}{'select_label'})
+
+        if ( $href->{$field}{'select_table'} ) {
+          foreach my $record (
+            qsearch( $href->{$field}{'select_table'},
+                     $href->{$field}{'select_hash'}   )
+          ) {
+            my $value = $record->getfield($href->{$field}{'select_key'});
+            $html .= qq!<OPTION VALUE="$value"!.
+                     (  $plandata{$field} =~ /(^|, *)$value *(,|$)/
+                          ? ' SELECTED'
+                          : ''
+                     ).
+                     '>'. $record->getfield($href->{$field}{'select_label'});
+          }
+        } elsif ( $href->{$field}{'select_options'} ) {
+          foreach my $key ( keys %{ $href->{$field}{'select_options'} } ) {
+            my $value = $href->{$field}{'select_options'}{$key};
+            $html .= qq!<OPTION VALUE="$key"!.
+                     ( $plandata{$field} =~ /(^|, *)$value *(,|$)/
+                         ? ' SELECTED'
+                         : ''
+                     ).
+                     '>'. $value;
+          }
+
+        } else {
+          $html .= '<font color="#ff0000">warning: '.
+                   "don't know how to retreive options for $field select field".
+                   '</font>';
         }
         $html .= '</SELECT>';
       }
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index f8f67f6c4..9aa4e7291 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -13,7 +13,9 @@ my $action = $rate->ratenum ? 'Edit' : 'Add';
 my $p1 = popurl(1);
 
 my %granularity = (
+  '1', => '1 second',
   '6'  => '6 second',
+  '30' => '30 second', # '1/2 minute',
   '60' => 'minute',
 );
 
@@ -60,9 +62,10 @@ Rate plan
      qsearch({
                'select'    => 'DISTINCT ON ( regionnum ) rate_region.*',
                'table'     => 'rate_region',
-               'addl_from' => 'INNER JOIN rate_prefix USING ( regionnum )',
                'hashref'   => {},
-               'extra_sql' => "WHERE countrycode != '1'",
+               #'addl_from' => 'INNER JOIN rate_prefix USING ( regionnum )',
+               #'extra_sql' => "WHERE countrycode != '1'",
+
                               # 'ORDER BY regionname'
                               # ERROR: SELECT DISTINCT ON expressions must
                               #        match initial ORDER BY expressions
diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html
index 75049b443..ec847e41f 100644
--- a/httemplate/search/cdr.html
+++ b/httemplate/search/cdr.html
@@ -1,13 +1,28 @@
 <%
 
+my $title = 'Call Detail Records';
 my $hashref = {};
-#process params for CDR search, populate $hashref...
-
 my $count_query = 'SELECT COUNT(*) FROM cdr';
+
+#process params for CDR search, populate $hashref...
 # and fixup $count_query
 
+if ( $cgi->param('freesidestatus') eq 'NULL' ) {
+
+  my $title = "Unprocessed $title";
+  $hashref->{'freesidestatus'} = ''; # Record.pm will take care of it
+  $count_query .= " AND ( freesidestatus IS NULL OR freesidestatus = '' )";
+
+} elsif ( $cgi->param('freesidestatus') =~ /^([\w ]+)$/ ) {
+
+  my $title = "Processed $title";
+  $hashref->{'freesidestatus'} = $1;
+  $count_query .= " AND freesidestatus = '$1'";
+
+}
+
 %><%= include( 'elements/search.html',
-               'title' => 'Call Detail Records',
+               'title' => $title,
                'name'  => 'call detail records',
                'query' => { 'table'   => 'cdr',
                             'hashref' => $hashref
diff --git a/httemplate/search/report_cdr.html b/httemplate/search/report_cdr.html
index b9ad55e10..924e28bd7 100644
--- a/httemplate/search/report_cdr.html
+++ b/httemplate/search/report_cdr.html
@@ -1,6 +1,11 @@
 <%= include('/elements/header.html', 'Call Detail Record Search' ) %>
 
 <FORM ACTION="cdr.html" METHOD="GET">
+Status: <SELECT NAME="freesidestatus">
+  <OPTION VALUE="">(all)
+  <OPTION VALUE="NULL">unprocessed
+  <OPTION VALUE="done"">processed
+</SELECT><BR>
 <INPUT TYPE="submit" VALUE="Search Call Detail Records">
 
 <%= include('/elements/footer.html') %>
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 5786a0711..895814cc2 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -159,6 +159,12 @@ if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
     <%= join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %>
   </TD>
 </TR>
+<% my $conf = new FS::Conf; if ( $conf->exists('voip-cust_cdr_spools') ) { %>
+  <TR>
+    <TD ALIGN="right">Spool&nbsp;CDRs</TD>
+    <TD BGCOLOR="#ffffff"><%= $cust_main->spool_cdr ? 'yes' : 'no' %></TD>
+  </TR>
+<% } %>
 
 </TABLE></TD></TR></TABLE>
 
-- 
cgit v1.2.1


From 6235203383153fb1d3725662db4ee3e779b449f4 Mon Sep 17 00:00:00 2001
From: lsc <lsc>
Date: Thu, 23 Mar 2006 12:00:07 +0000
Subject: for subscription.pm and prorate.pm:

-modify the subscription and prorate price plans
(FS/FS/part_pkg/subscription.pm and prorate.pm) to have a
configurable (add a field to the %info hash) billing day instead of
"1st of the month" only.  subscription will be easy, prorate will be a
little trickier.

essentially, I replaced the '1' in the 'day' field of the timelocal that generates $$date with the value I added to the %info hash, 'cutoff_day'


-implement a price plan (new file in FS/FS/part_pkg/ - probably @ISA
FS::part_pkg::subscription) that charges the first full month if the
customer signs up between the 1st and the configurable billing day,
and gives them the remainder of the month free if they sign up
between the configurable billing day and the end of the month.

if this is the first time the customer is billed, and if the date is greater than the cutoff date, advance $ssdate to cutoff_day of next month, else $$date is cutoff_date of this month.  Either way, charge them for a month.

----------------------------------------------------------------------
---
 FS/FS/part_pkg/billoneday.pm   | 48 ++++++++++++++++++++++++++++++++++++++++++
 FS/FS/part_pkg/prorate.pm      | 14 +++++++-----
 FS/FS/part_pkg/subscription.pm | 15 +++++++------
 3 files changed, 66 insertions(+), 11 deletions(-)
 create mode 100644 FS/FS/part_pkg/billoneday.pm

diff --git a/FS/FS/part_pkg/billoneday.pm b/FS/FS/part_pkg/billoneday.pm
new file mode 100644
index 000000000..8740547a3
--- /dev/null
+++ b/FS/FS/part_pkg/billoneday.pm
@@ -0,0 +1,48 @@
+package FS::part_pkg::billoneday;
+
+use strict;
+use vars qw(@ISA %info);
+use Time::Local qw(timelocal);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg::flat;
+
+@ISA = qw(FS::part_pkg::flat);
+
+%info = (
+  'name' => 'charge a full month  every (selectable) billing day',
+  'fields' => {
+    'setup_fee' => { 'name' => 'Setup fee for this package',
+                     'default' => 0,
+                   },
+    'recur_fee' => { 'name' => 'Recurring fee for this package',
+                     'default' => 0,
+			   },
+    'cutoff_day' => { 'name' => 'billing day',
+                      'default' => 1,
+                    },
+
+  },
+  'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day'],
+  #'setup' => 'what.setup_fee.value',
+  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year); \' + what.recur_fee.value',
+  'freq' => 'm',
+  'weight' => 30,
+);
+
+sub calc_recur {
+  my($self, $cust_pkg, $sdate ) = @_;
+
+  my $mnow = $$sdate;
+  my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
+  my $mstart = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year);
+  my $mend = timelocal(0,0,0,$self->option('cutoff_day'), $mon == 11 ? 0 : $mon+1, $year+($mon==11));
+
+  if($mday > $self->option('cutoff_date') and $mstart != $mnow ) {
+    $$sdate = timelocal(0,0,0,$self->option('cutoff_day'), $mon == 11 ? 0 : $mon+1,  $year+($mon==11));
+  }
+  else{
+    $$sdate = timelocal(0,0,0,$self->option('cutoff_day'), $mon, $year);
+  }
+  $self->option('recur_fee');
+}
+1;
diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
index 86c64d53a..d9464eef9 100644
--- a/FS/FS/part_pkg/prorate.pm
+++ b/FS/FS/part_pkg/prorate.pm
@@ -9,7 +9,7 @@ use FS::part_pkg::flat;
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
+  'name' => 'First partial month pro-rated, then flat-rate (selectable billing day)',
   'fields' =>  {
     'setup_fee' => { 'name' => 'Setup fee for this package',
                      'default' => 0,
@@ -21,8 +21,12 @@ use FS::part_pkg::flat;
                                    ' of service at cancellation',
                          'type' => 'checkbox',
                        },
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit' ],
+    'cutoff_day' => { 'name' => 'billing day',
+			 'default' => 1,
+					    },
+
+ },
+  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'cutoff_day' ],
   #'setup' => 'what.setup_fee.value',
   #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
   'freq' => 'm',
@@ -33,8 +37,8 @@ sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
-  my $mstart = timelocal(0,0,0,1,$mon,$year);
-  my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
+  my $mstart = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year);
+  my $mend = timelocal(0,0,0,$self->option('cutoff_day'), $mon == 11 ? 0 : $mon+1, $year+($mon==11));
   $$sdate = $mstart;
 
   my $permonth = $self->option('recur_fee') / $self->freq;
diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm
index 36b5a96fb..8ea791154 100644
--- a/FS/FS/part_pkg/subscription.pm
+++ b/FS/FS/part_pkg/subscription.pm
@@ -9,18 +9,22 @@ use FS::part_pkg::flat;
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'First partial month full charge, then flat-rate (1st of month billing)',
+  'name' => 'First partial month full charge, then flat-rate (selectable month billing)',
   'fields' => {
     'setup_fee' => { 'name' => 'Setup fee for this package',
                      'default' => 0,
                    },
     'recur_fee' => { 'name' => 'Recurring fee for this package',
                      'default' => 0,
-                   },
+			   },
+    'cutoff_day' => { 'name' => 'billing day',
+                      'default' => 1,
+                    },
+
   },
-  'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+  'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day'],
   #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,1,$mon,$year); \' + what.recur_fee.value',
+  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year); \' + what.recur_fee.value',
   'freq' => 'm',
   'weight' => 30,
 );
@@ -30,9 +34,8 @@ sub calc_recur {
 
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
-  $$sdate = timelocal(0,0,0,1,$mon,$year);
+  $$sdate = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year);
 
   $self->option('recur_fee');
 }
-
 1;
-- 
cgit v1.2.1


From c39fc534e347971479110595c6a4bb36b40e1198 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 24 Mar 2006 19:49:53 +0000
Subject: fix spelling

---
 httemplate/misc/process/payment.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
index fa0ede89c..d21c57c40 100644
--- a/httemplate/misc/process/payment.cgi
+++ b/httemplate/misc/process/payment.cgi
@@ -126,7 +126,7 @@ if ( $cgi->param('save') ) {
   $new->set( $_ => $cgi->param($_) ) foreach @{$payby2fields{$payby}};
 
   my $error = $new->replace($cust_main);
-  eidiot "payment processed sucessfully, but error saving info: $error"
+  eidiot "payment processed successfully, but error saving info: $error"
     if $error;
   $cust_main = $new;
 }
@@ -134,7 +134,7 @@ if ( $cgi->param('save') ) {
 #success!
 
 %>
-<%= include( '/elements/header.html', ucfirst($type{$payby}). ' processing sucessful',
+<%= include( '/elements/header.html', ucfirst($type{$payby}). ' processing successful',
              include('/elements/menubar.html',
                        'Main menu' => popurl(3),
                        "View this customer (#$custnum)" =>
-- 
cgit v1.2.1


From b9f9a5dc444a66ca138073a0e5229d85569e51b4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 25 Mar 2006 02:23:26 +0000
Subject: successfully correct the spelling of sucessful

---
 FS/FS/cust_main.pm                                          | 10 +++++-----
 FS/FS/queue_depend.pm                                       |  2 +-
 FS/FS/svc_acct.pm                                           |  4 ++--
 FS/bin/freeside-setup                                       |  2 +-
 fs_selfservice/FS-SelfService/cgi/agent.cgi                 |  8 ++++----
 fs_selfservice/FS-SelfService/cgi/payment_results.html      |  2 +-
 fs_selfservice/FS-SelfService/cgi/process_svc_acct.html     |  2 +-
 fs_selfservice/FS-SelfService/cgi/process_svc_external.html |  2 +-
 fs_selfservice/FS-SelfService/cgi/recharge_results.html     |  2 +-
 httemplate/misc/process/cdr-import.html                     |  4 ++--
 httemplate/misc/process/cust_main-import.cgi                |  2 +-
 httemplate/misc/process/cust_main-import_charges.cgi        |  2 +-
 httemplate/misc/process/inventory_item-import.html          |  4 ++--
 httemplate/misc/upload-batch.cgi                            |  2 +-
 14 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 99d27dd5e..62e6a5c44 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -336,7 +336,7 @@ Currently available options are: I<depend_jobnum> and I<noexport>.
 If I<depend_jobnum> is set, all provisioning jobs will have a dependancy
 on the supplied jobnum (they will not run until the specific job completes).
 This can be used to defer provisioning until some action completes (such
-as running the customer's credit card sucessfully).
+as running the customer's credit card successfully).
 
 The I<noexport> option is deprecated.  If I<noexport> is set true, no
 provisioning jobs (exports) are scheduled.  (You can schedule them later with
@@ -480,7 +480,7 @@ Currently available options are: I<depend_jobnum> and I<noexport>.
 If I<depend_jobnum> is set, all provisioning jobs will have a dependancy
 on the supplied jobnum (they will not run until the specific job completes).
 This can be used to defer provisioning until some action completes (such
-as running the customer's credit card sucessfully).
+as running the customer's credit card successfully).
 
 The I<noexport> option is deprecated.  If I<noexport> is set true, no
 provisioning jobs (exports) are scheduled.  (You can schedule them later with
@@ -2234,7 +2234,7 @@ if set, will override the value from the customer record.
 I<description> is a free-text field passed to the gateway.  It defaults to
 "Internet services".
 
-If an I<invnum> is specified, this payment (if sucessful) is applied to the
+If an I<invnum> is specified, this payment (if successful) is applied to the
 specified invoice.  If you don't specify an I<invnum> you might want to
 call the B<apply_payments> method.
 
@@ -2488,7 +2488,7 @@ sub realtime_bop {
     $capture->submit();
 
     unless ( $capture->is_success ) {
-      my $e = "Authorization sucessful but capture failed, custnum #".
+      my $e = "Authorization successful but capture failed, custnum #".
               $self->custnum. ': '.  $capture->result_code.
               ": ". $capture->error_message;
       warn $e;
@@ -2668,7 +2668,7 @@ gateway is attempted.
 #I<zip>, I<payinfo> and I<paydate> are also available.  Any of these options,
 #if set, will override the value from the customer record.
 
-#If an I<invnum> is specified, this payment (if sucessful) is applied to the
+#If an I<invnum> is specified, this payment (if successful) is applied to the
 #specified invoice.  If you don't specify an I<invnum> you might want to
 #call the B<apply_payments> method.
 
diff --git a/FS/FS/queue_depend.pm b/FS/FS/queue_depend.pm
index bc910d8e9..99a22c5c6 100644
--- a/FS/FS/queue_depend.pm
+++ b/FS/FS/queue_depend.pm
@@ -43,7 +43,7 @@ inherits from FS::Record.  The following fields are currently supported:
 
 The job specified by B<jobnum> depends on the job specified B<depend_jobnum> -
 the B<jobnum> job will not be run until the B<depend_jobnum> job has completed
-sucessfully (or manually removed).
+successfully (or manually removed).
 
 =head1 METHODS
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index a2b7a11c7..2872a5f74 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1267,7 +1267,7 @@ sub _op_seconds {
     }
   }
 
-  warn "$me update sucessful; committing\n"
+  warn "$me update successful; committing\n"
     if $DEBUG;
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
@@ -1455,7 +1455,7 @@ sub clone_kludge_unsuspend {
 =item check_password 
 
 Checks the supplied password against the (possibly encrypted) password in the
-database.  Returns true for a sucessful authentication, false for no match.
+database.  Returns true for a successful authentication, false for no match.
 
 Currently supported encryptions are: classic DES crypt() and MD5
 
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index bff2bcc63..9f87f10b7 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -109,7 +109,7 @@ warn "Freeside database initialized - commiting transaction\n" if $opt_v;
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
-warn "Database initialization committed sucessfully\n" if $opt_v;
+warn "Database initialization committed successfully\n" if $opt_v;
 
 sub dbdef_create { # reverse engineer the schema from the DB and save to file
   my( $dbh, $file ) = @_;
diff --git a/fs_selfservice/FS-SelfService/cgi/agent.cgi b/fs_selfservice/FS-SelfService/cgi/agent.cgi
index 695d20e4c..b51938d5c 100644
--- a/fs_selfservice/FS-SelfService/cgi/agent.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/agent.cgi
@@ -193,7 +193,7 @@ sub process_signup {
   } else {
     $action = 'agent_main';
     my $agent_info = agent_info( 'session_id' => $session_id );
-    $agent_info->{'message'} = 'Signup sucessful';
+    $agent_info->{'message'} = 'Signup successful';
     $agent_info;
   }
 
@@ -324,7 +324,7 @@ sub process_svc_acct {
     $action = 'agent_provision';
     return {
       %{agent_provision()},
-      'message' => $result->{'svc'}. ' setup sucessfully.',
+      'message' => $result->{'svc'}. ' setup successfully.',
     };
   }
 
@@ -343,7 +343,7 @@ sub process_svc_external {
     %{agent_provision()},
     'message' => $result->{'error'}
                    ? '<FONT COLOR="#FF0000">'. $result->{'error'}. '</FONT>'
-                   : $result->{'svc'}. ' setup sucessfully'.
+                   : $result->{'svc'}. ' setup successfully'.
                      ': serial number '.
                      sprintf('%010d', $result->{'id'}). '-'. $result->{'title'}
   };
@@ -403,7 +403,7 @@ sub process_order_pkg {
     #$cgi->delete( grep { $_ ne 'custnum' } $cgi->param );
     return {
       %{view_customer()},
-      'message' => 'Package order sucessful.',
+      'message' => 'Package order successful.',
     };
   }
 
diff --git a/fs_selfservice/FS-SelfService/cgi/payment_results.html b/fs_selfservice/FS-SelfService/cgi/payment_results.html
index de6c54dae..9fe400faf 100644
--- a/fs_selfservice/FS-SelfService/cgi/payment_results.html
+++ b/fs_selfservice/FS-SelfService/cgi/payment_results.html
@@ -7,7 +7,7 @@
 <%= if ( $error ) {
   $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error processing your payment: $error</FONT>!;
 } else {
-  $OUT .= 'Your payment was processed sucessfully.  Thank you.';
+  $OUT .= 'Your payment was processed successfully.  Thank you.';
 } %>
 </TD></TR></TABLE>
 <HR>
diff --git a/fs_selfservice/FS-SelfService/cgi/process_svc_acct.html b/fs_selfservice/FS-SelfService/cgi/process_svc_acct.html
index 200a80dc9..3b812919a 100644
--- a/fs_selfservice/FS-SelfService/cgi/process_svc_acct.html
+++ b/fs_selfservice/FS-SelfService/cgi/process_svc_acct.html
@@ -4,7 +4,7 @@
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 
-<FONT SIZE=4><%= $svc %> setup sucessfully.</FONT>
+<FONT SIZE=4><%= $svc %> setup successfully.</FONT>
 
 </TD></TR></TABLE>
 <HR>
diff --git a/fs_selfservice/FS-SelfService/cgi/process_svc_external.html b/fs_selfservice/FS-SelfService/cgi/process_svc_external.html
index 2328fa10f..19fec737f 100644
--- a/fs_selfservice/FS-SelfService/cgi/process_svc_external.html
+++ b/fs_selfservice/FS-SelfService/cgi/process_svc_external.html
@@ -4,7 +4,7 @@
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 
-<FONT SIZE=4><%= $svc %> setup sucessfully.</FONT>
+<FONT SIZE=4><%= $svc %> setup successfully.</FONT>
 
 <BR><BR>Your serial number is <%= sprintf("%010d-$title", $id) %>
 
diff --git a/fs_selfservice/FS-SelfService/cgi/recharge_results.html b/fs_selfservice/FS-SelfService/cgi/recharge_results.html
index ec3ea2c7a..b1eb7cb7a 100644
--- a/fs_selfservice/FS-SelfService/cgi/recharge_results.html
+++ b/fs_selfservice/FS-SelfService/cgi/recharge_results.html
@@ -7,7 +7,7 @@
 <%= if ( $error ) {
   $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error processing your prepaid card: $error</FONT>!;
 } else {
-  $OUT .= 'Prepaid card recharge sucessful!<BR><BR>';
+  $OUT .= 'Prepaid card recharge successful!<BR><BR>';
 
   $OUT .= '$'. sprintf('%.2f', $amount). ' added to your account.<BR><BR>'
     if $amount;
diff --git a/httemplate/misc/process/cdr-import.html b/httemplate/misc/process/cdr-import.html
index 381b07820..653dd479e 100644
--- a/httemplate/misc/process/cdr-import.html
+++ b/httemplate/misc/process/cdr-import.html
@@ -19,8 +19,8 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= include("/elements/header.html",'Import sucessful') %>
+    <%= include("/elements/header.html",'Import successful') %>
     <!-- XXX redirect to batch search like the payment entry... -->
-    <%= include("/elements/footer.html",'Import sucessful') %> <%
+    <%= include("/elements/footer.html",'Import successful') %> <%
   }
 %>
diff --git a/httemplate/misc/process/cust_main-import.cgi b/httemplate/misc/process/cust_main-import.cgi
index 2348ef680..371929a5e 100644
--- a/httemplate/misc/process/cust_main-import.cgi
+++ b/httemplate/misc/process/cust_main-import.cgi
@@ -25,6 +25,6 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= include("/elements/header.html",'Import sucessful') %> <%
+    <%= include("/elements/header.html",'Import successful') %> <%
   }
 %>
diff --git a/httemplate/misc/process/cust_main-import_charges.cgi b/httemplate/misc/process/cust_main-import_charges.cgi
index c14228cf4..404dfde2e 100644
--- a/httemplate/misc/process/cust_main-import_charges.cgi
+++ b/httemplate/misc/process/cust_main-import_charges.cgi
@@ -21,6 +21,6 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= include("/elements/header.html",'Import sucessful') %> <%
+    <%= include("/elements/header.html",'Import successful') %> <%
   }
 %>
diff --git a/httemplate/misc/process/inventory_item-import.html b/httemplate/misc/process/inventory_item-import.html
index 8a58203c2..e98a6ed2a 100644
--- a/httemplate/misc/process/inventory_item-import.html
+++ b/httemplate/misc/process/inventory_item-import.html
@@ -19,9 +19,9 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= include("/elements/header.html",'Import sucessful') %>
+    <%= include("/elements/header.html",'Import successful') %>
     <!-- XXX redirect to batch search like the payment entry... -->
-    <%= include("/elements/footer.html",'Import sucessful') %> <%
+    <%= include("/elements/footer.html",'Import successful') %> <%
   }
 %>
 
diff --git a/httemplate/misc/upload-batch.cgi b/httemplate/misc/upload-batch.cgi
index 24d7cf15c..746b81b17 100644
--- a/httemplate/misc/upload-batch.cgi
+++ b/httemplate/misc/upload-batch.cgi
@@ -24,7 +24,7 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= include("/elements/header.html",'Batch results upload sucessful') %> <%
+    <%= include("/elements/header.html",'Batch results upload successful') %> <%
   }
 %>
 
-- 
cgit v1.2.1


From ee8ec98f0161b6fe11a231c7ac44e50811723b99 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 30 Mar 2006 14:22:38 +0000
Subject: move all the schema-updating magic into DBIx::DBSchema

---
 FS/bin/freeside-upgrade | 92 +++----------------------------------------------
 README.1.7.0            |  6 +++-
 2 files changed, 9 insertions(+), 89 deletions(-)

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 419384c2a..25d883fcf 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -3,14 +3,11 @@
 use strict;
 use vars qw($DEBUG $DRY_RUN);
 use Term::ReadKey;
-use DBIx::DBSchema 0.27;
+use DBIx::DBSchema 0.31;
 use FS::UID qw(adminsuidsetup checkeuid datasrc );  #getsecrets);
 use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
 
-
 $DEBUG = 1;
-$DRY_RUN = 0;
-
 
 die "Not running uid freeside!" unless checkeuid();
 
@@ -25,63 +22,9 @@ dbdef_create($dbh, $dbdef_file);
 delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
 reload_dbdef($dbdef_file);
 
-
-foreach my $table ( dbdef_dist->tables ) {
-
-  if ( dbdef->table($table) ) {
-
-    warn "$table exists\n" if $DEBUG > 1;
-
-    foreach my $column ( dbdef_dist->table($table)->columns ) {
-      if ( dbdef->table($table)->column($column) )  {
-        warn "  $table.$column exists\n" if $DEBUG > 2;
-      } else {
-
-        if ( $DEBUG ) {
-          print STDERR "column $table.$column does not exist.  create?";
-          next unless yesno();
-        }
-
-        foreach my $statement (
-          dbdef_dist->table($table)->column($column)->sql_add_column( $dbh )
-        ) {
-          warn "$statement\n" if $DEBUG || $DRY_RUN;
-          unless ( $DRY_RUN ) {
-            $dbh->do( $statement)
-              or die "CREATE error: ". $dbh->errstr. "\nexecuting: $statement";
-          }
-        }
-
-      }
-
-    }
-
-    #should eventually check & create missing indices
-
-    #should eventually drop columns not in dbdef_dist...
-
-  } else {
-
-    if ( $DEBUG ) {
-      print STDERR "table $table does not exist.  create?";
-      next unless yesno();
-    }
-
-    foreach my $statement (
-      dbdef_dist->table($table)->sql_create_table( $dbh )
-    ) {
-      warn "$statement\n" if $DEBUG || $DRY_RUN;
-      unless ( $DRY_RUN ) {
-        $dbh->do( $statement)
-          or die "CREATE error: ". $dbh->errstr. "\nexecuting: $statement";
-      }
-    }
-
-  }
-
-}
-
-# should eventually drop tables not in dbdef_dist too i guess...
+$DBIx::DBSchema::DEBUG = $DEBUG;
+$DBIx::DBSchema::Table::DEBUG = $DEBUG;
+dbdef->update_schema( dbdef_dist, $dbh );
 
 $dbh->commit or die $dbh->errstr;
 
@@ -91,32 +34,6 @@ $dbh->disconnect or die $dbh->errstr;
 
 ###
 
-my $all = 0;
-sub yesno {
-  print STDERR ' [yes/no/all] ';
-  if ( $all ) {
-    warn "yes\n";
-    return 1;
-  } else {
-    while ( 1 ) {
-      ReadMode 4;
-      my $x = lc(ReadKey);
-      ReadMode 0;
-      if ( $x eq 'n' ) {
-        warn "no\n"; 
-        return 0;
-      } elsif ( $x eq 'y' ) {
-        warn "yes\n"; 
-        return 1;
-      } elsif ( $x eq 'a' ) {
-        warn "yes\n"; 
-        $all = 1;
-        return 1;
-      }
-    }
-  }
-}
-
 sub dbdef_create { # reverse engineer the schema from the DB and save to file
   my( $dbh, $file ) = @_;
   my $dbdef = new_native DBIx::DBSchema $dbh;
@@ -128,4 +45,3 @@ sub usage {
 }
 
 1;
-
diff --git a/README.1.7.0 b/README.1.7.0
index 834972ae2..62d6232c1 100644
--- a/README.1.7.0
+++ b/README.1.7.0
@@ -1,5 +1,5 @@
 
-install DBIx::DBSchema 0.29 (or later)
+install DBIx::DBSchema 0.31 (or later)
 
 make install-perl-modules
 run "freeside-upgrade username" to uprade your database schema
@@ -12,6 +12,10 @@ to the new cust_tax_exempt_pkg table.  An example script to get you started is
 in bin/fs-migrate-cust_tax_exempt - it may need to be customized for your
 specific data.
 
+Optional for better zip code report performance:
+CREATE INDEX cust_main16 on cust_main ( zip );
+CREATE INDEX cust_main17 on cust_main ( ship_zip );
+
 ------
 
 make install-docs
-- 
cgit v1.2.1


From fe413bf637b9cc4375defe83d8d7e1e9ed06b9dc Mon Sep 17 00:00:00 2001
From: lsc <lsc>
Date: Fri, 31 Mar 2006 09:20:54 +0000
Subject: fixed the errors pointed out by Ivan in the following email:

----
before and after now?  I gave subscription and prorate a try.
Subscription came out as:

  subscription 27th (03/25/06 - 04/27/06)  $10.00
  subscription 23rd (03/25/06 - 04/23/06)  $10.00

the "23rd" one is right, but the "27th" one should have only advanced
the date two days to 3/27/06.

    Prorate came out as:

    prorate 23rd (03/25/06 - 04/23/06)  $9.20
    prorate 27th (03/25/06 - 04/27/06)  $10.49

The "23rd" one is right, but the "27th" one should have only advanced
the date two days to 4/27/06.


lsc@prgmr.com
---
 FS/FS/part_pkg/prorate.pm      | 19 +++++++++++++++----
 FS/FS/part_pkg/subscription.pm | 13 ++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
index d9464eef9..ac2f656b9 100644
--- a/FS/FS/part_pkg/prorate.pm
+++ b/FS/FS/part_pkg/prorate.pm
@@ -35,12 +35,23 @@ use FS::part_pkg::flat;
 
 sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
+  my $cutoff_day=$self->option('cutoff_day') or 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
-  my $mstart = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year);
-  my $mend = timelocal(0,0,0,$self->option('cutoff_day'), $mon == 11 ? 0 : $mon+1, $year+($mon==11));
-  $$sdate = $mstart;
-
+  my $mend;
+  my $mstart;
+  if($mday > $cutoff_day){
+    $mend = timelocal(0,0,0,$cutoff_day, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
+    $mstart=  timelocal(0,0,0,$cutoff_day,$mon,$year);  
+
+  }
+  else{
+    $mend = timelocal(0,0,0,$cutoff_day, $mon, $year);
+     if ($mon==0) {$mon=11;$year--;} else {$mon--;}
+    $mstart=  timelocal(0,0,0,$cutoff_day,$mon,$year);  
+  }
+
+   $$sdate = $mstart;
   my $permonth = $self->option('recur_fee') / $self->freq;
 
   $permonth * ( ( $self->freq - 1 ) + ($mend-$mnow) / ($mend-$mstart) );
diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm
index 8ea791154..ccfcc00a8 100644
--- a/FS/FS/part_pkg/subscription.pm
+++ b/FS/FS/part_pkg/subscription.pm
@@ -9,7 +9,7 @@ use FS::part_pkg::flat;
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'First partial month full charge, then flat-rate (selectable month billing)',
+  'name' => 'First partial month full charge, then flat-rate (selectable billing day)',
   'fields' => {
     'setup_fee' => { 'name' => 'Setup fee for this package',
                      'default' => 0,
@@ -23,18 +23,21 @@ use FS::part_pkg::flat;
 
   },
   'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day'],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year); \' + what.recur_fee.value',
   'freq' => 'm',
   'weight' => 30,
 );
 
 sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
-
+  my $cutoff_day=$self->option('cutoff_day') or 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
-  $$sdate = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year);
+
+  if($mday <$cutoff_day){
+     if ($mon==0) {$mon=11;$year--;}
+     else {$mon--;}
+  }
+$$sdate = timelocal(0,0,0,$cutoff_day,$mon,$year);
 
   $self->option('recur_fee');
 }
-- 
cgit v1.2.1


From 9719693a031bee8d35dffa7ea543f27a25443309 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 Mar 2006 23:22:08 +0000
Subject: quick sort fix for billing events

---
 httemplate/browse/part_bill_event.cgi | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index 380e4d78b..91e31d832 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -31,13 +31,14 @@ my $total = scalar(@part_bill_event);
    foreach my $payby ( keys %payby ) {
      my $oldfreq = '';
 
-     my @payby_part_bill_event =  grep { $payby eq $_->payby }
-                                  sort {    $a->freq      cmp $b->freq # for now
-                                         || $a->seconds   <=> $b->seconds
-                                         || $a->weight    <=> $b->weight
-                                         || $a->eventpart <=> $b->eventpart
-                                       }
-                                  @part_bill_event;
+     my @payby_part_bill_event =
+       grep { $payby eq $_->payby }
+       sort {    ( $a->freq || '1d') cmp ( $b->freq || '1d' ) # for now
+              ||   $a->seconds       <=>   $b->seconds
+              ||   $a->weight        <=>   $b->weight
+              ||   $a->eventpart     <=>   $b->eventpart
+            }
+       @part_bill_event;
 
 %>
 
-- 
cgit v1.2.1


From 36693c42cbaca86f6957d5ed6794624810018bb3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Apr 2006 22:13:34 +0000
Subject: typo

---
 FS/FS/cust_main.pm      | 2 +-
 FS/FS/cust_pay_batch.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 62e6a5c44..a2eb72473 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1311,7 +1311,7 @@ sub check {
   }
 
   if ( $self->paydate eq '' || $self->paydate eq '-' ) {
-    return "Expriation date required"
+    return "Expiration date required"
       unless $self->payby =~ /^(BILL|PREPAY|CHEK|DCHK|LECB|CASH|WEST|MCRD)$/;
     $self->paydate('');
   } else {
diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 8059f1ca2..25b796ba9 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -147,7 +147,7 @@ sub check {
   return "Unknown card type" if cardtype($cardnum) eq "Unknown";
 
   if ( $self->exp eq '' ) {
-    return "Expriation date required"; #unless 
+    return "Expiration date required"; #unless 
     $self->exp('');
   } else {
     if ( $self->exp =~ /^(\d{4})[\/\-](\d{1,2})[\/\-](\d{1,2})$/ ) {
-- 
cgit v1.2.1


From 929f432c766bbe3bdeed5b80818a12ddf6ec6339 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Apr 2006 09:46:57 +0000
Subject: have the UI use full country names, and state names outside the US...

---
 FS/FS/Misc.pm                                 | 181 +++++++++++++++++---------
 htetc/handler.pl                              |   4 +-
 httemplate/edit/cust_main/contact.html        |   2 +-
 httemplate/edit/cust_main/select-country.html |  11 +-
 httemplate/edit/cust_main/select-state.html   |  13 +-
 httemplate/misc/states.cgi                    |  14 +-
 httemplate/view/cust_main/contacts.html       |   4 +-
 7 files changed, 139 insertions(+), 90 deletions(-)

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index 2e383d549..101a2d4e0 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -7,7 +7,7 @@ use Carp;
 use Data::Dumper;
 
 @ISA = qw( Exporter );
-@EXPORT_OK = qw( send_email send_fax );
+@EXPORT_OK = qw( send_email send_fax states_hash state_label );
 
 $DEBUG = 0;
 
@@ -185,6 +185,80 @@ sub send_email {
 
 }
 
+#this kludges a "mysmtpsend" method into Mail::Internet for send_email above
+package Mail::Internet;
+
+use Mail::Address;
+use Net::SMTP;
+
+sub Mail::Internet::mysmtpsend {
+    my $src  = shift;
+    my %opt = @_;
+    my $host = $opt{Host};
+    my $envelope = $opt{MailFrom};
+    my $noquit = 0;
+    my $smtp;
+    my @hello = defined $opt{Hello} ? (Hello => $opt{Hello}) : ();
+
+    push(@hello, 'Port', $opt{'Port'})
+	if exists $opt{'Port'};
+
+    push(@hello, 'Debug', $opt{'Debug'})
+	if exists $opt{'Debug'};
+
+    if(ref($host) && UNIVERSAL::isa($host,'Net::SMTP')) {
+	$smtp = $host;
+	$noquit = 1;
+    }
+    else {
+	#local $SIG{__DIE__};
+	#$smtp = eval { Net::SMTP->new($host, @hello) };
+	$smtp = new Net::SMTP $host, @hello;
+    }
+
+    unless ( defined($smtp) ) {
+      my $err = $!;
+      $err =~ s/Invalid argument/Unknown host/;
+      return "can't connect to $host: $err"
+    }
+
+    my $hdr = $src->head->dup;
+
+    _prephdr($hdr);
+
+    # Who is it to
+
+    my @rcpt = map { ref($_) ? @$_ : $_ } grep { defined } @opt{'To','Cc','Bcc'};
+    @rcpt = map { $hdr->get($_) } qw(To Cc Bcc)
+	unless @rcpt;
+    my @addr = map($_->address, Mail::Address->parse(@rcpt));
+
+    return 'No valid destination addresses found!'
+	unless(@addr);
+
+    $hdr->delete('Bcc'); # Remove blind Cc's
+
+    # Send it
+
+    #warn "Headers: \n" . join('',@{$hdr->header});
+    #warn "Body: \n" . join('',@{$src->body});
+
+    my $ok = $smtp->mail( $envelope ) &&
+		$smtp->to(@addr) &&
+		$smtp->data(join("", @{$hdr->header},"\n",@{$src->body}));
+
+    if ( $ok ) {
+      $smtp->quit
+          unless $noquit;
+      return '';
+    } else {
+      return $smtp->code. ' '. $smtp->message;
+    }
+
+}
+package FS::Misc;
+#eokludge
+
 =item send_fax OPTION => VALUE ...
 
 Options:
@@ -268,77 +342,66 @@ sub send_fax {
 
 }
 
-package Mail::Internet;
-
-use Mail::Address;
-use Net::SMTP;
-
-sub Mail::Internet::mysmtpsend {
-    my $src  = shift;
-    my %opt = @_;
-    my $host = $opt{Host};
-    my $envelope = $opt{MailFrom};
-    my $noquit = 0;
-    my $smtp;
-    my @hello = defined $opt{Hello} ? (Hello => $opt{Hello}) : ();
-
-    push(@hello, 'Port', $opt{'Port'})
-	if exists $opt{'Port'};
+=item states_hash COUNTRY
 
-    push(@hello, 'Debug', $opt{'Debug'})
-	if exists $opt{'Debug'};
+Returns a list of key/value pairs containing state (or other sub-country
+division) abbriviations and names.
 
-    if(ref($host) && UNIVERSAL::isa($host,'Net::SMTP')) {
-	$smtp = $host;
-	$noquit = 1;
-    }
-    else {
-	#local $SIG{__DIE__};
-	#$smtp = eval { Net::SMTP->new($host, @hello) };
-	$smtp = new Net::SMTP $host, @hello;
-    }
-
-    unless ( defined($smtp) ) {
-      my $err = $!;
-      $err =~ s/Invalid argument/Unknown host/;
-      return "can't connect to $host: $err"
-    }
+=cut
 
-    my $hdr = $src->head->dup;
+use FS::Record qw(qsearch);
+use Locale::SubCountry;
+
+sub states_hash {
+  my($country) = @_;
+
+  my @states = 
+#     sort
+     map { s/[\n\r]//g; $_; }
+     map { $_->state; }
+     qsearch( 'cust_main_county',
+              { 'country' => $country },
+              'DISTINCT ON ( state ) *',
+            )
+  ;
+
+  #it could throw a fatal "Invalid country code" error (for example "AX")
+  my $subcountry = eval { new Locale::SubCountry($country) }
+    or return ( '', '(n/a)' );
+
+  #"i see your schwartz is as big as mine!"
+  map  { ( $_->[0] => $_->[1] ) }
+  sort { $a->[1] cmp $b->[1] }
+  map  { [ $_ => state_label($_, $subcountry) ] }
+       @states;
+}
 
-    _prephdr($hdr);
+=item state_label STATE COUNTRY_OR_LOCALE_SUBCOUNRY_OBJECT
 
-    # Who is it to
+=cut
 
-    my @rcpt = map { ref($_) ? @$_ : $_ } grep { defined } @opt{'To','Cc','Bcc'};
-    @rcpt = map { $hdr->get($_) } qw(To Cc Bcc)
-	unless @rcpt;
-    my @addr = map($_->address, Mail::Address->parse(@rcpt));
+sub state_label {
+  my( $state, $country ) = @_;
 
-    return 'No valid destination addresses found!'
-	unless(@addr);
+  unless ( ref($country) ) {
+    $country = eval { new Locale::SubCountry($country) }
+      or return'(n/a)';
 
-    $hdr->delete('Bcc'); # Remove blind Cc's
-
-    # Send it
+  }
 
-    #warn "Headers: \n" . join('',@{$hdr->header});
-    #warn "Body: \n" . join('',@{$src->body});
+  # US kludge to avoid changing existing behaviour 
+  # also we actually *use* the abbriviations...
+  my $full_name = $country->country_code eq 'US'
+                    ? ''
+                    : $country->full_name($state);
 
-    my $ok = $smtp->mail( $envelope ) &&
-		$smtp->to(@addr) &&
-		$smtp->data(join("", @{$hdr->header},"\n",@{$src->body}));
+  $full_name = '' if $full_name eq 'unknown';
+  $full_name =~ s/\(see also.*\)\s*$//;
+  $full_name .= " ($state)" if $full_name;
 
-    if ( $ok ) {
-      $smtp->quit
-          unless $noquit;
-      return '';
-    } else {
-      return $smtp->code. ' '. $smtp->message;
-    }
+  $full_name || $state || '(n/a)';
 
 }
-package FS::Misc;
 
 =back
 
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 9b808e68c..008b0b5f9 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -114,6 +114,7 @@ sub handler
       use String::Approx qw(amatch);
       use Chart::LinesPoints;
       use HTML::Widgets::SelectLayers 0.05;
+      use Locale::Country;
       use FS;
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
       use FS::Record qw(qsearch qsearchs fields dbdef);
@@ -122,7 +123,7 @@ sub handler
                      eidiot small_custview myexit http_header);
       use FS::UI::Web;
       use FS::Msgcat qw(gettext geterror);
-      use FS::Misc qw( send_email send_fax );
+      use FS::Misc qw( send_email send_fax states_hash state_label );
       use FS::Report::Table::Monthly;
       use FS::TicketSystem;
 
@@ -208,6 +209,7 @@ sub handler
         my( $self, $location ) = @_;
         use vars qw($m);
 
+        # false laziness w/below
         if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
 
           my $page =
diff --git a/httemplate/edit/cust_main/contact.html b/httemplate/edit/cust_main/contact.html
index e0cd06f56..6e4f08957 100644
--- a/httemplate/edit/cust_main/contact.html
+++ b/httemplate/edit/cust_main/contact.html
@@ -96,7 +96,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 <TR>
   <TH ALIGN="right"><%=$r%>Country</TH>
-  <TD><%= include('select-country.html', %select_hash ) %></TD>
+  <TD COLSPAN=5><%= include('select-country.html', %select_hash ) %></TD>
 </TR>
 
 <TR>
diff --git a/httemplate/edit/cust_main/select-country.html b/httemplate/edit/cust_main/select-country.html
index 014effd66..3941f2f93 100644
--- a/httemplate/edit/cust_main/select-country.html
+++ b/httemplate/edit/cust_main/select-country.html
@@ -26,7 +26,7 @@
 
   function <%= $opt{'prefix'} %>country_changed(what, callback) {
 
-    country = what.options[what.selectedIndex].text;
+    country = what.options[what.selectedIndex].value;
 
     function <%= $opt{'prefix'} %>update_states(states) {
 
@@ -36,8 +36,8 @@
 
       // add the new states
       var statesArray = eval('(' + states + ')' );
-      for ( var s = 0; s < statesArray.length; s++ ) {
-          var stateLabel = statesArray[s];
+      for ( var s = 0; s < statesArray.length; s=s+2 ) {
+          var stateLabel = statesArray[s+1];
           if ( stateLabel == "" )
               stateLabel = '(n/a)';
           opt(what.form.<%= $opt{'prefix'} %>state, statesArray[s], stateLabel);
@@ -58,13 +58,14 @@
 <SELECT NAME="<%= $opt{'prefix'} %>country" onChange="<%= $opt{'prefix'} %>country_changed(this); <%= $opt{'onchange'} %>" <%= $opt{'disabled'} %>>
 
 <% foreach my $country (
-     sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
+     sort {    ($b eq $countrydefault) <=> ($a eq $countrydefault)
+            or code2country($a) cmp code2country($b) }
      map { $_->country }
      qsearch( 'cust_main_county',{}, 'DISTINCT ON ( country ) *', )
    ) {
 %>
 
-  <OPTION VALUE="<%= $country %>"<%= $country eq $opt{'country'} ? ' SELECTED' : '' %>><%= $country %>
+  <OPTION VALUE="<%= $country %>"<%= $country eq $opt{'country'} ? ' SELECTED' : '' %>><%= code2country($country). " ($country)" %>
 
 <% } %>
 
diff --git a/httemplate/edit/cust_main/select-state.html b/httemplate/edit/cust_main/select-state.html
index 98e685ab8..64da36ba7 100644
--- a/httemplate/edit/cust_main/select-state.html
+++ b/httemplate/edit/cust_main/select-state.html
@@ -9,17 +9,10 @@
 
 <SELECT NAME="<%= $opt{'prefix'} %>state" onChange="<%= $opt{'prefix'} %>state_changed(this); <%= $opt{'onchange'} %>" <%= $opt{'disabled'} %>>
 
-<% foreach my $state (
-     sort
-     map { $_->state }
-     qsearch( 'cust_main_county',
-              { 'country' => $opt{'country'} },
-              'DISTINCT ON ( state ) *',
-            )
-   ) {
-%>
+<% tie my %states, 'Tie::IxHash', states_hash( $opt{'country'} ); %>
+<% foreach my $state ( keys %states ) { %>
 
-  <OPTION VALUE="<%= $state %>"<%= $state eq $opt{'state'} ? ' SELECTED' : '' %>><%= $state || '(n/a)' %>
+  <OPTION VALUE="<%= $state %>"<%= $state eq $opt{'state'} ? ' SELECTED' : '' %>><%= $states{$state} || '(n/a)' %>
 
 <% } %>
 
diff --git a/httemplate/misc/states.cgi b/httemplate/misc/states.cgi
index cff2c9774..63c494d15 100644
--- a/httemplate/misc/states.cgi
+++ b/httemplate/misc/states.cgi
@@ -1,16 +1,6 @@
 <%
 
   my $country = $cgi->param('arg');
+  my @output = states_hash($country);
 
-  my @states = 
-     sort
-     map { s/[\n\r]//g; $_; }
-     map { $_->state; }
-     qsearch( 'cust_main_county',
-              { 'country' => $country },
-              'DISTINCT ON ( state ) *',
-            )
-  ;
-
-
-%>[ <%= join(', ', map { qq("$_") } @states) %> ]
+%>[ <%= join(', ', map { qq("$_") } @output) %> ]
diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 89926ea64..7aba11813 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -33,13 +33,13 @@ Billing address
   <TD ALIGN="right">City</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->city %></TD>
   <TD ALIGN="right">State</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->state %></TD>
+  <TD BGCOLOR="#ffffff"><%= state_label($cust_main->state, $cust_main->country) %></TD>
   <TD ALIGN="right">Zip</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->zip %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Country</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->country %></TD>
+  <TD BGCOLOR="#ffffff"><%= code2country($cust_main->country) %></TD>
 </TR>
 <%
   my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
-- 
cgit v1.2.1


From f6aa291128cc3adbf28906f9024746efedd6c0cb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Apr 2006 10:11:01 +0000
Subject: allow [ and ] in ut_text

---
 FS/FS/Record.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index a7af708a3..e9f21ffc9 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1330,7 +1330,7 @@ sub ut_money {
 =item ut_text COLUMN
 
 Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? / =
+symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? / = [ ]
 May not be null.  If there is an error, returns the error, otherwise returns
 false.
 
@@ -1341,7 +1341,7 @@ sub ut_text {
   #warn "msgcat ". \&msgcat. "\n";
   #warn "notexist ". \&notexist. "\n";
   #warn "AUTOLOAD ". \&AUTOLOAD. "\n";
-  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]+)$/
+  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]+)$/
     or return gettext('illegal_or_empty_text'). " $field: ".
                $self->getfield($field);
   $self->setfield($field,$1);
-- 
cgit v1.2.1


From c912b0f458e21880b1285f639ff42d73aaeafecd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Apr 2006 11:36:29 +0000
Subject: and also allow [ and ] in ut_textn

---
 FS/FS/Record.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index e9f21ffc9..67de071c6 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1341,9 +1341,10 @@ sub ut_text {
   #warn "msgcat ". \&msgcat. "\n";
   #warn "notexist ". \&notexist. "\n";
   #warn "AUTOLOAD ". \&AUTOLOAD. "\n";
-  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]+)$/
-    or return gettext('illegal_or_empty_text'). " $field: ".
-               $self->getfield($field);
+  $self->getfield($field)
+    =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]+)$/
+      or return gettext('illegal_or_empty_text'). " $field: ".
+                 $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
@@ -1358,8 +1359,9 @@ May be null.  If there is an error, returns the error, otherwise returns false.
 
 sub ut_textn {
   my($self,$field)=@_;
-  $self->getfield($field) =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
-    or return gettext('illegal_text'). " $field: ". $self->getfield($field);
+  $self->getfield($field)
+    =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]*)$/
+      or return gettext('illegal_text'). " $field: ". $self->getfield($field);
   $self->setfield($field,$1);
   '';
 }
-- 
cgit v1.2.1


From 8e9dcecdfc1cad277dcce3fd58d51b20566f9ec9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Apr 2006 20:49:18 +0000
Subject: add PTR to sort order for DNS entries

---
 FS/FS/svc_domain.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 6d5435718..191d85604 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -364,12 +364,13 @@ sub domain_record {
   my $self = shift;
 
   my %order = (
-    SOA => 1,
-    NS => 2,
-    MX => 3,
-    CNAME => 4,
-    A => 5,
-    TXT => 6,
+    'SOA'   => 1,
+    'NS'    => 2,
+    'MX'    => 3,
+    'CNAME' => 4,
+    'A'     => 5,
+    'TXT'   => 6,
+    'PTR'   => 7,
   );
 
   sort { $order{$a->rectype} <=> $order{$b->rectype} }
-- 
cgit v1.2.1


From 7344abba907bdf860ee9afe602768ec44ded6c21 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Apr 2006 23:26:03 +0000
Subject: option to disable global uniqueness checking

---
 FS/FS/Conf.pm     | 4 ++--
 FS/FS/svc_acct.pm | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6be6db5c5..c33f68b6c 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1455,9 +1455,9 @@ httemplate/docs/config.html
   {
     'key'         => 'global_unique-username',
     'section'     => 'username',
-    'description' => 'Global username uniqueness control: none (usual setting - check uniqueness per exports), username (all usernames are globally unique, regardless of domain or exports), or username@domain (all username@domain pairs are globally unique, regardless of exports)',
+    'description' => 'Global username uniqueness control: none (usual setting - check uniqueness per exports), username (all usernames are globally unique, regardless of domain or exports), or username@domain (all username@domain pairs are globally unique, regardless of exports).  disabled turns off duplicate checking completely and is STRONGLY NOT RECOMMENDED unless you REALLY need to turn this off.',
     'type'        => 'select',
-    'select_enum' => [ 'none', 'username', 'username@domain' ],
+    'select_enum' => [ 'none', 'username', 'username@domain', 'disabled' ],
   },
 
   {
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 2872a5f74..aa3e592a3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -902,6 +902,9 @@ per export and with identical I<svcpart> values.
 sub _check_duplicate {
   my $self = shift;
 
+  my $global_unique = $conf->config('global_unique-username') || 'none';
+  return '' if $global_unique eq 'disabled';
+
   #this is Pg-specific.  what to do for mysql etc?
   # ( mysql LOCK TABLES certainly isn't equivalent or useful here :/ )
   warn "$me locking svc_acct table for duplicate search" if $DEBUG;
@@ -914,8 +917,6 @@ sub _check_duplicate {
     return 'unknown svcpart '. $self->svcpart;
   }
 
-  my $global_unique = $conf->config('global_unique-username') || 'none';
-
   my @dup_user = grep { !$self->svcnum || $_->svcnum != $self->svcnum }
                  qsearch( 'svc_acct', { 'username' => $self->username } );
   return gettext('username_in_use')
-- 
cgit v1.2.1


From af4493b92157f6e443df148b88d9f65613da1e91 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 9 Apr 2006 20:36:06 +0000
Subject: error out if you try to add duplicates; this should lower my
 annoyance-level

---
 FS/bin/freeside-adduser | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index c3ee05b9b..67ffef612 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.8 2002-09-27 05:36:29 ivan Exp $
+# $Id: freeside-adduser,v 1.9 2006-04-09 20:36:06 ivan Exp $
 
 use strict;
 use vars qw($opt_h $opt_b $opt_c $opt_s);
@@ -13,6 +13,14 @@ getopts("bch:s:");
 die &usage if $opt_c && ! $opt_h;
 my $user = shift or die &usage;
 
+open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
+  or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+while (<MAPSECRETS>) {
+  /^(\S+) / or die "unparsable line in mapsecrets: $_";
+  die "user $user already exists\n" if $user eq $1;
+}
+close MAPSECRETS;
+
 if ( $opt_h ) {
   my @args = ( 'htpasswd' );
   push @args, '-b' if $opt_b;
-- 
cgit v1.2.1


From f98eec7448db3869808e0154969588f0f2e4098d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 9 Apr 2006 23:24:39 +0000
Subject: should fix "Can't use string ("old_uid") as a SCALAR ref while
 "strict refs" in use" error

---
 FS/FS/part_export/domain_shellcommands.pm | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index d15f41a84..994c113bf 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -112,19 +112,22 @@ sub _export_replace {
   ( $old_qdomain = $old_domain ) =~ s/\./:/g; #see dot-qmail(5): EXTENSION ADDRESSES
   ( $new_qdomain = $new_domain ) =~ s/\./:/g; #see dot-qmail(5): EXTENSION ADDRESSES
 
-  if ( $old->catchall ) {
+  { 
     no strict 'refs';
-    my $svc_acct = $old->catchall_svc_acct;
-    ${"old_$_"} = $svc_acct->getfield($_) foreach qw(uid gid dir);
-  } else {
-    ${"old_$_"} = '' foreach qw(uid gid dir);
-  }
-  if ( $new->catchall ) {
-    no strict 'refs';
-    my $svc_acct = $new->catchall_svc_acct;
-    ${"new_$_"} = $svc_acct->getfield($_) foreach qw(uid gid dir);
-  } else {
-    ${"new_$_"} = '' foreach qw(uid gid dir);
+
+    if ( $old->catchall ) {
+      my $svc_acct = $old->catchall_svc_acct;
+      ${"old_$_"} = $svc_acct->getfield($_) foreach qw(uid gid dir);
+    } else {
+      ${"old_$_"} = '' foreach qw(uid gid dir);
+    }
+    if ( $new->catchall ) {
+      my $svc_acct = $new->catchall_svc_acct;
+      ${"new_$_"} = $svc_acct->getfield($_) foreach qw(uid gid dir);
+    } else {
+      ${"new_$_"} = '' foreach qw(uid gid dir);
+    }
+
   }
 
   #done setting variables for the command
-- 
cgit v1.2.1


From 36197f0e2889826ddb9a64790150c7c232ba1afb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 9 Apr 2006 23:39:49 +0000
Subject: add "spool_cdr" to cust_main fields

---
 httemplate/edit/cust_main.cgi | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 144d5405c..80fec9359 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -70,7 +70,11 @@ my $action = $custnum ? 'Edit' : 'Add';
 
 <!-- top -->
 
-<%= header("Customer $action", '', ' onUnload="myclose()"') %>
+<%= include('/elements/header.html',
+      "Customer $action",
+      '',
+      ' onUnload="myclose()"'
+) %>
 
 <% if ( $error ) { %>
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
@@ -271,7 +275,8 @@ function bottomfixup(what) {
 
   var billing_bottomvars = new Array(
     'tax',
-    'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX'
+    'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX',
+    'spool_cdr'
   );
 
   for ( f=0; f < topvars.length; f++ ) {
@@ -348,7 +353,8 @@ function copyelement(from, to) {
      'paid',
      
      'tax',
-     'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX'
+     'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX',
+     'spool_cdr'
    ) {
 %>
   <INPUT TYPE="hidden" NAME="<%= $hidden %>" VALUE="">
-- 
cgit v1.2.1


From 7bdf17a005cf4c0fe8b6b6ad1ce97abaa52a4510 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 9 Apr 2006 23:41:01 +0000
Subject: a few more fixups for our favorite include(...) from Scott Edwards

---
 httemplate/view/cust_main.cgi                  | 3 ++-
 httemplate/view/cust_main/payment_history.html | 2 +-
 httemplate/view/cust_main/tickets.html         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 082a93bb7..58f2925d5 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -12,7 +12,8 @@ foreach my $part_svc ( qsearch('part_svc',{}) ) {
 
 %>
 
-<%= include("/elements/header.html","Customer View", menubar(
+<%= include("/elements/header.html","Customer View", 
+	include("/elements/menubar.html",
   'Main Menu' => $p,
 )) %>
 
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index ec99b8c54..a0bec3906 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -358,7 +358,7 @@ foreach my $cust_refund ($cust_main->cust_refund) {
 
 %>
 
-<%= table() %>
+<%= include("/elements/table.html") %>
 <TR>
   <TH>Date</TH>
   <TH>Description</TH>
diff --git a/httemplate/view/cust_main/tickets.html b/httemplate/view/cust_main/tickets.html
index 72d68152a..5c1d94ee1 100644
--- a/httemplate/view/cust_main/tickets.html
+++ b/httemplate/view/cust_main/tickets.html
@@ -31,7 +31,7 @@
 Highest priority tickets
 (<A HREF="<%= FS::TicketSystem->href_customer_tickets($cust_main->custnum) %>">View all tickets for this customer</A>)
 (<A HREF="<%= FS::TicketSystem->href_new_ticket($cust_main, join(', ', grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list ) ) %>">New ticket for this customer</A>)
-<%= table() %>
+<%= include("/elements/table.html") %>
 <TR>
   <TH>#</TH>
   <TH>Subject</TH>
-- 
cgit v1.2.1


From d453a487d95258e1f11f134fc5864f7e6458a6ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Apr 2006 12:36:39 +0000
Subject: zip code report

---
 FS/FS/cust_main.pm                          | 22 +++++++
 httemplate/index.html                       | 65 +++-----------------
 httemplate/search/cust_main-zip.html        | 95 +++++++++++++++++++++++++++++
 httemplate/search/cust_main.cgi             | 14 +----
 httemplate/search/elements/search.html      | 14 ++++-
 httemplate/search/report_cust_main-zip.html | 46 ++++++++++++++
 6 files changed, 188 insertions(+), 68 deletions(-)
 create mode 100644 httemplate/search/cust_main-zip.html
 create mode 100644 httemplate/search/report_cust_main-zip.html

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a2eb72473..06dcd0ccf 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3711,6 +3711,27 @@ sub cancel_sql { "
           )
 "; }
 
+=item uncancel_sql
+=item uncancelled_sql
+
+Returns an SQL expression identifying un-cancelled cust_main records.
+
+=cut
+
+sub uncancelled_sql { uncancel_sql(@_); }
+sub uncancel_sql { "
+  ( 0 < ( SELECT COUNT(*) FROM cust_pkg
+                 WHERE cust_pkg.custnum = cust_main.custnum
+                   AND ( cust_pkg.cancel IS NULL
+                         OR cust_pkg.cancel = 0
+                       )
+        )
+    OR 0 = ( SELECT COUNT(*) FROM cust_pkg
+               WHERE cust_pkg.custnum = cust_main.custnum
+           )
+  )
+"; }
+
 =item fuzzy_search FUZZY_HASHREF [ HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ ]
 
 Performs a fuzzy (approximate) search and returns the matching FS::cust_main
@@ -3860,6 +3881,7 @@ sub rebuild_fuzzyfiles {
   use Fcntl qw(:flock);
 
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
+  mkdir $dir, 0700 unless -d $dir;
 
   #last
 
diff --git a/httemplate/index.html b/httemplate/index.html
index b8f300d2d..89fe7fcae 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -1,55 +1,8 @@
-<!-- mason kludge -->
 <% my $conf = new FS::Conf; %>
-<HTML>
-  <HEAD>
-    <TITLE>
-      Freeside Main Menu
-    </TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#FFFFFF">
-  <table width="100%">
-    <tr>
-      <td rowspan=2>
-        <IMG BORDER=0 ALT="freeside" SRC="images/small-logo.png">
-      </td>
-      <td align=left rowspan=2> <!-- valign="top" -->
-        <font size=6><%= $conf->config('company_name') %> Billing</font>
-      </td>
-      <td align=right valign=top>Logged in as <b><%= getotaker %></b>
-      </td>
-    </tr>
-    <tr>
-      <td align=right valign=bottom>
-
-        <table>
-          <tr>
-            <td align=right>
-              <FONT SIZE="-2">
-               <A HREF="http://www.sisd.com/freeside">Freeside</A>&nbsp;v<%= $FS::VERSION %><BR>
-               <A HREF="docs/">Documentation</A><BR>
-              </FONT>
-            </td>
-            <% if ( $conf->config('ticket_system') eq 'RT_Internal' ) { %>
-            <% eval "use RT;"; %>
-              <td bgcolor=#000000></td>
-              <td align=left>
-                <FONT SIZE="-2">
-                 <A HREF="http://www.bestpractical.com/rt">RT<A>&nbsp;v<%= $RT::VERSION %><BR>
-                 <A HREF="http://wiki.bestpractical.com/">Documentation</A><BR>
-                </FONT>
-              </td>
-            <% } %>
-
-          </tr>
-        </table>
-
-      </td>
-    </tr>
-  </table>
+<%= include('/elements/header.html', 'Freeside Main Menu' ) %>
 
   <BR>
 
-
 [<A NAME="customer_service" style="background-color: #cccccc">&nbsp;Sales&nbsp;/&nbsp;Customer&nbsp;service&nbsp;</A>]
 <% if ( $conf->config('ticket_system') ) { %>
   [&nbsp;<A HREF="#ticketing">Support&nbsp;/&nbsp;Ticketing</A>&nbsp;]
@@ -57,7 +10,7 @@
 [&nbsp;<A HREF="#bookkeeping">Bookkeeping&nbsp;/&nbsp;Collections</A>&nbsp;]
 [&nbsp;<A HREF="#reports">Reports</A>&nbsp;]
 [&nbsp;<A HREF="#sysadmin">Sysadmin</A>&nbsp;]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0" WIDTH="100%" BGCOLOR="#eeeeee">
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0" WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
     <TR><TH BGCOLOR="#cccccc">Sales / Customer service</TH></TR>
     <TR><TD>
         <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
@@ -88,7 +41,7 @@
 [&nbsp;<A HREF="#bookkeeping">Bookkeeping&nbsp;/&nbsp;Collections</A>&nbsp;]
 [&nbsp;<A HREF="#reports">Reports</A>&nbsp;]
 [&nbsp;<A HREF="#sysadmin">Sysadmin</A>&nbsp;]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0" WIDTH="100%" BGCOLOR="#eeeeee">
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0" WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
     <TR><TH BGCOLOR="#cccccc">Support/Ticketing</TH></TR>
     <TR><TD>
 	<% if ( $conf->config('ticket_system') eq 'RT_Internal' ) { %>
@@ -117,7 +70,7 @@
 [<A NAME="bookkeeping" style="background-color: #cccccc">&nbsp;Bookkeeping&nbsp;/&nbsp;Collections&nbsp;</A>]
 [&nbsp;<A HREF="#reports">Reports</A>&nbsp;]
 [&nbsp;<A HREF="#sysadmin">Sysadmin</A>&nbsp;]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee">
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
     <TR><TH BGCOLOR="#cccccc">Bookkeeping / Collections</TH></TR>
     <TR><TD>
       <BR><A HREF="misc/batch-cust_pay.html">Quick payment entry</A>
@@ -165,7 +118,7 @@
 [&nbsp;<A HREF="#bookkeeping">Bookkeeping&nbsp;/&nbsp;Collections</A>&nbsp;]
 [<A NAME="reports" style="background-color: #cccccc">&nbsp;Reports&nbsp;</A>]
 [&nbsp;<A HREF="#sysadmin">Sysadmin</A>&nbsp;]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee">
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
     <TR><TH BGCOLOR="#cccccc">Reports</TH></TR>
     <TR><TD>
       <BR>
@@ -190,6 +143,7 @@
       <UL>
         <LI><A HREF="search/cust_main-otaker.cgi">Search customers by ordering employee</A>
       </UL>
+    <A HREF="search/report_cust_main-zip.html">Zip code distribution</A><BR><BR>
     <FORM ACTION="search/sql.html" METHOD="GET">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
 
     <BR>
@@ -208,7 +162,7 @@
 [&nbsp;<A HREF="#bookkeeping">Bookkeeping&nbsp;/&nbsp;Collections</A>&nbsp;]
 [&nbsp;<A HREF="#reports">Reports</A>&nbsp;]
 [<A NAME="sysadmin" style="background-color: #cccccc">&nbsp;Sysadmin&nbsp;</A>]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee">
+    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
     <TR><TH BGCOLOR="#cccccc">Sysadmin</TH></TR>
     <TR><TD>
       <BR>
@@ -289,5 +243,6 @@
       <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
       <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
       <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-  </BODY>
-</HTML>
+
+<%= include('/elements/footer.html') %>
+
diff --git a/httemplate/search/cust_main-zip.html b/httemplate/search/cust_main-zip.html
new file mode 100644
index 000000000..333a1e0b1
--- /dev/null
+++ b/httemplate/search/cust_main-zip.html
@@ -0,0 +1,95 @@
+<%
+
+# XXX link to customers
+
+my @where = ();
+
+# select status
+
+if ( $cgi->param('status') =~ /^(prospect|uncancel|active|susp|cancel)$/ ) {
+  my $method = $1.'_sql';
+  push @where, FS::cust_main->$method();
+}
+
+# select agent
+# XXX this needs to be virtualized by agent too (like lots of stuff)
+
+my $agentnum = '';
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  $agentnum = $1;
+  push @where, "cust_main.agentnum = $agentnum";
+}
+my $where = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
+
+# bill zip vs ship zip
+
+sub fieldorempty {
+  my $field = shift;
+  "CASE WHEN $field IS NULL THEN '' ELSE $field END";
+}
+
+sub strip_plus4 {
+  my $field = shift;
+  "CASE WHEN $field is NULL
+    THEN ''
+    ELSE CASE WHEN $field LIKE '_____-____'
+           THEN SUBSTRING($field FROM 1 FOR 5)
+           ELSE $field
+         END
+  END";
+}
+
+my( $zip, $czip);
+if ( $cgi->param('column') eq 'ship_zip' ) {
+
+  my $casewhen_noship =
+    "CASE WHEN ( ship_last IS NULL OR ship_last = '' ) THEN ";
+
+  $czip = "$casewhen_noship zip ELSE ship_zip END";
+
+  if ( $cgi->param('ignore_plus4') ) {
+    $zip = $casewhen_noship. strip_plus4('zip').
+                   " ELSE ". strip_plus4('ship_zip'). ' END';
+
+  } else {
+    $zip = $casewhen_noship. fieldorempty('zip').
+                   " ELSE ". fieldorempty('ship_zip'). ' END';
+  }
+
+} else {
+
+  $czip = 'zip';
+
+  if ( $cgi->param('ignore_plus4') ) {
+    $zip = strip_plus4('zip');
+  } else {
+    $zip = fieldorempty('zip');
+  }
+
+}
+
+# construct the queries and send 'em off
+
+my $sql_query = 
+  "SELECT $zip AS zipcode,
+          COUNT(*) AS num_cust
+     FROM cust_main
+     $where
+     GROUP BY zipcode
+     ORDER BY num_cust DESC
+  ";
+
+my $count_sql = "select count(distinct $czip) from cust_main $where";
+
+# XXX should link...
+
+%><%= include( 'elements/search.html',
+                 'title'       => 'Zip code Search Results',
+                 'name'        => 'zip codes',
+                 'query'       => $sql_query,
+                 'count_query' => $count_sql,
+                 'header'      => [ 'Zip code', 'Customers', ],
+                 #'fields'      => [ 'zip', 'num_cust', ],
+                 'links'       => [ '', sub { 'somewhere'; }  ],
+             )
+%>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 665f5637d..36ad39da8 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -102,18 +102,8 @@ if ( $cgi->param('browse')
              && ! $cgi->param('showcancelledcustomers') )
      ) {
     #grep { $_->ncancelled_pkgs || ! $_->all_pkgs }
-    push @qual, "
-       ( 0 < ( SELECT COUNT(*) FROM cust_pkg
-                      WHERE cust_pkg.custnum = cust_main.custnum
-                        AND ( cust_pkg.cancel IS NULL
-                              OR cust_pkg.cancel = 0
-                            )
-             )
-         OR 0 = ( SELECT COUNT(*) FROM cust_pkg
-                    WHERE cust_pkg.custnum = cust_main.custnum
-                )
-       )
-    ";
+    push @qual, FS::cust_main->uncancel_sql;
+
    }
 
   push @qual, FS::cust_main->cancel_sql   if $cgi->param('cancelled');
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index b14bded10..7f7243588 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -68,6 +68,8 @@
   # # or a coderef that returns the same
   # 'redirect' =>
 
+  my $DEBUG = 0;
+
   my(%opt) = @_;
   #warn join(' / ', map { "$_ => $opt{$_}" } keys %opt ). "\n";
 
@@ -118,6 +120,7 @@
   my $header = $opt{'header'};
   my $rows;
   if ( ref($opt{'query'}) ) {
+
     #eval "use FS::$opt{'query'};";
     $rows = [ qsearch(
       $opt{'query'}->{'table'}, 
@@ -127,7 +130,9 @@
       '',
       (exists($opt{'query'}->{'addl_from'}) ? $opt{'query'}->{'addl_from'} : '')
     ) ];
+
   } else {
+
     my $sth = dbh->prepare("$opt{'query'} $limit")
       or die "Error preparing $opt{'query'}: ". dbh->errstr;
     $sth->execute
@@ -137,8 +142,15 @@
     $rows = $sth->fetchall_arrayref;
 
     $header ||= $sth->{NAME};
+
   }
 
+  warn scalar(@$rows). ' rows returned from '.
+       ( ref($opt{'query'}) ? 'qsearch query' : 'literal SQL query' )
+    if $DEBUG || $opt{'debug'};
+
+  # display the results - csv, xls or html
+
   if ( $type eq 'csv' ) {
 
     #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
@@ -437,7 +449,7 @@
                      <% } %>
                    <% } else { %>
                      <% foreach ( @$row ) { %>
-                          <TD CLASS="grid" BGCOLOR="$bgcolor"><%= $_ %></TD>
+                          <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $_ %></TD>
                      <% } %>
                    <% } %>
                    </TR>
diff --git a/httemplate/search/report_cust_main-zip.html b/httemplate/search/report_cust_main-zip.html
new file mode 100644
index 000000000..30020f3aa
--- /dev/null
+++ b/httemplate/search/report_cust_main-zip.html
@@ -0,0 +1,46 @@
+<%= include('/elements/header.html', 'Zip code report') %>
+
+    <FORM ACTION="cust_main-zip.html" METHOD="GET">
+
+    <TABLE>
+
+      <TR>
+        <TD ALIGN="right">Billing or service zip</TD>
+        <TD>
+          <SELECT NAME="column">
+            <OPTION VALUE="zip">Billing zip
+            <OPTION VALUE="ship_zip">Service zip
+          </SELECT>
+        </TD>
+      </TR>
+
+      <TR>
+        <TD ALIGN="right">Ignore +4 for US zip codes</TD>
+        <TD><INPUT TYPE="checkbox" NAME="ignore_plus4" VALUE="yes" CHECKED> </TD>
+      </TR>
+
+      <TR>
+        <TD ALIGN="right">Show customers with status:</TD>
+        <TD>
+          <SELECT NAME="status">
+            <OPTION VALUE="">all
+            <OPTION VALUE="prospect">prospect (no packages ever)
+            <OPTION SELECTED VALUE="uncancel">all except cancelled
+            <OPTION VALUE="active">active recurring packages
+            <OPTION VALUE="susp">suspended
+            <OPTION VALUE="cancel">cancelled
+          </SELECT>
+        </TD>
+      </TR>
+
+      <%= include( '/elements/tr-select-agent.html',
+                     $cgi->param('agentnum'),
+                     'label' => 'for agent: ',
+                 )
+      %>
+
+    </TABLE>
+    <BR><INPUT TYPE="submit" VALUE="Get Report">
+    </FORM>
+  </BODY>
+</HTML>
-- 
cgit v1.2.1


From b5b3d4ad4663657fcc980ed8c421b3558d4b7482 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Apr 2006 21:29:01 +0000
Subject: don't do the duplicate check unless there's a file already; fixes
 problem with first use of freeside-adduser

---
 FS/bin/freeside-adduser | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 67ffef612..2eef75827 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.9 2006-04-09 20:36:06 ivan Exp $
+# $Id: freeside-adduser,v 1.10 2006-04-13 21:29:01 ivan Exp $
 
 use strict;
 use vars qw($opt_h $opt_b $opt_c $opt_s);
@@ -13,13 +13,15 @@ getopts("bch:s:");
 die &usage if $opt_c && ! $opt_h;
 my $user = shift or die &usage;
 
-open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
-  or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-while (<MAPSECRETS>) {
-  /^(\S+) / or die "unparsable line in mapsecrets: $_";
-  die "user $user already exists\n" if $user eq $1;
+if ( -e "$FREESIDE_CONF/mapsecrets" ) {
+  open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
+    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+  while (<MAPSECRETS>) {
+    /^(\S+) / or die "unparsable line in mapsecrets: $_";
+    die "user $user already exists\n" if $user eq $1;
+  }
+  close MAPSECRETS;
 }
-close MAPSECRETS;
 
 if ( $opt_h ) {
   my @args = ( 'htpasswd' );
-- 
cgit v1.2.1


From 2a2173b5c05b1273f3990ee5b914a2d9efac0c3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Apr 2006 11:55:58 +0000
Subject: add the svc_forward-arbitrary_dst flag to enable arbitrary
 svc_forward destinations

---
 FS/FS/Conf.pm        |  7 +++++++
 FS/FS/svc_forward.pm | 12 +++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c33f68b6c..21e752867 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1695,6 +1695,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'svc_forward-arbitrary_dst',
+    'section'     => '',
+    'description' => "Allow forwards to point to arbitrary strings that don't necessarily look like email addresses.  Only used when using forwards for weird, non-email things.",
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 12b556f33..ab24d3277 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -257,9 +257,15 @@ sub check {
   }
 
   if ( $self->dst ) {
-    $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/
-       or return "Illegal dst: ". $self->dst;
-    $self->dst("$1$2");
+    my $conf = new FS::Conf;
+    if ( $conf->exists('svc_forward-arbitrary_dst') ) {
+      my $error = $self->ut_textn('dst');
+      return $error if $error;
+    } else {
+      $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/
+         or return "Illegal dst: ". $self->dst;
+      $self->dst("$1$2");
+    }
   } else {
     $self->dst('');
   }
-- 
cgit v1.2.1


From 6a5ebd04bc59509c5fb934d226d6dd144cf034bd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Apr 2006 00:16:31 +0000
Subject: add a total column

---
 httemplate/graph/money_time.cgi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index 874f58b09..9c0a94ff3 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -77,6 +77,7 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
      %>
      <TH><%= $column %></TH>
 <% } %>
+  <TH>Total</TH>
 </TR>
 
 <% foreach my $row (@items) { %>
@@ -86,12 +87,15 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
        : '';
      my @speriod = @{$data->{speriod}};
      my @eperiod = @{$data->{eperiod}};
+     my $total = 0;
   %>
   <% foreach my $column ( @{$data->{$row}} ) { %>
     <TD ALIGN="right" BGCOLOR="#ffffff">
       <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT><%= $link ? '</A>' : '' %>
     </TD>
+    <% $total += $column; %>
   <% } %>
+  <TD><%= sprintf("%.2f", $total) %>
   </TR>
 <% } %>
 </TABLE>
-- 
cgit v1.2.1


From 5457d73088f678416810417885d844d5e305c4bd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Apr 2006 00:21:39 +0000
Subject: and </TD> the total column

---
 httemplate/graph/money_time.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index 9c0a94ff3..d458405ea 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -95,7 +95,7 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
     </TD>
     <% $total += $column; %>
   <% } %>
-  <TD><%= sprintf("%.2f", $total) %>
+  <TD><%= sprintf("%.2f", $total) %></TD>
   </TR>
 <% } %>
 </TABLE>
-- 
cgit v1.2.1


From f5713c205d51f0ad756f1b7bcd97130d7a4e1cb2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Apr 2006 13:25:33 +0000
Subject: format & link the total column

---
 httemplate/graph/money_time.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index d458405ea..67b82125b 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -95,7 +95,9 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
     </TD>
     <% $total += $column; %>
   <% } %>
-  <TD><%= sprintf("%.2f", $total) %></TD>
+  <TD ALIGN="right" BGCOLOR="#eeeeee">
+    <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{speriod}}[0]. '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
+  </TD>
   </TR>
 <% } %>
 </TABLE>
-- 
cgit v1.2.1


From 45e03b5221f91ad143a4a9e03ec3de4fc2d1e445 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Apr 2006 13:28:17 +0000
Subject: correct period & use a yellow color for the total column

---
 httemplate/graph/money_time.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index 67b82125b..bc393835b 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -95,8 +95,8 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
     </TD>
     <% $total += $column; %>
   <% } %>
-  <TD ALIGN="right" BGCOLOR="#eeeeee">
-    <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{speriod}}[0]. '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
+  <TD ALIGN="right" BGCOLOR="#f5f6be">
+    <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{eperiod}}[0]. '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
   </TD>
   </TR>
 <% } %>
-- 
cgit v1.2.1


From 9d2a3fb618badbef4abf472dc9bc68b8590f04b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Apr 2006 13:32:27 +0000
Subject: REALLY correct the period for the total column this time

---
 httemplate/graph/money_time.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index bc393835b..bc789cb7e 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -96,7 +96,7 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
     <% $total += $column; %>
   <% } %>
   <TD ALIGN="right" BGCOLOR="#f5f6be">
-    <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{eperiod}}[0]. '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
+    <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{eperiod}}[-1]. '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
   </TD>
   </TR>
 <% } %>
-- 
cgit v1.2.1


From 8e9d1b143d37ac23d63973f0c001350b16827729 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Apr 2006 19:24:03 +0000
Subject: dev install notes patch from liran tal

---
 install/debian/3.1/INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/debian/3.1/INSTALL b/install/debian/3.1/INSTALL
index 550c71a57..c047660f0 100644
--- a/install/debian/3.1/INSTALL
+++ b/install/debian/3.1/INSTALL
@@ -28,7 +28,7 @@ apt-get install make screen zsh cvs fsh rsync \
         libtext-autoformat-perl libtext-quoted-perl libregexp-common-perl \
         libhtml-scrubber-perl libtree-simple-perl liblocale-subcountry-perl \
         libtext-csv-perl libspreadsheet-writeexcel-perl libfrontier-rpc-perl \
-	libjavascript-rpc-perl libipc-run3-perl
+	libjavascript-rpc-perl libipc-run3-perl libjson-perl
 
 useradd freeside
 groupadd freeside
-- 
cgit v1.2.1


From c509ea790c3d0631a0e1f79527ec937e419e380e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Apr 2006 19:33:38 +0000
Subject: add JSON to initial install instructions

---
 httemplate/docs/install.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 6e366cbbb..78172e8e4 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -71,6 +71,7 @@ Before installing, you need:
       <li><a href="http://search.cpan.org/dist/IPC-Run3">IPC::Run3</a>
       <li><a href="http://search.cpan.org/dist/Term-ReadKey">Term::ReadKey</a>
 <!--      <li><a href="http://search.cpan.org/dist/Crypt-YAPassGen">Crypt::YAPassGen</a> -->
+      <li><a href="http://search.cpan.org/dist/JSON">JSON</a>
       <li><a href="http://search.cpan.org/search?mode=module&query=MIME::Entity">Fax::Hylafax::Client</a> <i>(Required if using FAX invoice destinations)</i>
       <li><a href="http://search.cpan.org/dist/ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
     </ul>
-- 
cgit v1.2.1


From f7cb5dd91c8fee24591541d00781bfbf60c31a21 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Apr 2006 06:37:34 +0000
Subject: DOH!  perlvar: not counting patterns matched in nested blocks that
 have been exited already.

---
 FS/FS/cust_main.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 06dcd0ccf..298c01dee 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -923,6 +923,8 @@ sub replace {
   my $self = shift;
   my $old = shift;
   my @param = @_;
+  warn "$me replace called\n"
+    if $DEBUG;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -1261,10 +1263,11 @@ sub check {
     $payinfo =~ s/[^\d\@]//g;
     if ( $conf->exists('echeck-nonus') ) {
       $payinfo =~ /^(\d+)\@(\d+)$/ or return 'invalid echeck account@aba';
+      $payinfo = "$1\@$2";
     } else {
       $payinfo =~ /^(\d+)\@(\d{9})$/ or return 'invalid echeck account@aba';
+      $payinfo = "$1\@$2";
     }
-    $payinfo = "$1\@$2";
     $self->payinfo($payinfo);
     $self->paycvv('') if $self->dbdef_table->column('paycvv');
 
-- 
cgit v1.2.1


From 1e0dbd55775c7d9eba7db3d17a6173d03e3c2d0a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Apr 2006 12:45:29 +0000
Subject: s(browse/queue.cgi)(search/queue.html)

---
 httemplate/browse/queue.cgi  |   5 --
 httemplate/index.html        |   5 +-
 httemplate/misc/queue.cgi    |   2 +-
 httemplate/search/queue.html | 124 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 129 insertions(+), 7 deletions(-)
 delete mode 100755 httemplate/browse/queue.cgi
 create mode 100644 httemplate/search/queue.html

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
deleted file mode 100755
index b865b1c30..000000000
--- a/httemplate/browse/queue.cgi
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- mason kludge -->
-<%= include("/elements/header.html","Job Queue", menubar( 'Main Menu' => $p, )) %>
-<%= joblisting({}) %>
-</BODY>
-</HTML>
diff --git a/httemplate/index.html b/httemplate/index.html
index 89fe7fcae..a1c3caf39 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -170,7 +170,7 @@
         <A HREF="browse/nas.cgi">session server</A>
         <!-- or <A HREF="browse/nas-sqlradius.cgi">RADIUS</A>
       <BR> -->
-      <A HREF="browse/queue.cgi">View pending job queue</A>
+      <A HREF="search/queue.html">View pending job queue</A>
       <BR><A HREF="misc/cust_main-import.cgi">Batch import customers from CSV file</A>
       <BR><A HREF="misc/cust_main-import_charges.cgi">Batch import charges from CSV file</A>
       <BR><A HREF="misc/dump.cgi">Download database dump</A>
@@ -186,6 +186,9 @@
             - One or more services are grouped together into a package and
               given pricing information.  Customers purchase packages, not
               services.
+          <LI><A HREF="browse/pkg_class.cgi">View/Edit package classes</A>
+            - Package classes define groups of packages, for reporting and
+              convenience purposes.
         </ul>
       <A NAME="admin_agent">Resellers</a>
         <ul>
diff --git a/httemplate/misc/queue.cgi b/httemplate/misc/queue.cgi
index ce9c8fbd3..d8e910fb7 100644
--- a/httemplate/misc/queue.cgi
+++ b/httemplate/misc/queue.cgi
@@ -42,6 +42,6 @@ if ( $action eq 'new' ) {
   }
 }
 
-print $cgi->redirect(popurl(2). "browse/queue.cgi");
+print $cgi->redirect(popurl(2). "search/queue.html");
 
 %>
diff --git a/httemplate/search/queue.html b/httemplate/search/queue.html
new file mode 100644
index 000000000..132c05129
--- /dev/null
+++ b/httemplate/search/queue.html
@@ -0,0 +1,124 @@
+<%
+
+my $hashref = {};
+
+my $conf = new FS::Conf;
+my $dangerous = $conf->exists('queue_dangerous_controls');
+
+my $noactions = 0;
+
+my $count_query = 'SELECT COUNT(*) FROM queue'; # + $hashref
+
+my $areboxes = 0;
+
+%><%= include( 'elements/search.html',
+                 'title'       => 'Job Queue',
+                 'menubar'     => [ 'Main menu' => $p, ],
+                 'name'        => 'jobs',
+                 'query'       => { 'table'     => 'queue',
+                                    'hashref'   => $hashref,
+                                    'extra_sql' => 'ORDER BY jobnum',
+                                  },
+                 'count_query' => $count_query,
+                 'header' => [ '#',
+                               'Job',
+                               'Args',
+                               'Date',
+                               'Status',
+                               'Account', # unless $hashref->{'svcnum'}
+                               '', # checkbox column
+                             ],
+                 'fields' => [
+                               'jobnum',
+                               'job',
+                               sub {
+                                 my $queue = shift;
+                                 if (    $dangerous
+                                      || $queue->job !~ /^FS::part_export::/
+                                      || !$noactions
+                                    )
+                                 {
+                                   encode_entities( join(' ', $queue->args) );
+                                 } else {
+                                   '';
+                                 }
+                               },
+                               sub {
+                                 time2str( "%a %b %e %T %Y", shift->_date );
+                               },
+                               sub {
+                                 my $queue = shift;
+                                 my $jobnum = $queue->jobnum;
+                                 my $status = $queue->status;
+                                 $status .= ': '. $queue->statustext
+                                   if $queue->statustext;
+                                 my @queue_depend = $queue->queue_depend;
+                                 $status .= ' (waiting for '.
+                                            join(', ', map { $_->depend_jobnum }
+                                                           @queue_depend
+                                                ). 
+                                            ')'
+                                   if @queue_depend;
+                                 my $changable = $dangerous
+                                                 || ( ! $noactions
+                                                      && $status =~ /^failed/
+                                                      || $status =~ /^locked/
+                                                    );
+                                 if ( $changable ) {
+                                   $status .=
+                                     qq! (&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A>&nbsp;|!.
+                                     qq!&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove</A>&nbsp;)!;
+                                 }
+                                 $status;
+                               },
+                               sub {
+                                 my $queue = shift;
+                                 # return '' if $hashref->{'svcnum'}
+                                 my $cust_svc = $queue->cust_svc;
+                                 my $account;
+                                 if ( $cust_svc ) {
+                                   my $table = $cust_svc->part_svc->svcdb;
+                                   my $label = ( $cust_svc->label )[1];
+                                   qq!<A HREF="../view/$table.cgi?!. $queue->svcnum.
+                                   qq!">$label</A>!;
+                                 } else {
+                                   '';
+                                 }
+                               },
+                               sub {
+                                 my $queue = shift;
+                                 my $jobnum = $queue->jobnum;
+                                 my $status = $queue->status;
+                                 my $changable = $dangerous
+                                                 || ( ! $noactions
+                                                      && $status eq 'failed'
+                                                      || $status eq 'locked'
+                                                    );
+                                 if ( $changable ) {
+                                   $areboxes = 1;
+                                   qq!<INPUT NAME="jobnum$jobnum" TYPE="checkbox" VALUE="1">!;
+                                 } else {
+                                   '';
+                                 }
+                               },
+                             ],
+                 #'links' =>  [
+                 #              '',
+                 #              '',
+                 #              '',
+                 #              '',
+                 #              '',
+                 #              '', #$acct_link,
+                 #              '',
+                 #            ],
+                 'html_foot' => sub {
+                                  if ( $areboxes ) {
+                                    '<BR><INPUT TYPE="submit" NAME="action" VALUE="retry selected">'.
+                                    '<INPUT TYPE="submit" NAME="action" VALUE="remove selected"><BR>';
+                                  } else {
+                                    '';
+                                  }
+                                },
+             )
+
+%>
-- 
cgit v1.2.1


From 33f3d32f1d13b8342f208f8633f5f9a3a7bcb392 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Apr 2006 14:20:05 +0000
Subject: fix some indentation and the default cutoff day

---
 FS/FS/part_pkg/flat.pm         |  7 ++++---
 FS/FS/part_pkg/prorate.pm      | 28 ++++++++++++++++------------
 FS/FS/part_pkg/subscription.pm | 14 ++++++++++----
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 59b625746..bed86cc8d 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -20,10 +20,11 @@ use FS::part_pkg;
                                    ' of service at cancellation',
                          'type' => 'checkbox',
                        },
+    'externalid' => { 'name'   => 'Optional External ID',
+                      'default' => '',
+                    },
   },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => 'what.recur_fee.value',
+  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'externalid' ],
   'weight' => 10,
 );
 
diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
index ac2f656b9..d3df01034 100644
--- a/FS/FS/part_pkg/prorate.pm
+++ b/FS/FS/part_pkg/prorate.pm
@@ -24,34 +24,38 @@ use FS::part_pkg::flat;
     'cutoff_day' => { 'name' => 'billing day',
 			 'default' => 1,
 					    },
-
+    #it would be better if this had to be turned on, its confusing
+    'externalid' => { 'name'   => 'Optional External ID',
+                      'default' => '',
+                    },
  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'cutoff_day' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
+  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'cutoff_day',
+                    'externalid', ],
   'freq' => 'm',
   'weight' => 20,
 );
 
 sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
-  my $cutoff_day=$self->option('cutoff_day') or 1;
+  my $cutoff_day = $self->option('cutoff_day') || 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
   my $mend;
   my $mstart;
-  if($mday > $cutoff_day){
-    $mend = timelocal(0,0,0,$cutoff_day, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
-    $mstart=  timelocal(0,0,0,$cutoff_day,$mon,$year);  
+  
+  if ( $mday > $cutoff_day ) {
+    $mend =
+      timelocal(0,0,0,$cutoff_day, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
+    $mstart =
+      timelocal(0,0,0,$cutoff_day,$mon,$year);  
 
-  }
-  else{
+  } else {
     $mend = timelocal(0,0,0,$cutoff_day, $mon, $year);
-     if ($mon==0) {$mon=11;$year--;} else {$mon--;}
+    if ($mon==0) {$mon=11;$year--;} else {$mon--;}
     $mstart=  timelocal(0,0,0,$cutoff_day,$mon,$year);  
   }
 
-   $$sdate = $mstart;
+  $$sdate = $mstart;
   my $permonth = $self->option('recur_fee') / $self->freq;
 
   $permonth * ( ( $self->freq - 1 ) + ($mend-$mnow) / ($mend-$mstart) );
diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm
index ccfcc00a8..bfb0582f3 100644
--- a/FS/FS/part_pkg/subscription.pm
+++ b/FS/FS/part_pkg/subscription.pm
@@ -20,8 +20,12 @@ use FS::part_pkg::flat;
     'cutoff_day' => { 'name' => 'billing day',
                       'default' => 1,
                     },
-
+    #it would be better if this had to be turned on, its confusing
+    'externalid' => { 'name'   => 'Optional External ID',
+                      'default' => '',
+                    },
   },
+  'fieldorder' => [ 'setup_fee', 'recur_fee', 'cutoff_day', 'externalid' ],
   'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day'],
   'freq' => 'm',
   'weight' => 30,
@@ -29,16 +33,18 @@ use FS::part_pkg::flat;
 
 sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
-  my $cutoff_day=$self->option('cutoff_day') or 1;
+  my $cutoff_day = $self->option('cutoff_day') || 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
 
-  if($mday <$cutoff_day){
+  if ( $mday < $cutoff_day ) {
      if ($mon==0) {$mon=11;$year--;}
      else {$mon--;}
   }
-$$sdate = timelocal(0,0,0,$cutoff_day,$mon,$year);
+
+  $$sdate = timelocal(0,0,0,$cutoff_day,$mon,$year);
 
   $self->option('recur_fee');
 }
+
 1;
-- 
cgit v1.2.1


From 303cb4ce4b6ce634e108e3b7a0b43086a5e4f184 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Apr 2006 14:21:08 +0000
Subject: throw this in here for now

---
 FS/FS/part_pkg/incomplete/billoneday.pm | 48 +++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 FS/FS/part_pkg/incomplete/billoneday.pm

diff --git a/FS/FS/part_pkg/incomplete/billoneday.pm b/FS/FS/part_pkg/incomplete/billoneday.pm
new file mode 100644
index 000000000..8740547a3
--- /dev/null
+++ b/FS/FS/part_pkg/incomplete/billoneday.pm
@@ -0,0 +1,48 @@
+package FS::part_pkg::billoneday;
+
+use strict;
+use vars qw(@ISA %info);
+use Time::Local qw(timelocal);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg::flat;
+
+@ISA = qw(FS::part_pkg::flat);
+
+%info = (
+  'name' => 'charge a full month  every (selectable) billing day',
+  'fields' => {
+    'setup_fee' => { 'name' => 'Setup fee for this package',
+                     'default' => 0,
+                   },
+    'recur_fee' => { 'name' => 'Recurring fee for this package',
+                     'default' => 0,
+			   },
+    'cutoff_day' => { 'name' => 'billing day',
+                      'default' => 1,
+                    },
+
+  },
+  'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day'],
+  #'setup' => 'what.setup_fee.value',
+  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year); \' + what.recur_fee.value',
+  'freq' => 'm',
+  'weight' => 30,
+);
+
+sub calc_recur {
+  my($self, $cust_pkg, $sdate ) = @_;
+
+  my $mnow = $$sdate;
+  my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
+  my $mstart = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year);
+  my $mend = timelocal(0,0,0,$self->option('cutoff_day'), $mon == 11 ? 0 : $mon+1, $year+($mon==11));
+
+  if($mday > $self->option('cutoff_date') and $mstart != $mnow ) {
+    $$sdate = timelocal(0,0,0,$self->option('cutoff_day'), $mon == 11 ? 0 : $mon+1,  $year+($mon==11));
+  }
+  else{
+    $$sdate = timelocal(0,0,0,$self->option('cutoff_day'), $mon, $year);
+  }
+  $self->option('recur_fee');
+}
+1;
-- 
cgit v1.2.1


From 1a033848671cad2cbe7687b37fc718b3b2a68b83 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 22 Apr 2006 00:58:40 +0000
Subject: start of package class web UI (add/edit package classes, package
 class selection in package def edit)

---
 FS/FS/part_pkg.pm                             |  34 +++
 htetc/handler.pl                              |   1 +
 httemplate/browse/elements/browse.html        |   6 +
 httemplate/browse/generic.cgi                 |  46 ----
 httemplate/browse/inventory_class.html        |  89 ++++++
 httemplate/browse/part_pkg.cgi                | 373 +++++++++++++++-----------
 httemplate/browse/pkg_class.html              |  26 ++
 httemplate/browse/rate.cgi                    |  59 ++--
 httemplate/edit/elements/edit.html            |   6 +-
 httemplate/edit/inventory_class.html          |   1 +
 httemplate/edit/part_pkg.cgi                  |   9 +-
 httemplate/edit/pkg_class.html                |  10 +
 httemplate/edit/process/elements/process.html |   6 +-
 httemplate/edit/process/inventory_class.html  |   3 +-
 httemplate/edit/process/pkg_class.html        |   5 +
 httemplate/elements/select-agent.html         |  32 +--
 httemplate/elements/select-pkg_class.html     |  16 ++
 httemplate/elements/select-table.html         |  45 ++++
 httemplate/elements/tr-select-pkg_class.html  |  29 ++
 httemplate/index.html                         |   4 +-
 httemplate/search/cust_pkg.cgi                |   8 +-
 httemplate/search/elements/search.html        |  57 +++-
 httemplate/search/inventory_class.html        |  89 ------
 23 files changed, 593 insertions(+), 361 deletions(-)
 create mode 100644 httemplate/browse/elements/browse.html
 delete mode 100644 httemplate/browse/generic.cgi
 create mode 100644 httemplate/browse/inventory_class.html
 create mode 100644 httemplate/browse/pkg_class.html
 create mode 100644 httemplate/edit/pkg_class.html
 create mode 100644 httemplate/edit/process/pkg_class.html
 create mode 100644 httemplate/elements/select-pkg_class.html
 create mode 100644 httemplate/elements/select-table.html
 create mode 100644 httemplate/elements/tr-select-pkg_class.html
 delete mode 100644 httemplate/search/inventory_class.html

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 30a97227e..05dc59913 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -12,6 +12,7 @@ use FS::cust_pkg;
 use FS::agent_type;
 use FS::type_pkgs;
 use FS::part_pkg_option;
+use FS::pkg_class;
 
 @ISA = qw( FS::Record ); # FS::option_Common ); # this can use option_Common
                                                 # when all the plandata bs is
@@ -58,6 +59,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item comment - Text name of this package definition (non-customer-viewable)
 
+=item classnum - Optional package class (see L<FS::pkg_class>)
+
 =item promo_code - Promotional code
 
 =item setup - Setup fee expression (deprecated)
@@ -455,6 +458,37 @@ sub check {
   '';
 }
 
+=item pkg_class
+
+Returns the package class, as an FS::pkg_class object, or the empty string
+if there is no package class.
+
+=cut
+
+sub pkg_class {
+  my $self = shift;
+  if ( $self->classnum ) {
+    qsearchs('pkg_class', { 'classnum' => $self->classnum } );
+  } else {
+    return '';
+  }
+}
+
+=item classname 
+
+Returns the package class name, or the empty string if there is no package
+class.
+
+=cut
+
+sub classname {
+  my $self = shift;
+  my $pkg_class = $self->pkg_class;
+  $pkg_class
+    ? $pkg_class->classname
+    : '';
+}
+
 =item pkg_svc
 
 Returns all FS::pkg_svc objects (see L<FS::pkg_svc>) for this package
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 008b0b5f9..dcbe72733 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -176,6 +176,7 @@ sub handler
       use FS::cdr;
       use FS::inventory_class;
       use FS::inventory_item;
+      use FS::pkg_class;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
diff --git a/httemplate/browse/elements/browse.html b/httemplate/browse/elements/browse.html
new file mode 100644
index 000000000..6d146d356
--- /dev/null
+++ b/httemplate/browse/elements/browse.html
@@ -0,0 +1,6 @@
+<%= include( '/search/elements/search.html',
+               @_,
+               'disable_download'  => 1,
+               'disable_nonefound' => 1,
+           )
+%>
diff --git a/httemplate/browse/generic.cgi b/httemplate/browse/generic.cgi
deleted file mode 100644
index 9ac0f2391..000000000
--- a/httemplate/browse/generic.cgi
+++ /dev/null
@@ -1,46 +0,0 @@
-<%
-
-use FS::Record qw(qsearch dbdef);
-use DBIx::DBSchema;
-use DBIx::DBSchema::Table;
-
-my $error;
-my $p2 = popurl(2);
-my ($table) = $cgi->keywords;
-my $dbdef = dbdef or die "Cannot fetch dbdef!";
-my $dbdef_table = $dbdef->table($table) or die "Cannot fetch schema for $table";
-
-my $pkey = $dbdef_table->primary_key or die "Cannot fetch pkey for $table";
-print header("Browse $table", menubar('Main Menu'   => $p));
-
-my @rec = qsearch($table, {});
-my @col = $dbdef_table->columns;
-
-if ($cgi->param('error')) { %>
-   <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
-   <BR><BR>
-<% } 
-%>
-<A HREF="<%=$p2%>edit/<%=$table%>.cgi"><I>Add a new <%=$table%></I></A><BR><BR>
-
-<%=table()%>
-<TH>
-<% foreach (grep { $_ ne $pkey } @col) {
-  %><TD><%=$_%></TD>
-  <% } %>
-</TH>
-<% foreach $rec (sort {$a->getfield($pkey) cmp $b->getfield($pkey) } @rec) { 
-  %>
-  <TR>
-    <TD>
-      <A HREF="<%=$p2%>edit/<%=$table%>.cgi?<%=$rec->getfield($pkey)%>">
-      <%=$rec->getfield($pkey)%></A> </TD> <%
-  foreach $col (grep { $_ ne $pkey } @col)  { %>
-    <TD><%=$rec->getfield($col)%></TD> <% } %>
-  </A>
-  </TR>
-<% } %>
-</TABLE>
-</BODY>
-</HTML>
-
diff --git a/httemplate/browse/inventory_class.html b/httemplate/browse/inventory_class.html
new file mode 100644
index 000000000..6da3c9e3c
--- /dev/null
+++ b/httemplate/browse/inventory_class.html
@@ -0,0 +1,89 @@
+<%
+
+tie my %labels, 'Tie::IxHash',
+  'num_avail' => 'Available', #  <FONT SIZE="-1"><A HREF="eventually">(upload batch)</A></FONT>',
+  'num_used'  => 'In use', #'Used', #'Allocated',
+  'num_total' => 'Total',
+;
+
+my %link = (
+  'num_avail' => ';avail=1',
+  'num_used'  => ';avail=1',
+  'num_total' => '',
+);
+
+my %inv_action_link = (
+  'num_avail' => [ 'upload batch',
+                   $p.'misc/inventory_item-import.html?classnum=',
+                   'classnum'
+                 ],
+);
+
+my $link = [ "${p}edit/inventory_class.html?", 'classnum' ];
+
+%><%= include( 'elements/browse.html',
+                 'title'       => 'Inventory Classes',
+                 'name'        => 'inventory classes',
+                 'menubar'     => [ 'Add a new inventory class' =>
+                                      $p.'edit/inventory_class.html',
+                                  ],
+                 'query'       => { 'table' => 'inventory_class', },
+                 'count_query' => 'SELECT COUNT(*) FROM inventory_class',
+                 'header'      => [ '#', 'Inventory class', 'Inventory' ],
+                 'fields'      => [ 'classnum',
+                                    'classname',
+                                    sub {
+                                          #my $inventory_class = shift;
+                                          my $i_c = shift;
+
+                                          my $link =
+                                            $p. 'search/inventory_item.html?'.
+                                            'classnum='. $i_c->classnum;
+
+                                          my %actioncol = ();
+                                          foreach ( keys %inv_action_link ) {
+                                            my($label, $baseurl, $method) =
+                                              @{ $inv_action_link{$_} };
+                                            my $url = $baseurl. $i_c->$method();
+                                            $actioncol{$_} =
+                                              '<FONT SIZE="-1">'.
+                                              '('.
+                                              '<A HREF="'.$url.'">'.
+                                              $label.
+                                              '</A>'.
+                                              ')'.
+                                              '</FONT>';
+                                          }
+
+                                          my %num = map { 
+                                            $_ => $i_c->$_();
+                                          } keys %labels;
+
+                                          [ map {
+                                                  [
+                                                    {
+                                                      'data'  => '<B>'. $num{$_}. '</B>',
+                                                      'align' => 'right',
+                                                    },
+                                                    {
+                                                      'data'  => $labels{$_},
+                                                      'align' => 'left',
+                                                      'link'  => ( $num{$_}
+                                                                     ? $link.$link{$_}
+                                                                     : ''
+                                                                 ),
+                                                    },
+                                                    { 'data'  => $actioncol{$_},
+                                                      'align'  => 'left',
+                                                    },
+                                                  ]
+                                                } keys %labels
+                                          ];
+                                        },
+                                  ],
+                 'links'       => [ $link,
+                                    $link,
+                                    '',
+                                  ],
+             )
+%>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index e6454639f..0afa54750 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,169 +1,236 @@
-<!-- mason kludge -->
 <%
 
-my %search;
-if ( $cgi->param('showdisabled') ) {
-  %search = ();
-} else {
+my %search = ();
+my $search = '';
+unless ( $cgi->param('showdisabled') ) {
   %search = ( 'disabled' => '' );
+  $search = "( disabled = '' OR disabled IS NULL )";
 }
 
-my @part_pkg = qsearch('part_pkg', \%search );
-my $total = scalar(@part_pkg);
-
-my $sortby;
-my %num_active_cust_pkg = ();
-my( $suspended_sth, $canceled_sth ) = ( '', '' );
+my $select = '*';
+my $orderby = 'pkgpart';
 if ( $cgi->param('active') ) {
-  my $active_sth = dbh->prepare(
-    'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
-    ' AND ( cancel IS NULL OR cancel = 0 )'.
-    ' AND ( susp IS NULL OR susp = 0 )'
-  ) or die dbh->errstr;
-  foreach my $part_pkg ( @part_pkg ) {
-    $active_sth->execute($part_pkg->pkgpart) or die $active_sth->errstr;
-    $num_active_cust_pkg{$part_pkg->pkgpart} =
-      $active_sth->fetchrow_arrayref->[0];
-  }
-  $sortby = sub {
-    $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart};
-  };
-
-  $suspended_sth = dbh->prepare(
-    'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
-    ' AND ( cancel IS NULL OR cancel = 0 )'.
-    ' AND susp IS NOT NULL AND susp != 0'
-  ) or die dbh->errstr;
-
-  $canceled_sth = dbh->prepare(
-    'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
-    ' AND cancel IS NOT NULL AND cancel != 0'
-  ) or die dbh->errstr;
 
-} else {
-  $sortby = sub { $a->pkgpart <=> $b->pkgpart; };
+  $orderby = 'num_active';
+
+  $select = "
+
+    *,
+
+    ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart
+       AND ( cancel IS NULL OR cancel = 0 )
+       AND ( susp IS NULL OR susp = 0 )
+    ) AS num_active,
+
+    ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart
+        AND ( cancel IS NULL OR cancel = 0 )
+        AND susp IS NOT NULL AND susp != 0
+    ) AS num_suspended,
+
+    ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart
+        AND cancel IS NOT NULL AND cancel != 0
+    ) AS num_cancelled
+
+  ";
+
 }
 
 my $conf = new FS::Conf;
 my $taxclasses = $conf->exists('enable_taxclasses');
 
-%>
-<%= include("/elements/header.html","Package Definition Listing",menubar( 'Main Menu' => $p )) %>
-<% unless ( $cgi->param('active') ) { %>
-  One or more service definitions are grouped together into a package 
-  definition and given pricing information.  Customers purchase packages
-  rather than purchase services directly.<BR><BR>
-  <A HREF="<%= $p %>edit/part_pkg.cgi"><I>Add a new package definition</I></A>
-  <BR><BR>
-<% } %>
-
-<%= $total %> package definitions
-<% if ( $cgi->param('showdisabled') ) { $cgi->param('showdisabled', 0); %>
-  ( <a href="<%= $cgi->self_url %>">hide disabled packages</a> )
-<% } else { $cgi->param('showdisabled', 1); %>
-  ( <a href="<%= $cgi->self_url %>">show disabled packages</a> )
-<% } %>
-
-<% my $colspan = $cgi->param('showdisabled') ? 2 : 3; %>
-
-<%= &table() %>
-      <TR>
-        <TH COLSPAN=<%= $colspan %>>Package</TH>
-        <TH>Comment</TH>
-<% if ( $cgi->param('active') ) { %>
-        <TH><FONT SIZE=-1>Customer<BR>packages</FONT></TH>
-<% } %>
-        <TH><FONT SIZE=-1>Freq.</FONT></TH>
-<% if ( $taxclasses ) { %>
-	<TH><FONT SIZE=-1>Taxclass</FONT></TH>
-<% } %>
-        <TH><FONT SIZE=-1>Plan</FONT></TH>
-        <TH><FONT SIZE=-1>Data</FONT></TH>
-        <TH>Service</TH>
-        <TH><FONT SIZE=-1>Quan.</FONT></TH>
-<% if ( dbdef->table('pkg_svc')->column('primary_svc') ) { %>
-        <TH><FONT SIZE=-1>Primary</FONT></TH>
-<% } %>
-
-      </TR>
+my $html_init;
+unless ( $cgi->param('active') ) {
+  $html_init = qq!
+    One or more service definitions are grouped together into a package 
+    definition and given pricing information.  Customers purchase packages
+    rather than purchase services directly.<BR><BR>
+    <A HREF="${p}edit/part_pkg.cgi"><I>Add a new package definition</I></A>
+    <BR><BR>
+  !;
+}
 
-<%
-foreach my $part_pkg ( sort $sortby @part_pkg ) {
-  my @pkg_svc = $part_pkg->pkg_svc;
-  my($rowspan)=scalar(@pkg_svc);
-  my $plandata;
-  if ( $part_pkg->plan ) {
-    $plandata = $part_pkg->plandata;
-    $plandata =~ s/^(\w+)=/$1&nbsp;/mg;
-    $plandata =~ s/\n/<BR>/g;
-  } else {
-    $part_pkg->plan('(legacy)');
-    $plandata = "Setup&nbsp;". $part_pkg->setup.
-                "<BR>Recur&nbsp;". $part_pkg->recur;
-  }
-%>
-      <TR>
-        <TD ROWSPAN=<%= $rowspan %>><A HREF="<%=$p%>edit/part_pkg.cgi?<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkgpart %></A></TD>
-
-<% unless ( $cgi->param('showdisabled') ) { %>
-        <TD ROWSPAN=<%= $rowspan %>>
-   <% if ( $part_pkg->disabled ) { %>
-          DISABLED
-   <% } %>
-        </TD>
-<% } %>
-
-        <TD ROWSPAN=<%= $rowspan %>><A HREF="<%=$p%>edit/part_pkg.cgi?<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkg %></A></TD>
-        <TD ROWSPAN=<%= $rowspan %>><%= $part_pkg->comment %></TD>
-
-<% if ( $cgi->param('active') ) { %>
-        <TD ROWSPAN=<%= $rowspan %>>
-          <FONT COLOR="#00CC00"><B><%= $num_active_cust_pkg{$part_pkg->pkgpart} %></B></FONT>&nbsp;<A HREF="<%=$p%>search/cust_pkg.cgi?magic=active;pkgpart=<%= $part_pkg->pkgpart %>">active</A><BR>
-
-   <% $suspended_sth->execute( $part_pkg->pkgpart )
-        or die $suspended_sth->errstr;
-      my $num_suspended = $suspended_sth->fetchrow_arrayref->[0];
-   %>
-          <FONT COLOR="#FF9900"><B><%= $num_suspended %></B></FONT>&nbsp;<A HREF="<%=$p%>search/cust_pkg.cgi?magic=suspended;pkgpart=<%= $part_pkg->pkgpart %>">suspended</A><BR>
-
-   <% $canceled_sth->execute( $part_pkg->pkgpart )
-        or die $canceled_sth->errstr;
-      my $num_canceled = $canceled_sth->fetchrow_arrayref->[0];
-   %>
-          <FONT COLOR="#FF0000"><B><%= $num_canceled %></B></FONT>&nbsp;<A HREF="<%=$p%>search/cust_pkg.cgi?magic=canceled;pkgpart=<%= $part_pkg->pkgpart %>">canceled</A>
-        </TD>
-<% } %>
-
-        <TD ROWSPAN=<%= $rowspan %>><%= $part_pkg->freq_pretty %></TD>
-
-<% if ( $taxclasses ) { %>
-	<TD ROWSPAN=<%= $rowspan %>><%= $part_pkg->taxclass || '&nbsp;' %></TD>
-<% } %>
-
-        <TD ROWSPAN=<%= $rowspan %>><%= $part_pkg->plan %></TD>
-        <TD ROWSPAN=<%= $rowspan %>><%= $plandata %></TD>
+my $posttotal;
+if ( $cgi->param('showdisabled') ) {
+  $cgi->param('showdisabled', 0);
+  $posttotal = '( <a href="'. $cgi->self_url. '">hide disabled packages</a> )';
+} else {
+  $cgi->param('showdisabled', 1);
+  $posttotal = '( <a href="'. $cgi->self_url. '">show disabled packages</a> )';
+}
 
-<%
-  my($n)="";
-  foreach my $pkg_svc ( @pkg_svc ) {
-    my($svcpart)=$pkg_svc->getfield('svcpart');
-    my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
-    print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
-          $part_svc->getfield('svc'),"</A></TD><TD>",
-          $pkg_svc->getfield('quantity'),"</TD>";
-    if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
-      print '<TD>';
-      print 'PRIMARY' if $pkg_svc->primary_svc =~ /^Y/i;
-      print '</TD>';
-    }
-    print "</TR>\n";
-    $n="<TR>";
-  }
-%>
+# ------
+
+my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ];
+
+my @header = ( '#', 'Package', 'Comment' );
+my @fields = ( 'pkgpart', 'pkg', 'comment' );
+my $align = 'rll';
+my @links = ( $link, $link, '' );
+my @style = ( '', '', '' );
+
+unless ( $cgi->param('showdisabled') ) { #its been reversed already
+  push @header, 'Status';
+  push @fields, sub { shift->disabled
+                        ? '<FONT COLOR="#FF0000">DISABLED</FONT>'
+                        : '<FONT COLOR="#00CC00">Active</FONT>'
+                    };
+  push @links, '';
+  $align .= 'c';
+  push @style, 'b';
+}
+
+unless ( 0 ) { #already showing only one class or something?
+  push @header, 'Class';
+  push @fields, sub { shift->classname || '(none)'; };
+  $align .= 'l';
+}
+
+if ( $cgi->param('active') ) {
+  push @header, 'Customer<BR>packages';
+  my %col = (
+    'active'      => '00CC00',
+    'suspended'   => 'FF9900',
+    'cancelled'   => 'FF0000',
+  );
+  my $cust_pkg_link = $p. 'search/cust_pkg.cgi?pkgpart=';
+  push @fields, sub { my $part_pkg = shift;
+                      [
+                        map {
+                              [
+                                {
+                                 'data'  => '<B><FONT COLOR="#'. $col{$_}. '">'.
+                                            $part_pkg->get("num_$_").
+                                            '</FONT></B>',
+                                 'align' => 'right',
+                                },
+                                {
+                                 'data'  => $_,
+                                 'align' => 'left',
+                                 'link'  => ( $part_pkg->get("num_$_")
+                                                ? $cust_pkg_link.
+                                                  $part_pkg->pkgpart.
+                                                  ";magic=$_"
+                                                : ''
+                                            ),
+                                },
+                              ],
+                            } (qw( active suspended cancelled ))
+                      ]; };
+  $align .= 'r';
+}
 
-      </TR>
-<% } %>
+push @header, 'Frequency';
+push @fields, sub { shift->freq_pretty; };
+$align .= 'l';
 
-    </TABLE>
-  </BODY>
-</HTML>
+if ( $taxclasses ) {
+  push @header, 'Taxclass';
+  push @fields, sub { shift->taxclass() || '&nbsp;'; };
+  $align .= 'l';
+}
+
+push @header, 'Plan',
+              'Data',
+              'Services';
+              #'Service', 'Quan', 'Primary';
+
+push @fields, sub { shift->plan || '(legacy)' }, 
+
+              sub {
+                    my $part_pkg = shift;
+                    if ( $part_pkg->plan ) {
+
+                      [ map { 
+                              /^(\w+)=(.*)$/; #or something;
+                              [
+                                { 'data'  => $1,
+                                  'align' => 'right',
+                                },
+                                { 'data'  => $2,
+                                  'align' => 'left',
+                                },
+                              ];
+                            }
+                        split(/\n/, $part_pkg->plandata)
+                      ];
+
+                    } else {
+
+                      [ map { [
+                                { 'data'  => uc($_),
+                                  'align' => 'right',
+                                },
+                                {
+                                  'data'  => $part_pkg->$_(),
+                                  'align' => 'left',
+                                },
+                              ];
+                            }
+                        (qw(setup recur))
+                      ];
+
+                    }
+
+                  },
+
+              sub {
+                    my $part_pkg = shift;
+
+                    [ map  {
+                             my $pkg_svc = $_;
+                             my $part_svc = $pkg_svc->part_svc;
+                             my $svc = $part_svc->svc;
+                             if ( $pkg_svc->primary_svc =~ /^Y/i ) {
+                               $svc = "<B>$svc (PRIMARY)</B>";
+                             }
+                             $svc =~ s/ +/&nbsp;/g;
+
+                             [
+                               {
+                                 'data'  => '<B>'. $pkg_svc->quantity. '</B>',
+                                 'align' => 'right'
+                               },
+                               {
+                                 'data'  => $svc,
+                                 'align' => 'left',
+                                 'link'  => $p. 'edit/part_svc.cgi?'.
+                                            $part_svc->svcpart,
+                               },
+                             ];
+                           }
+                      sort {     $b->primary_svc =~ /^Y/i
+                             <=> $a->primary_svc =~ /^Y/i
+                           }
+                           $part_pkg->pkg_svc
+
+                    ];
+
+                  };
+
+$align .= 'lrl'; #rr';
+
+# --------
+
+my $count_query = 'SELECT COUNT(*) FROM part_pkg';
+$count_query .= " WHERE $search"
+  if $search;
+
+%><%= include( 'elements/browse.html',
+                 'title'          => 'Package Definitions',
+                 'menubar'        => [ 'Main Menu' => $p ],
+                 'html_init'      => $html_init,
+                 'html_posttotal' => $posttotal,
+                 'name'           => 'package definitions',
+                 'query'          => { 'select'    => $select,
+                                       'table'     => 'part_pkg',
+                                       'hashref'   => \%search,
+                                       'extra_sql' => "ORDER BY $orderby",
+                                     },
+                 'count_query'    => $count_query,
+                 'header'         => \@header,
+                 'fields'         => \@fields,
+                 'links'          => \@links,
+                 'align'          => $align,
+                 'style'          => \@style,
+             )
+%>
diff --git a/httemplate/browse/pkg_class.html b/httemplate/browse/pkg_class.html
new file mode 100644
index 000000000..d4f8f02a9
--- /dev/null
+++ b/httemplate/browse/pkg_class.html
@@ -0,0 +1,26 @@
+<%
+
+my $html_init = 
+  'Package classes define groups of packages, for reporting and '.
+  'convenience purposes.<BR><BR>'.
+  qq!<A HREF="${p}edit/pkg_class.html"><I>Add a package class</I></A><BR><BR>!;
+
+my $count_query = 'SELECT COUNT(*) FROM pkg_class';
+
+my $link = [ $p.'edit/pkg_class.html?', 'classnum' ];
+
+%><%= include( 'elements/browse.html',
+                 'title'       => 'Package classes',
+                 'menubar'     => [ 'Main menu' => $p, ],
+                 'html_init'   => $html_init,
+                 'name'        => 'package classes',
+                 'query'       => { 'table'     => 'pkg_class',
+                                    'hashref'   => {},
+                                    'extra_sql' => 'ORDER BY classnum',
+                                  },
+                 'count_query' => $count_query,
+                 'header'      => [ '#', 'Class', ],
+                 'fields'      => [ 'classnum', 'classname' ],
+                 'links'       => [ $link, $link ],
+             )
+%>
diff --git a/httemplate/browse/rate.cgi b/httemplate/browse/rate.cgi
index 4718b7147..c4ae2f081 100644
--- a/httemplate/browse/rate.cgi
+++ b/httemplate/browse/rate.cgi
@@ -1,34 +1,33 @@
-<!-- mason kludge -->
-<%= include("/elements/header.html","Rate plan listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
-Rate plans, regions and prefixes for VoIP and call billing.<BR><BR>
-<A HREF="<%=$p%>edit/rate.cgi"><I>Add a rate plan</I></A>
-| <A HREF="<%=$p%>edit/rate_region.cgi"><I>Add a region</I></A>
-<BR><BR>
-<SCRIPT>
-function rate_areyousure(href) {
-  if (confirm("Are you sure you want to delete this rate plan?") == true)
-    window.location.href = href;
-}
-</SCRIPT>
+<%
 
-<%= table() %>
-  <TR>
-    <TH COLSPAN=2>Rate plan</TH>
-  </TR>
+my $html_init = 
+  'Rate plans, regions and prefixes for VoIP and call billing.<BR><BR>'.
+  qq!<A HREF="${p}edit/rate.cgi"><I>Add a rate plan</I></A>!.
+  qq! | <A HREF="${p}edit/rate_region.cgi"><I>Add a region</I></A>!.
+  '<BR><BR>
+   <SCRIPT>
+   function rate_areyousure(href) {
+    if (confirm("Are you sure you want to delete this rate plan?") == true)
+      window.location.href = href;
+   }
+   </SCRIPT>';
 
-<% foreach my $rate ( sort { 
-     $a->getfield('ratenum') <=> $b->getfield('ratenum')
-   } qsearch('rate',{}) ) {
-%>
-  <TR>
-    <TD><A HREF="<%= $p %>edit/rate.cgi?<%= $rate->ratenum %>"><%= $rate->ratenum %></A></TD>
-    <TD><A HREF="<%= $p %>edit/rate.cgi?<%= $rate->ratenum %>"><%= $rate->ratename %></A></TD>
-  </TR>
-
-<% } %>
+my $count_query = 'SELECT COUNT(*) FROM rate';
 
-</TABLE>
-</BODY>
-</HTML>
+my $link = [ $p.'edit/rate.cgi?', 'ratenum' ];
 
- 
+%><%= include( 'elements/browse.html',
+                 'title'       => 'Rate plans',
+                 'menubar'     => [ 'Main menu' => $p, ],
+                 'html_init'   => $html_init,
+                 'name'        => 'rate plans',
+                 'query'       => { 'table'     => 'rate',
+                                    'hashref'   => {},
+                                    'extra_sql' => 'ORDER BY ratenum',
+                                  },
+                 'count_query' => $count_query,
+                 'header'      => [ '#', 'Rate plan', ],
+                 'fields'      => [ 'ratenum', 'ratename' ],
+                 'links'       => [ $link, $link ],
+             )
+%>
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index ce6e2dbb1..5486b4b00 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -15,6 +15,8 @@
   #             ]
   #
   # 'menubar'     => '', #menubar arrayref
+  #
+  # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
 
   my(%opt) = @_;
 
@@ -55,7 +57,9 @@
   } else {
     @menubar = (
       'Main menu' => $p, #eventually get rid of this when the ACL/UI update is done
-      "View all $opt{'name'}s" => "${p}search/$table.html", #eventually use Lingua::bs to pluralize
+      #eventually use Lingua::bs to pluralize
+      "View all $opt{'name'}s" => $p. ( $opt{'viewall_dir'} || 'search' ).
+                                  "/$table.html",
     );
   }
 
diff --git a/httemplate/edit/inventory_class.html b/httemplate/edit/inventory_class.html
index 5dde2e595..8c5ae4770 100644
--- a/httemplate/edit/inventory_class.html
+++ b/httemplate/edit/inventory_class.html
@@ -5,5 +5,6 @@
                                'classnum'  => 'Class number',
                                'classname' => 'Class name',
                              },
+                 'viewall_dir' => 'browse',
            )
 %>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 158c6e2ff..462d5161f 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -84,6 +84,7 @@ Package information
       <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="<%=$part_pkg->comment%>">
     </TD>
   </TR>
+  <%= include( '/elements/tr-select-pkg_class.html', $part_pkg->classnum ) %>
   <TR>
     <TD ALIGN="right">Promotional code</TD>
     <TD>
@@ -146,8 +147,8 @@ $thead .= '<TH BGCOLOR="#dcdcdc">Service</TH></TR>';
 
 %>
 
-<%= itable('', 4, 1) %><TR><TD VALIGN="top">
 <BR><BR>Services included
+<%= itable('', 4, 1) %><TR><TD VALIGN="top">
 <%= $thead %>
 
 <%
@@ -194,14 +195,14 @@ foreach my $part_svc ( @part_svc ) {
     </TD>
   </TR>
 
-  <% $count++;
-     foreach ( 1 .. $columns-1 ) {
+  <% foreach ( 1 .. $columns-1 ) {
        if ( $count == int( $_ * scalar(@part_svc) / $columns ) ) { 
   %>
          </TABLE></TD><TD VALIGN="top"><%= $thead %>
 
   <%   }
      }
+     $count++;
   %>
 
 <% } %>
@@ -224,7 +225,7 @@ my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
 
 tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans;
 
-my @form_select = ();
+my @form_select = ('classnum');
 if ( $conf->exists('enable_taxclasses') ) {
   push @form_select, 'taxclass';
 } else {
diff --git a/httemplate/edit/pkg_class.html b/httemplate/edit/pkg_class.html
new file mode 100644
index 000000000..b077f6fa9
--- /dev/null
+++ b/httemplate/edit/pkg_class.html
@@ -0,0 +1,10 @@
+<%= include( 'elements/edit.html',
+                 'name'   => 'Package Class',
+                 'table'  => 'pkg_class',
+                 'labels' => { 
+                               'classnum'  => 'Class number',
+                               'classname' => 'Class name',
+                             },
+                 'viewall_dir' => 'browse',
+           )
+%>
diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index 52c876720..83ff6f728 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -5,6 +5,7 @@
   # 'table' => 
   # #? 'primary_key' => #required when the dbdef doesn't know...???
   # #? 'fields' => []
+  # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
 
   my(%opt) = @_;
 
@@ -40,7 +41,10 @@
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(2). "$table.html?". $cgi->query_string );
   } else { 
-    print $cgi->redirect(popurl(3). "search/$table.html");
+    print $cgi->redirect( popurl(3).
+                          ( $opt{'viewall_dir'} || 'search' ).
+                          "/$table.html"
+                        );
   }
 
 %>
diff --git a/httemplate/edit/process/inventory_class.html b/httemplate/edit/process/inventory_class.html
index e30e74e7b..ab9efef48 100644
--- a/httemplate/edit/process/inventory_class.html
+++ b/httemplate/edit/process/inventory_class.html
@@ -1,4 +1,5 @@
 <%= include( 'elements/process.html',
-               'table' => 'inventory_class',
+               'table'       => 'inventory_class',
+               'viewall_dir' => 'browse',
            )
 %>
diff --git a/httemplate/edit/process/pkg_class.html b/httemplate/edit/process/pkg_class.html
new file mode 100644
index 000000000..48e2b8009
--- /dev/null
+++ b/httemplate/edit/process/pkg_class.html
@@ -0,0 +1,5 @@
+<%= include( 'elements/process.html',
+               'table'       => 'pkg_class',
+               'viewall_dir' => 'browse',
+           )
+%>
diff --git a/httemplate/elements/select-agent.html b/httemplate/elements/select-agent.html
index c2a5e4bde..aa480a54b 100644
--- a/httemplate/elements/select-agent.html
+++ b/httemplate/elements/select-agent.html
@@ -1,24 +1,16 @@
 <%
   my( $agentnum, %opt ) = @_;
 
-  my @agents;
-  if ( $opt{'agents'} ) {
-    @agents = @{ $opt{'agents'} };
-  } else {
-    @agents = qsearch( 'agent', { disabled=>'' } );
-  }
-
+  my %select_opt = ();
+  $select_opt{'records'} = $opt{'agents'}
+    if $opt{'agents'};
+
+%><%= include( '/elements/select-table.html',
+                 'table'       => 'agent',
+                 'name_col'    => 'agent',
+                 'value'       => $agentnum,
+                 'empty_label' => 'all',
+                 'hashref'     => { 'disabled' => '' },
+                 %select_opt,
+             )
 %>
-
-<SELECT NAME="agentnum">
-
-  <OPTION VALUE="">all</OPTION>
-
-  <% foreach my $agent ( sort { $a->agent cmp $b->agent } @agents ) { %>
-
-    <OPTION VALUE="<%= $agent->agentnum %>"<%= $agentnum == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
-
-  <% } %>
-
-</SELECT>
-
diff --git a/httemplate/elements/select-pkg_class.html b/httemplate/elements/select-pkg_class.html
new file mode 100644
index 000000000..5486e0877
--- /dev/null
+++ b/httemplate/elements/select-pkg_class.html
@@ -0,0 +1,16 @@
+<%
+  my( $classnum, %opt ) = @_;
+
+  my %select_opt = ();
+  $select_opt{'records'} = $opt{'pkg_class'}
+    if $opt{'pkg_class'};
+
+%><%= include( '/elements/select-table.html',
+                 'table'       => 'pkg_class',
+                 'name_col'    => 'classname',
+                 'value'       => $classnum,
+                 'empty_label' => '(none)',
+                 #'hashref'     => { 'disabled' => '' },
+                 #%select_opt,
+             )
+%>
diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html
new file mode 100644
index 000000000..10cc8b995
--- /dev/null
+++ b/httemplate/elements/select-table.html
@@ -0,0 +1,45 @@
+<%
+
+  ##required
+  # 'table'    => 'table_name',
+  # 'name_col' => 'name_column',
+  #
+  ##strongly recommended (you want your forms to be "sticky" on errors, right?)
+  # 'value'    => 'current_value',
+  #
+  ##opt
+  # 'empty_label' => '', #better specify it though, the default might change
+  # 'hashref'     => {},
+  # 'records'     => \@records, #instead of hashref
+
+  my( %opt ) = @_;
+
+  my $key = dbdef->table($opt{'table'})->primary_key; #? $opt{'primary_key'} ||
+
+  my $name_col = $opt{'name_col'};
+
+  my @records = ();
+  if ( $opt{'records'} ) {
+    @records = @{ $opt{'records'} };
+  } else {
+    @records = qsearch( $opt{'table'}, ( $opt{'hashref'} || {} ) );
+  }
+
+%>
+
+<SELECT NAME="<%= $key %>">
+
+  <OPTION VALUE=""><%= $opt{'empty_label'} || 'all' %></OPTION>
+
+  <% foreach my $record ( sort { $a->$name_col() cmp $b->$name_col() }
+                               @records
+                        )
+     {
+  %>
+
+    <OPTION VALUE="<%= $record->$key() %>"<%= $opt{'value'} == $record->$key() ? ' SELECTED' : '' %>><%= $record->$name_col() %>
+
+  <% } %>
+
+</SELECT>
+
diff --git a/httemplate/elements/tr-select-pkg_class.html b/httemplate/elements/tr-select-pkg_class.html
new file mode 100644
index 000000000..de10885c8
--- /dev/null
+++ b/httemplate/elements/tr-select-pkg_class.html
@@ -0,0 +1,29 @@
+<%
+  my( $classnum, %opt ) = @_;
+
+  my @pkg_class;
+  if ( $opt{'pkg_class'} ) {
+    @pkg_class = @{ $opt{'pkg_class'} };
+  } else {
+    @pkg_class = qsearch( 'pkg_class', {} ); # { disabled=>'' } );
+  }
+
+%>
+
+<% if ( scalar(@pkg_class) == 0 ) { %>
+
+  <INPUT TYPE="hidden" NAME="classnum" VALUE="">
+
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right"><%= $opt{'label'} || 'Package class' %></TD>
+    <TD>
+      <%= include( '/elements/select-pkg_class.html', $classnum,
+                     'pkg_class' => \@pkg_class,
+                 )
+      %>
+    </TD>
+  </TR>
+
+<% } %>
diff --git a/httemplate/index.html b/httemplate/index.html
index a1c3caf39..6cd667d8a 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -186,7 +186,7 @@
             - One or more services are grouped together into a package and
               given pricing information.  Customers purchase packages, not
               services.
-          <LI><A HREF="browse/pkg_class.cgi">View/Edit package classes</A>
+          <LI><A HREF="browse/pkg_class.html">View/Edit package classes</A>
             - Package classes define groups of packages, for reporting and
               convenience purposes.
         </ul>
@@ -234,6 +234,8 @@
 	  - Locally defined fields
 	  <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A>
 	  - Change error messages and other customizable labels.
+	  <LI><A HREF="browse/inventory_class.html">View/Edit inventory classes and inventory</A>
+	  - Setup inventory classes and stock inventory.
 	</ul>
         <BR>
       </TD></TR>
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 5da4d82fb..a2fb89c12 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -19,8 +19,10 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 
   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
   push @where,
-    "bill >= $beginning ",
-    "bill <= $ending",
+    #"bill >= $beginning ",
+    #"bill <= $ending",
+    "CASE WHEN bill IS NULL THEN 0 ELSE bill END >= $beginning ",
+    "CASE WHEN bill IS NULL THEN 0 ELSE bill END <= $ending",
     '( cancel IS NULL OR cancel = 0 )';
 
 } else {
@@ -141,7 +143,7 @@ sub time_or_blank {
                   'name'        => 'packages',
                   'query'       => $sql_query,
                   'count_query' => $count_query,
-                  'redirect'    => $link,
+                  #'redirect'    => $link,
                   'header'      => [ '#',
                                      'Package',
                                      'Status',
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 7f7243588..6cf574164 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -8,8 +8,12 @@
   # 'name'        => 'items', #name for the records returned
   #
   # # some HTML callbacks...
-  # 'menubar'     => '', #menubar arrayref
-  # 'html_init'   => '', #after the header/menubar and before the pager
+  # 'menubar'          => '', #menubar arrayref
+  # 'html_init'        => '', #after the header/menubar and before the pager
+  # 'html_foot'        => '', #at the bottom
+  # 'html_posttotal'   => '', #at the bottom
+  #                           # (these three can be strings or coderefs)
+  # 
   #
   # #literal SQL query string or qsearch hashref, required
   # 'query'       => {
@@ -39,6 +43,10 @@
   # # (if not specified the database column names will be used)
   # 'header'      => [ '#', 'Item' ],
   #
+  # 'disable_download' => '', # set true to hide the CSV/Excel download links
+  # 'disable_nonefound' => '', # set true to disable the "No matching Xs found"
+  #                            # message
+  #
   # #listref - each item is a literal column name (or method) or coderef
   # #if not specified all columns will be shown
   # 'fields'      => [
@@ -286,7 +294,13 @@
                  include( '/elements/menubar.html', @menubar )
              )
   %>
-  <%= defined($opt{'html_init'}) ? $opt{'html_init'} : '' %>
+  <%= defined($opt{'html_init'}) 
+        ? ( ref($opt{'html_init'})
+              ? &{$opt{'html_init'}}()
+              : $opt{'html_init'}
+          )
+        : ''
+  %>
   <% my $pager = include ( '/elements/pager.html',
                              'offset'     => $offset,
                              'num_rows'   => scalar(@$rows),
@@ -295,26 +309,38 @@
                          );
   %>
   <% unless ( $total ) { %>
-    No matching <%= $opt{'name'} %> found.<BR>
+    <% unless ( $opt{'disable_nonefound'} ) { %>
+      No matching <%= $opt{'name'} %> found.<BR>
+    <% } %>
   <% } else { %>
   
     <TABLE>
       <TR>
         <TD VALIGN="bottom">
-          <%= $total %> total <%= $opt{'name'} %><BR>
+          <%= $total %> total <%= $opt{'name'} %>
+          <%= defined($opt{'html_posttotal'}) 
+                ? ( ref($opt{'html_posttotal'})
+                      ? &{$opt{'html_posttotal'}}()
+                      : $opt{'html_posttotal'}
+                  )
+                : ''
+          %>
+          <BR>
           <% if ( $opt{'count_addl'} ) { %>
             <% my $n=0; foreach my $count ( @{$opt{'count_addl'}} ) { %>
               <%= sprintf( $count, $count_arrayref->[++$n] ) %><BR>
             <% } %>
           <% } %>
         </TD>
-        <TD ALIGN="right">
-          <% $cgi->param('_type', "$xlsname.xls" ); %>
-          Download full results<BR>
-          as <A HREF="<%= $cgi->self_url %>">Excel spreadsheet</A><BR>
-          <% $cgi->param('_type', 'csv'); %>
-          as <A HREF="<%= $cgi->self_url %>">CSV file</A>
-        </TD>
+        <% unless ( $opt{'disable_download'} ) { %>
+          <TD ALIGN="right">
+            <% $cgi->param('_type', "$xlsname.xls" ); %>
+            Download full results<BR>
+            as <A HREF="<%= $cgi->self_url %>">Excel spreadsheet</A><BR>
+            <% $cgi->param('_type', 'csv'); %>
+            as <A HREF="<%= $cgi->self_url %>">CSV file</A>
+          </TD>
+        <% } %>
       </TR>
       <TR>
         <TD COLSPAN=2>
@@ -471,6 +497,13 @@
       </TABLE>
   
   <% } %>
+  <%= defined($opt{'html_foot'}) 
+        ? ( ref($opt{'html_foot'})
+              ? &{$opt{'html_foot'}}()
+              : $opt{'html_foot'}
+          )
+        : ''
+  %>
   <%= include( '/elements/footer.html' ) %>
   <% } %>
 <% } %>
diff --git a/httemplate/search/inventory_class.html b/httemplate/search/inventory_class.html
deleted file mode 100644
index 37735f3c9..000000000
--- a/httemplate/search/inventory_class.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<%
-
-tie my %labels, 'Tie::IxHash',
-  'num_avail' => 'Available', #  <FONT SIZE="-1"><A HREF="eventually">(upload batch)</A></FONT>',
-  'num_used'  => 'In use', #'Used', #'Allocated',
-  'num_total' => 'Total',
-;
-
-my %link = (
-  'num_avail' => ';avail=1',
-  'num_used'  => ';avail=1',
-  'num_total' => '',
-);
-
-my %inv_action_link = (
-  'num_avail' => [ 'upload batch',
-                   $p.'misc/inventory_item-import.html?classnum=',
-                   'classnum'
-                 ],
-);
-
-my $link = [ "${p}edit/inventory_class.html?", 'classnum' ];
-
-%><%= include( 'elements/search.html',
-                 'title'       => 'Inventory Classes',
-                 'name'        => 'inventory classes',
-                 'menubar'     => [ 'Add a new inventory class' =>
-                                      $p.'edit/inventory_class.html',
-                                  ],
-                 'query'       => { 'table' => 'inventory_class', },
-                 'count_query' => 'SELECT COUNT(*) FROM inventory_class',
-                 'header'      => [ '#', 'Inventory class', 'Inventory' ],
-                 'fields'      => [ 'classnum',
-                                    'classname',
-                                    sub {
-                                          #my $inventory_class = shift;
-                                          my $i_c = shift;
-
-                                          my $link =
-                                            $p. 'search/inventory_item.html?'.
-                                            'classnum='. $i_c->classnum;
-
-                                          my %actioncol = ();
-                                          foreach ( keys %inv_action_link ) {
-                                            my($label, $baseurl, $method) =
-                                              @{ $inv_action_link{$_} };
-                                            my $url = $baseurl. $i_c->$method();
-                                            $actioncol{$_} =
-                                              '<FONT SIZE="-1">'.
-                                              '('.
-                                              '<A HREF="'.$url.'">'.
-                                              $label.
-                                              '</A>'.
-                                              ')'.
-                                              '</FONT>';
-                                          }
-
-                                          my %num = map { 
-                                            $_ => $i_c->$_();
-                                          } keys %labels;
-
-                                          [ map {
-                                                  [
-                                                    {
-                                                      'data'  => '<B>'. $num{$_}. '</B>',
-                                                      'align' => 'right',
-                                                    },
-                                                    {
-                                                      'data'  => $labels{$_},
-                                                      'align' => 'left',
-                                                      'link'  => ( $num{$_}
-                                                                     ? $link.$link{$_}
-                                                                     : ''
-                                                                 ),
-                                                    },
-                                                    { 'data'  => $actioncol{$_},
-                                                      'align'  => 'left',
-                                                    },
-                                                  ]
-                                                } keys %labels
-                                          ];
-                                        },
-                                  ],
-                 'links'       => [ $link,
-                                    $link,
-                                    '',
-                                  ],
-             )
-%>
-- 
cgit v1.2.1


From cf0749726a8e719909cf5e2dbe7fb0f1581ae8c3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Apr 2006 13:16:11 +0000
Subject: apache reload doesn't work when server isn't running already

---
 Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index dae5f23b4..1163237b8 100644
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,8 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #not necessary (freebsd)
 #INIT_INSTALL = /usr/bin/true
 
-#deb
-HTTPD_RESTART = /etc/init.d/apache reload
-#suse
-#HTTPD_RESTART = /etc/init.d/apache restart
+#deb, suse
+HTTPD_RESTART = /etc/init.d/apache restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -198,7 +196,10 @@ perl-modules:
 	make; \
 	perl -p -i -e "\
 	  s/%%%VERSION%%%/${VERSION}/g;\
-	" blib/lib/FS.pm
+	" blib/lib/FS.pm; \
+	perl -p -i -e "\
+	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+	" blib/lib/FS/CGI.pm
 
 install-perl-modules: perl-modules
 	[ -L ${PERL_INC_DEV_KLUDGE}/FS ] \
@@ -208,13 +209,13 @@ install-perl-modules: perl-modules
 	cd FS; \
 	make install UNINST=1
 
-dev-perl-modules:
+dev-perl-modules: perl-modules
 	[ -d ${PERL_INC_DEV_KLUDGE}/FS -a ! -L ${PERL_INC_DEV_KLUDGE}/FS ] \
 	  && mv ${PERL_INC_DEV_KLUDGE}/FS ${PERL_INC_DEV_KLUDGE}/FS.old \
 	  || true
 
 	rm -rf ${PERL_INC_DEV_KLUDGE}/FS
-	ln -sf ${FREESIDE_PATH}/FS/FS ${PERL_INC_DEV_KLUDGE}/FS
+	ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
 
 install-init:
 	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
-- 
cgit v1.2.1


From 69506a2741c08f1f849c9650bf3650a0f6a319f0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 1 May 2006 11:43:09 +0000
Subject: fix bug with duplicate tickets showing up on customer view listing
 when the custom priority field was edited

---
 FS/FS/TicketSystem/RT_External.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm
index d951cc0e7..667f0dc2d 100644
--- a/FS/FS/TicketSystem/RT_External.pm
+++ b/FS/FS/TicketSystem/RT_External.pm
@@ -109,6 +109,7 @@ sub _from_customer {
                  ON ( tickets.id = ObjectCustomFieldValues.ObjectId )";
       
       $where = " AND content = ?
+                 AND disabled != 1
                  AND ObjectType = 'RT::Ticket'
                  AND $customfield_sql";
 
-- 
cgit v1.2.1


From d3fb20fc820eef7b0d06ea67ed8d72c3c387aa44 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 1 May 2006 11:45:42 +0000
Subject: column reference "disabled" is ambiguous

---
 FS/FS/TicketSystem/RT_External.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm
index 667f0dc2d..ea3448039 100644
--- a/FS/FS/TicketSystem/RT_External.pm
+++ b/FS/FS/TicketSystem/RT_External.pm
@@ -109,7 +109,7 @@ sub _from_customer {
                  ON ( tickets.id = ObjectCustomFieldValues.ObjectId )";
       
       $where = " AND content = ?
-                 AND disabled != 1
+                 AND ObjectCustomFieldValues.disabled != 1
                  AND ObjectType = 'RT::Ticket'
                  AND $customfield_sql";
 
-- 
cgit v1.2.1


From 168d603dd94225a837c72d6ae4a5938f1b4d13e4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 1 May 2006 12:38:06 +0000
Subject: fix some very annoying clucks (warnings with backtraces) when cutoff
 day isn't found in old packages

---
 FS/FS/part_pkg/prorate.pm      | 2 +-
 FS/FS/part_pkg/subscription.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
index d3df01034..f5d447adf 100644
--- a/FS/FS/part_pkg/prorate.pm
+++ b/FS/FS/part_pkg/prorate.pm
@@ -37,7 +37,7 @@ use FS::part_pkg::flat;
 
 sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
-  my $cutoff_day = $self->option('cutoff_day') || 1;
+  my $cutoff_day = $self->option('cutoff_day', 1) || 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
   my $mend;
diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm
index bfb0582f3..6b5da5cdc 100644
--- a/FS/FS/part_pkg/subscription.pm
+++ b/FS/FS/part_pkg/subscription.pm
@@ -33,7 +33,7 @@ use FS::part_pkg::flat;
 
 sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
-  my $cutoff_day = $self->option('cutoff_day') || 1;
+  my $cutoff_day = $self->option('cutoff_day', 1) || 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
 
-- 
cgit v1.2.1


From aa9fd844aeeb385cfc1e934eb7b7a08b1353a4ea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 1 May 2006 13:09:11 +0000
Subject: small fix to make prorate behave on the 1st as it did before

---
 FS/FS/part_pkg/prorate.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
index f5d447adf..e43667993 100644
--- a/FS/FS/part_pkg/prorate.pm
+++ b/FS/FS/part_pkg/prorate.pm
@@ -43,7 +43,7 @@ sub calc_recur {
   my $mend;
   my $mstart;
   
-  if ( $mday > $cutoff_day ) {
+  if ( $mday >= $cutoff_day ) {
     $mend =
       timelocal(0,0,0,$cutoff_day, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
     $mstart =
-- 
cgit v1.2.1


From f29c752d6f9e813c10295b334eefb924216e34cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 May 2006 11:59:31 +0000
Subject: add a "pre-report" page to this report/graph as requested by
 lewis/wtxs, also add 12mo total option

---
 FS/FS/Report/Table/Monthly.pm           | 41 +++++++++++++++++++
 httemplate/graph/money_time-graph.cgi   |  9 +++++
 httemplate/graph/money_time.cgi         | 67 +++++++++----------------------
 httemplate/graph/report_money_time.html | 71 +++++++++++++++++++++++++++++++++
 httemplate/index.html                   |  2 +-
 5 files changed, 140 insertions(+), 50 deletions(-)
 create mode 100644 httemplate/graph/report_money_time.html

diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index 9ef108c44..e7f05e5f2 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -156,6 +156,47 @@ sub credits {
   );
 }
 
+#these should be auto-generated
+sub invoiced_12mo {
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
+  $speriod = $self->_subtract_11mo($speriod);
+  $self->invoiced($speriod, $eperiod, $agentnum);
+}
+
+sub netsales_12mo {
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
+  $speriod = $self->_subtract_11mo($speriod);
+  $self->netsales($speriod, $eperiod, $agentnum);
+}
+
+sub receipts_12mo {
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
+  $speriod = $self->_subtract_11mo($speriod);
+  $self->receipts($speriod, $eperiod, $agentnum);
+}
+
+sub payments_12mo {
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
+  $speriod = $self->_subtract_11mo($speriod);
+  $self->payments($speriod, $eperiod, $agentnum);
+}
+
+sub credits_12mo {
+  my( $self, $speriod, $eperiod, $agentnum ) = @_;
+  $speriod = $self->_subtract_11mo($speriod);
+  $self->credits($speriod, $eperiod, $agentnum);
+}
+
+#not being too bad with the false laziness
+use Time::Local qw(timelocal);
+sub _subtract_11mo {
+  my($self, $time) = @_;
+  my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($time) )[0,1,2,3,4,5];
+  $mon -= 11;
+  if ( $mon < 0 ) { $mon+=12; $year--; }
+  timelocal($sec,$min,$hour,$mday,$mon,$year);
+}
+
 # NEEDS TO BE AGENTNUM-capable
 sub canceled { #active
   my( $self, $speriod, $eperiod, $agentnum ) = @_;
diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index fc8207a81..637a3bf94 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -22,6 +22,10 @@ if ( $cgi->param('agentnum') =~ /^(\d*)$/ ) {
 #my %data;
 
 my @items = qw( invoiced netsales credits payments receipts );
+if ( $cgi->param('12mo') == 1 ) {
+  @items = map $_.'_12mo', @items;
+}
+
 my %label = (
  'invoiced' => 'Gross Sales (invoiced)', 
  'netsales' => 'Net Sales (invoiced - applied credits)',
@@ -29,6 +33,9 @@ my %label = (
  'payments' => 'Gross Receipts (payments)',
  'receipts' => 'Net Receipts/Cashflow (payments - refunds)',
 );
+$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
+  foreach keys %label;
+
 my %color = (
   'invoiced' => [ 153, 153, 255 ], #light blue
   'netsales' => [   0,   0, 204 ], #blue
@@ -36,6 +43,8 @@ my %color = (
   'payments' => [ 153, 204, 153 ], #light green
   'receipts' => [   0, 204,   0 ], #green
 );
+$color{$_.'_12mo'} = $color{$_}
+  foreach keys %color;
 
 my $report = new FS::Report::Table::Monthly (
   'items' => \@items,
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index bc789cb7e..73f9d23a2 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,16 +1,15 @@
-<!-- mason kludge -->
 <%
 
-#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-my ($curmon,$curyear) = (localtime(time))[4,5];
+#	#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+#	my ($curmon,$curyear) = (localtime(time))[4,5];
 
 #find first month
-my $syear = $cgi->param('syear') || 1899+$curyear;
-my $smonth = $cgi->param('smonth') || $curmon+1;
+my $syear = $cgi->param('syear'); # || 1899+$curyear;
+my $smonth = $cgi->param('smonth'); # || $curmon+1;
 
 #find last month
-my $eyear = $cgi->param('eyear') || 1900+$curyear;
-my $emonth = $cgi->param('emonth') || $curmon+1;
+my $eyear = $cgi->param('eyear'); # || 1900+$curyear;
+my $emonth = $cgi->param('emonth'); # || $curmon+1;
 
 #XXX or virtual
 my( $agentnum, $agent ) = ('', '');
@@ -20,10 +19,8 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
   die "agentnum $agentnum not found!" unless $agent;
 }
 my $agentname = $agent ? $agent->agent.' ' : '';
-warn $agentname;
 
 %>
-
 <%= include('/elements/header.html',
               $agentname. 'Sales, Credits and Receipts Summary'
            )
@@ -36,6 +33,10 @@ warn $agentname;
 <%
 
 my @items = qw( invoiced netsales credits payments receipts );
+if ( $cgi->param('12mo') == 1 ) {
+  @items = map $_.'_12mo', @items;
+}
+
 my %label = (
   'invoiced' => 'Gross Sales',
   'netsales' => 'Net Sales',
@@ -43,6 +44,9 @@ my %label = (
   'payments' => 'Gross Receipts',
   'receipts' => 'Net Receipts',
 );
+$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
+  foreach keys %label;
+
 my %color = (
   'invoiced' => '9999ff', #light blue
   'netsales' => '0000cc', #blue
@@ -50,11 +54,15 @@ my %color = (
   'payments' => '99cc99', #light green
   'receipts' => '00cc00', #green
 );
+$color{$_.'_12mo'} = $color{$_}
+  foreach keys %color;
+
 my %link = (
   'invoiced' => "${p}search/cust_bill.html?agentnum=$agentnum;",
   'credits'  => "${p}search/cust_credit.html?agentnum=$agentnum;",
   'payments' => "${p}search/cust_pay.cgi?magic=_date;agentnum=$agentnum;",
 );
+# XXX link 12mo?
 
 my $report = new FS::Report::Table::Monthly (
   'items' => \@items,
@@ -102,43 +110,4 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 <% } %>
 </TABLE>
 
-<BR>
-<FORM METHOD="POST">
-<!--
-<INPUT TYPE="checkbox" NAME="ar">
-  Accounts receivable (invoices - applied credits)<BR>
-<INPUT TYPE="checkbox" NAME="charged">
-  Just Invoices<BR>
-<INPUT TYPE="checkbox" NAME="defer">
-  Accounts receivable, with deferred revenue (invoices - applied credits, with charges for annual/semi-annual/quarterly/etc. services deferred over applicable time period) (there has got to be a shorter description for this)<BR>
-<INPUT TYPE="checkbox" NAME="cash">
-  Cashflow (payments - refunds)<BR>
-<BR>
--->
-From <SELECT NAME="smonth">
-<% foreach my $mon ( 1..12 ) { %>
-<OPTION VALUE="<%= $mon %>"<%= $mon == $smonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
-<% } %>
-</SELECT>
-<SELECT NAME="syear">
-<% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"<%= $y == $syear ? ' SELECTED' : '' %>><%= $y %>
-<% } %>
-</SELECT>
- to <SELECT NAME="emonth">
-<% foreach my $mon ( 1..12 ) { %>
-<OPTION VALUE="<%= $mon %>"<%= $mon == $emonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
-<% } %>
-</SELECT>
-<SELECT NAME="eyear">
-<% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"<%= $y == $eyear ? ' SELECTED' : '' %>><%= $y %>
-<% } %>
-</SELECT>
-
-for agent: <%= include('/elements/select-agent.html', $agentnum) %>
-
-<INPUT TYPE="submit" VALUE="Redisplay">
-</FORM>
-</BODY>
-</HTML>
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/graph/report_money_time.html b/httemplate/graph/report_money_time.html
new file mode 100644
index 000000000..6c7e42716
--- /dev/null
+++ b/httemplate/graph/report_money_time.html
@@ -0,0 +1,71 @@
+<%
+
+#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+my ($curmon,$curyear) = (localtime(time))[4,5];
+
+#find first month
+my $syear = 1899+$curyear;
+my $smonth = $curmon+1;
+
+#want 12 month by default, not 13
+$smonth++;
+if ( $smonth > 12 ) { $smonth-=12; $syear++ }
+
+#find last month
+my $eyear = 1900+$curyear;
+my $emonth = $curmon+1;
+
+my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+
+%>
+<%= include('/elements/header.html', 'Sales, Credits and Receipts Summary' ) %>
+
+<FORM ACTION="money_time.cgi" METHOD="GET">
+
+<!--
+<INPUT TYPE="checkbox" NAME="ar">
+  Accounts receivable (invoices - applied credits)<BR>
+<INPUT TYPE="checkbox" NAME="charged">
+  Just Invoices<BR>
+<INPUT TYPE="checkbox" NAME="defer">
+  Accounts receivable, with deferred revenue (invoices - applied credits, with charges for annual/semi-annual/quarterly/etc. services deferred over applicable time period) (there has got to be a shorter description for this)<BR>
+<INPUT TYPE="checkbox" NAME="cash">
+  Cashflow (payments - refunds)<BR>
+<BR>
+-->
+
+From: <SELECT NAME="smonth">
+<% foreach my $mon ( 1..12 ) { %>
+<OPTION VALUE="<%= $mon %>"<%= $mon == $smonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
+<% } %>
+</SELECT>
+<SELECT NAME="syear">
+<% foreach my $y ( 1999 .. 2010 ) { %>
+<OPTION VALUE="<%= $y %>"<%= $y == $syear ? ' SELECTED' : '' %>><%= $y %>
+<% } %>
+</SELECT>
+<BR>
+
+To: <SELECT NAME="emonth">
+<% foreach my $mon ( 1..12 ) { %>
+<OPTION VALUE="<%= $mon %>"<%= $mon == $emonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
+<% } %>
+</SELECT>
+<SELECT NAME="eyear">
+<% foreach my $y ( 1999 .. 2010 ) { %>
+<OPTION VALUE="<%= $y %>"<%= $y == $eyear ? ' SELECTED' : '' %>><%= $y %>
+<% } %>
+</SELECT>
+<BR>
+
+For agent: <%= include('/elements/select-agent.html' ) %>
+<BR>
+
+<INPUT TYPE="checkbox" NAME="12mo" VALUE="1"> Show 12 month totals instead of monthly values.
+<BR>
+
+<INPUT TYPE="submit" VALUE="Display">
+</FORM>
+
+<%= include('/elements/footer.html') %>
+
diff --git a/httemplate/index.html b/httemplate/index.html
index 6cd667d8a..4704ebe33 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -97,7 +97,7 @@
             </UL>
       <A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
       <BR><BR><A HREF="search/report_cust_credit.html">Credit report (by employee and/or date range)</A>
-      <BR><BR><A HREF="graph/money_time.cgi">Sales, Credits and Receipts Summary</A>
+      <BR><BR><A HREF="graph/report_money_time.html">Sales, Credits and Receipts Summary</A>
       <BR><BR><A HREF="search/report_receivables.cgi">Accounts Receivable Aging Summary</A>
       <BR><BR><A HREF="search/report_prepaid_income.html">Prepaid Income (Unearned Revenue) Report</A>
       <BR><BR><A HREF="search/report_tax.html">Sales Tax Liability Report</A>
-- 
cgit v1.2.1


From ecc090b960f14a68a51bc966113ab4e0feeb38cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 May 2006 13:29:57 +0000
Subject: need to install the new Schema.pm before you can autogenerate off it

---
 SCHEMA_CHANGE | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SCHEMA_CHANGE b/SCHEMA_CHANGE
index 26ebeea76..db39c28d9 100644
--- a/SCHEMA_CHANGE
+++ b/SCHEMA_CHANGE
@@ -6,6 +6,7 @@ if the changes are something other than table and/or column additions:
 - README.1.5.X
 
 for new tables:
+- make sure the new tables are added to FS/FS/Schema.pm and run make install-perl-modules
 - run bin/generate-table-module tablename
 - edit the resulting FS/FS/table.pm
 
-- 
cgit v1.2.1


From 0e2bb254c0e5018b6b2a7766962319cd4137683f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 May 2006 15:03:00 +0000
Subject: add an agent pre-selection page to receivables report

---
 httemplate/index.html                     |  2 +-
 httemplate/search/report_receivables.html | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100755 httemplate/search/report_receivables.html

diff --git a/httemplate/index.html b/httemplate/index.html
index 4704ebe33..1a9293ecd 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -98,7 +98,7 @@
       <A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
       <BR><BR><A HREF="search/report_cust_credit.html">Credit report (by employee and/or date range)</A>
       <BR><BR><A HREF="graph/report_money_time.html">Sales, Credits and Receipts Summary</A>
-      <BR><BR><A HREF="search/report_receivables.cgi">Accounts Receivable Aging Summary</A>
+      <BR><BR><A HREF="search/report_receivables.html">Accounts Receivable Aging Summary</A>
       <BR><BR><A HREF="search/report_prepaid_income.html">Prepaid Income (Unearned Revenue) Report</A>
       <BR><BR><A HREF="search/report_tax.html">Sales Tax Liability Report</A>
       <BR><BR>
diff --git a/httemplate/search/report_receivables.html b/httemplate/search/report_receivables.html
new file mode 100755
index 000000000..fc5174116
--- /dev/null
+++ b/httemplate/search/report_receivables.html
@@ -0,0 +1,16 @@
+<%= include('/elements/header.html', 'Accounts Receivable Aging Summary' ) %>
+
+    <FORM ACTION="report_receivables.cgi" METHOD="GET">
+
+    <TABLE>
+
+     <%= include( '/elements/tr-select-agent.html' ) %>
+
+    </TABLE>
+
+    <BR><INPUT TYPE="submit" VALUE="Get Report">
+    </FORM>
+
+  </BODY>
+</HTML>
+
-- 
cgit v1.2.1


From 8e889ba1218905519bcd912ff6b84d0041860317 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 May 2006 15:23:03 +0000
Subject: yours!

---
 FS/FS/Pony.pm | 23 +++++++++++++++++++++++
 FS/MANIFEST   | 15 +++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 FS/FS/Pony.pm

diff --git a/FS/FS/Pony.pm b/FS/FS/Pony.pm
new file mode 100644
index 000000000..c37dd7855
--- /dev/null
+++ b/FS/FS/Pony.pm
@@ -0,0 +1,23 @@
+package FS::Pony;
+
+=head1 NAME
+
+FS::Pony - A pony
+
+=head1 SYNOPSYS
+
+use FS::Pony;  # <-- yours!
+
+=head1 DESCRIPTION
+
+We told you it came with a pony.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+http://420.am/~ivan/nopony.jpg
+
+=cut
+
+1;
diff --git a/FS/MANIFEST b/FS/MANIFEST
index a70be40e4..c309251ff 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -25,6 +25,7 @@ bin/freeside-sqlradius-radacctd
 bin/freeside-sqlradius-reset
 bin/freeside-sqlradius-seconds
 FS.pm
+FS/AccessRight.pm
 FS/CGI.pm
 FS/InitHandler.pm
 FS/ClientAPI.pm
@@ -46,6 +47,7 @@ FS/SearchCache.pm
 FS/UI/Web.pm
 FS/UID.pm
 FS/Msgcat.pm
+FS/Pony.pm
 FS/acct_snarf.pm
 FS/agent.pm
 FS/agent_type.pm
@@ -165,6 +167,7 @@ FS/clientapi_session.pm
 FS/clientapi_session_field.pm
 t/agent.t
 t/agent_type.t
+t/AccessRight.t
 t/CGI.t
 t/InitHandler.t
 t/ClientAPI.t
@@ -324,3 +327,15 @@ FS/inventory_item.pm
 t/inventory_item.t
 FS/cdr_upstream_rate.pm
 t/cdr_upstream_rate.t
+FS/access_user.pm
+t/access_user.t
+FS/access_user_pref.pm
+t/access_user_pref.t
+FS/access_group.pm
+t/access_group.t
+FS/access_usergroup.pm
+t/access_usergroup.t
+FS/access_groupagent.pm
+t/access_groupagent.t
+FS/access_right.pm
+t/access_right.t
-- 
cgit v1.2.1


From 29644d5921c99520965b884b25800ed084891e94 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 May 2006 09:47:31 +0000
Subject: pg 8.1 fix from Chris Cappuccio

---
 httemplate/search/report_receivables.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index d675346f0..1dd0fee86 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -110,7 +110,7 @@ END
     $owed_cols =~
       s/cust_bill\.custnum/cust_bill.custnum AND cust_main.agentnum = '$agentnum'/g;
   }
-  my $total_sql = "select $owed_cols";
+  my $total_sql = "select $owed_cols from cust_main";
   my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
   $total_sth->execute or die $total_sth->errstr;
   my $row = $total_sth->fetchrow_hashref();
-- 
cgit v1.2.1


From e65c6a26ca778166aec2b2d1dd3012ab84fa611a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 May 2006 20:27:21 +0000
Subject: first pass at sales reports per agent and package class

---
 README.1.7.0                                 |   1 +
 htetc/handler.pl                             |   2 +
 httemplate/docs/upgrade10.html               |   2 +-
 httemplate/elements/select-month_year.html   |  19 +++-
 httemplate/elements/select-pkg_class.html    |   7 +-
 httemplate/elements/select-table.html        |  11 +-
 httemplate/elements/tr-select-from_to.html   |  51 +++++++++
 httemplate/elements/tr-select-pkg_class.html |  15 +--
 httemplate/graph/cust_bill_pkg-graph.cgi     |  84 ++++++++++++++
 httemplate/graph/cust_bill_pkg.cgi           | 104 ++++++++++++++++++
 httemplate/graph/elements/monthly.html       | 157 +++++++++++++++++++++++++++
 httemplate/graph/money_time-graph.cgi        |  84 --------------
 httemplate/graph/money_time.cgi              |  97 ++++++-----------
 httemplate/graph/report_cust_bill_pkg.html   |  29 +++++
 httemplate/graph/report_money_time.html      |  58 ++--------
 15 files changed, 503 insertions(+), 218 deletions(-)
 create mode 100644 httemplate/elements/tr-select-from_to.html
 create mode 100755 httemplate/graph/cust_bill_pkg-graph.cgi
 create mode 100644 httemplate/graph/cust_bill_pkg.cgi
 create mode 100644 httemplate/graph/elements/monthly.html
 delete mode 100755 httemplate/graph/money_time-graph.cgi
 create mode 100644 httemplate/graph/report_cust_bill_pkg.html

diff --git a/README.1.7.0 b/README.1.7.0
index 62d6232c1..30f7ec7de 100644
--- a/README.1.7.0
+++ b/README.1.7.0
@@ -1,5 +1,6 @@
 
 install DBIx::DBSchema 0.31 (or later)
+install Color::Scheme
 
 make install-perl-modules
 run "freeside-upgrade username" to uprade your database schema
diff --git a/htetc/handler.pl b/htetc/handler.pl
index dcbe72733..e8cd3333b 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -113,6 +113,8 @@ sub handler
       use Business::CreditCard;
       use String::Approx qw(amatch);
       use Chart::LinesPoints;
+      use Chart::Mountain;
+      use Color::Scheme;
       use HTML::Widgets::SelectLayers 0.05;
       use Locale::Country;
       use FS;
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 8d90ab7a2..7cd1d8e50 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -31,7 +31,7 @@ Perl or Linux.
   <li>install NetAddr::IP, Chart::Base, Locale::SubCountry, Text::CSV_XS, 
 Spreadsheet::WriteExcel, IO-stringy (IO::Scalar), Frontier::RPC
 (Frontier::RPC2), MIME::Entity (MIME-tools), IPC::Run3, Net::Whois::Raw,
-JSON and Term::ReadKey
+JSON, Term::ReadKey and Color::Scheme
 <!-- and Crypt::YAPassGen-->
 
   <li>Apply the following changes to your database:
diff --git a/httemplate/elements/select-month_year.html b/httemplate/elements/select-month_year.html
index a0ea74ddd..2866960bd 100644
--- a/httemplate/elements/select-month_year.html
+++ b/httemplate/elements/select-month_year.html
@@ -5,13 +5,22 @@
   my $prefix = $opt{'prefix'} || '';
   my $disabled = $opt{'disabled'} || '';
   my $empty = $opt{'empty_option'} || '';
+  my $start_year = $opt{'start_year'};
+  my $end_year = $opt{'end_year'} || '2037';
+
+  my @mon;
+  if ( $opt{'show_month_abbr'} ) {
+    @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+  } else {
+    @mon = ( 1 .. 12 );
+  }
+
   my $date = $opt{'selected_date'} || '';
   $date = '' if $date eq '-';
   #$date ||= '01-2000' unless $empty;
-  my $start_year = $opt{'start_year'};
-  my $end_year = $opt{'end_year'} || '2037';
 
-  my( $mon, $year ) = (0, 0);
+  my $mon  = $opt{'selected_mon'}  || 0;
+  my $year = $opt{'selected_year'} || 0;
   if ( $date ) {
     if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
       ( $mon, $year ) = ( $2, $1 );
@@ -34,8 +43,8 @@
 
 <%= $empty ? '<OPTION VALUE="">' : '' %>
 
-<% for ( 1 .. 12 ) { %>
-   <OPTION<%= $_ == $mon ? ' SELECTED' : '' %> VALUE="<%= $_ %>"><%= $_ %>
+<% foreach ( 1 .. 12 ) { %>
+   <OPTION<%= $_ == $mon ? ' SELECTED' : '' %> VALUE="<%= $_ %>"><%= $mon[$_-1] %>
 <% } %>
 
 </SELECT>/<SELECT NAME="<%= $prefix %>_year" SIZE="1" <%= $disabled%>>
diff --git a/httemplate/elements/select-pkg_class.html b/httemplate/elements/select-pkg_class.html
index 5486e0877..032c7abda 100644
--- a/httemplate/elements/select-pkg_class.html
+++ b/httemplate/elements/select-pkg_class.html
@@ -1,16 +1,17 @@
 <%
   my( $classnum, %opt ) = @_;
 
-  my %select_opt = ();
-  $select_opt{'records'} = $opt{'pkg_class'}
+  $opt{'records'} = delete $opt{'pkg_class'}
     if $opt{'pkg_class'};
 
+  #warn "***** select-pkg-class: \n". Dumper(%opt);
+
 %><%= include( '/elements/select-table.html',
                  'table'       => 'pkg_class',
                  'name_col'    => 'classname',
                  'value'       => $classnum,
                  'empty_label' => '(none)',
                  #'hashref'     => { 'disabled' => '' },
-                 #%select_opt,
+                 %opt,
              )
 %>
diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html
index 10cc8b995..96f0177fb 100644
--- a/httemplate/elements/select-table.html
+++ b/httemplate/elements/select-table.html
@@ -11,9 +11,12 @@
   # 'empty_label' => '', #better specify it though, the default might change
   # 'hashref'     => {},
   # 'records'     => \@records, #instead of hashref
+  # 'pre_options' => [ 'value' => 'option' ], #before normal options
 
   my( %opt ) = @_;
 
+  #warn "***** select-table: \n". Dumper(%opt);
+
   my $key = dbdef->table($opt{'table'})->primary_key; #? $opt{'primary_key'} ||
 
   my $name_col = $opt{'name_col'};
@@ -25,11 +28,17 @@
     @records = qsearch( $opt{'table'}, ( $opt{'hashref'} || {} ) );
   }
 
+  my @pre_options = $opt{'pre_options'} ? @{ $opt{'pre_options'} } : ();
+
 %>
 
 <SELECT NAME="<%= $key %>">
 
-  <OPTION VALUE=""><%= $opt{'empty_label'} || 'all' %></OPTION>
+  <% while ( @pre_options ) { %>
+    <OPTION VALUE="<%= shift(@pre_options) %>"><%= shift(@pre_options) %>
+  <% } %>
+
+  <OPTION VALUE=""><%= $opt{'empty_label'} || 'all' %>
 
   <% foreach my $record ( sort { $a->$name_col() cmp $b->$name_col() }
                                @records
diff --git a/httemplate/elements/tr-select-from_to.html b/httemplate/elements/tr-select-from_to.html
new file mode 100644
index 000000000..d7e5a8337
--- /dev/null
+++ b/httemplate/elements/tr-select-from_to.html
@@ -0,0 +1,51 @@
+<%
+
+  #my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+  my ($curmon,$curyear) = (localtime(time))[4,5];
+  
+  #find first month
+  my $syear = 1899+$curyear;
+  my $smonth = $curmon+1;
+  
+  #want 12 month by default, not 13
+  $smonth++;
+  if ( $smonth > 12 ) { $smonth-=12; $syear++ }
+  
+  #find last month
+  my $eyear = 1900+$curyear;
+  my $emonth = $curmon+1;
+
+  my %hash = (
+    'show_month_abbr' => 1,
+    'start_year'      => '1999',
+    'end_year'        => '2012', #haha, well...
+     @_,
+  );
+
+%>
+
+<TR>
+  <TD ALIGN="right">From: </TD>
+  <TD>
+    <%= include('/elements/select-month_year.html',
+                  'prefix'        => 'start',
+                  'selected_mon'  => $smonth,
+                  'selected_year' => $syear,
+                  %hash,
+               )
+    %>
+  </TD>
+</TR>
+
+<TR>
+  <TD ALIGN="right">To: </TD>
+  <TD>
+    <%= include('/elements/select-month_year.html',
+                  'prefix'        => 'end',
+                  'selected_mon'  => $emonth,
+                  'selected_year' => $eyear,
+                  %hash,
+               )
+    %>
+  </TD>
+</TR>
diff --git a/httemplate/elements/tr-select-pkg_class.html b/httemplate/elements/tr-select-pkg_class.html
index de10885c8..fbab0db14 100644
--- a/httemplate/elements/tr-select-pkg_class.html
+++ b/httemplate/elements/tr-select-pkg_class.html
@@ -1,16 +1,12 @@
 <%
   my( $classnum, %opt ) = @_;
 
-  my @pkg_class;
-  if ( $opt{'pkg_class'} ) {
-    @pkg_class = @{ $opt{'pkg_class'} };
-  } else {
-    @pkg_class = qsearch( 'pkg_class', {} ); # { disabled=>'' } );
-  }
+  $opt{'pkg_class'} ||= [ qsearch( 'pkg_class', {} ) ]; # { disabled=>'' } )
 
+  #warn "***** tr-select-pkg-class: \n". Dumper(%opt);
 %>
 
-<% if ( scalar(@pkg_class) == 0 ) { %>
+<% if ( scalar(@{ $opt{'pkg_class'} }) == 0 ) { %>
 
   <INPUT TYPE="hidden" NAME="classnum" VALUE="">
 
@@ -19,10 +15,7 @@
   <TR>
     <TD ALIGN="right"><%= $opt{'label'} || 'Package class' %></TD>
     <TD>
-      <%= include( '/elements/select-pkg_class.html', $classnum,
-                     'pkg_class' => \@pkg_class,
-                 )
-      %>
+      <%= include( '/elements/select-pkg_class.html', $classnum, %opt ) %>
     </TD>
   </TR>
 
diff --git a/httemplate/graph/cust_bill_pkg-graph.cgi b/httemplate/graph/cust_bill_pkg-graph.cgi
new file mode 100755
index 000000000..637a3bf94
--- /dev/null
+++ b/httemplate/graph/cust_bill_pkg-graph.cgi
@@ -0,0 +1,84 @@
+<%
+
+#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+my ($curmon,$curyear) = (localtime(time))[4,5];
+
+#find first month
+my $syear = $cgi->param('syear') || 1899+$curyear;
+my $smonth = $cgi->param('smonth') || $curmon+1;
+
+#find last month
+my $eyear = $cgi->param('eyear') || 1900+$curyear;
+my $emonth = $cgi->param('emonth') || $curmon+1;
+#if ( $emonth++>12 ) { $emonth-=12; $eyear++; }
+
+# XXX or virtual
+my $agentnum = '';
+if ( $cgi->param('agentnum') =~ /^(\d*)$/ ) {
+  $agentnum = $1;
+}
+
+#my @labels;
+#my %data;
+
+my @items = qw( invoiced netsales credits payments receipts );
+if ( $cgi->param('12mo') == 1 ) {
+  @items = map $_.'_12mo', @items;
+}
+
+my %label = (
+ 'invoiced' => 'Gross Sales (invoiced)', 
+ 'netsales' => 'Net Sales (invoiced - applied credits)',
+ 'credits'  => 'Credits',
+ 'payments' => 'Gross Receipts (payments)',
+ 'receipts' => 'Net Receipts/Cashflow (payments - refunds)',
+);
+$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
+  foreach keys %label;
+
+my %color = (
+  'invoiced' => [ 153, 153, 255 ], #light blue
+  'netsales' => [   0,   0, 204 ], #blue
+  'credits'  => [ 204,   0,   0 ], #red
+  'payments' => [ 153, 204, 153 ], #light green
+  'receipts' => [   0, 204,   0 ], #green
+);
+$color{$_.'_12mo'} = $color{$_}
+  foreach keys %color;
+
+my $report = new FS::Report::Table::Monthly (
+  'items' => \@items,
+  'start_month' => $smonth,
+  'start_year'  => $syear,
+  'end_month'   => $emonth,
+  'end_year'    => $eyear,
+  'agentnum'    => $agentnum,
+);
+my %data = %{$report->data};
+
+#my $chart = Chart::LinesPoints->new(1024,480);
+#my $chart = Chart::LinesPoints->new(768,480);
+my $chart = Chart::LinesPoints->new(976,384);
+
+my $d = 0;
+$chart->set(
+  #'min_val' => 0,
+  'legend' => 'bottom',
+  'colors' => { ( map { 'dataset'.$d++ => $color{$_} } @items ),
+                #'grey_background' => [ 211, 211, 211 ],
+                'grey_background' => 'white',
+                'background' => [ 0xe8, 0xe8, 0xe8 ], #grey
+              },
+  #'grey_background' => 'false',
+  'legend_labels' => [ map { $label{$_} } @items ],
+  'brush_size' => 4,
+  #'pt_size' => 12,
+);
+
+my @data = map { $data{$_} } ( 'label', @items );
+
+http_header('Content-Type' => 'image/png' );
+
+$chart->_set_colors();
+
+%><%= $chart->scalar_png(\@data) %>
diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi
new file mode 100644
index 000000000..0dbd222ce
--- /dev/null
+++ b/httemplate/graph/cust_bill_pkg.cgi
@@ -0,0 +1,104 @@
+<%
+
+
+#find first month
+my $syear = $cgi->param('start_year'); # || 1899+$curyear;
+my $smonth = $cgi->param('start_month'); # || $curmon+1;
+
+#find last month
+my $eyear = $cgi->param('end_year'); # || 1900+$curyear;
+my $emonth = $cgi->param('end_month'); # || $curmon+1;
+
+#XXX or virtual
+my( $agentnum, $sel_agent ) = ('', '');
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  $agentnum = $1;
+  $sel_agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+  die "agentnum $agentnum not found!" unless $sel_agent;
+}
+my $title = $sel_agent ? $sel_agent->agent.' ' : '';
+
+my $classnum = 0;
+my @pkg_class = ();
+if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
+  $classnum = $1;
+  if ( $classnum ) {
+    @pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) );
+    die "classnum $classnum not found!" unless $pkg_class[0];
+    $title .= $pkg_class[0]->classname.' ';
+  } elsif ( $classnum eq '' ) {
+    $title .= 'Empty class ';
+    @pkg_class = ( '(empty class)' );
+  } elsif ( $classnum eq '0' ) {
+    @pkg_class = qsearch('pkg_class', {} ); # { 'disabled' => '' } );
+    push @pkg_class, '(empty class)';
+  }
+}
+
+my $hue = 0;
+my $hue_increment = 145;
+
+my @items = ();
+my @params = ();
+my @labels = ();
+my @colors = ();
+
+foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
+
+  my $col_scheme = Color::Scheme->new
+                     ->from_hue($hue)
+                     ->scheme('analogic')
+                   ;
+  my @recur_colors = ();
+  my @onetime_colors = ();
+
+  ### fixup the color handling for package classes...
+  my $n = 0;
+
+  foreach my $pkg_class ( @pkg_class ) {
+
+    push @items, 'cust_bill_pkg';
+
+
+    push @labels,
+      ( $sel_agent ? '' : $agent->agent.' ' ).
+      ( $classnum eq '0'
+          ? ( ref($pkg_class) ? $pkg_class->classname : $pkg_class ) 
+          : ''
+      );
+
+    # push some params
+    push @params,
+      [ 'classnum' => ( ref($pkg_class) ? $pkg_class->classnum : '' ) ];
+
+    @recur_colors = ($col_scheme->colors)[0,4,8,1,5,9]
+      unless @recur_colors;
+    @onetime_colors = ($col_scheme->colors)[2,6,10,3,7,11]
+      unless @onetime_colors;
+    push @colors, shift @recur_colors;
+
+  }
+
+  $hue += $hue_increment;
+
+}
+
+use Data::Dumper;
+warn Dumper(\@items);
+
+%><%= include('elements/monthly.html',
+                'title'        => $title. 'Sales Report',
+                'graph_type'   => 'Mountain',
+                'items'        => \@items,
+                'params'       => \@params,
+                'labels'       => \@labels,
+                'graph_labels' => \@labels,
+                'colors'       => \@colors,
+                #'links'        => \%link,
+                'start_month'  => $smonth,
+                'start_year'   => $syear,
+                'end_month'    => $emonth,
+                'end_year'     => $eyear,
+                'agentnum'     => $agentnum,
+             )
+%>
diff --git a/httemplate/graph/elements/monthly.html b/httemplate/graph/elements/monthly.html
new file mode 100644
index 000000000..c45113fa3
--- /dev/null
+++ b/httemplate/graph/elements/monthly.html
@@ -0,0 +1,157 @@
+<%
+
+  # options example...
+  #
+  # 'title'        => 'Page title',
+  # 'items'        => \@items,
+  # 'params'       => \@params, # opt,
+  # 'labels'       => \@labels, # or \%labels (keys are items)
+  # 'graph_labels' => \%graph_labels,
+  # 'colors'       => \%colors,
+  # 'links         => \%link, #opt
+  # 'start_month'  => $smonth,
+  # 'start_year'   => $syear,
+  # 'end_month'    => $emonth,
+  # 'end_year'     => $eyear,
+  # 'agentnum'     => $agentnum, #opt
+  # 'nototal'      => 1, #opt,
+  # 'graph_type'   => 'LinesPoints', #opt
+
+  my(%opt) = @_;
+  my @items = @{ $opt{'items'} };
+
+  #foreach my $other (qw( labels graph_labels colors links )) {
+  foreach my $other (qw( labels graph_labels colors )) {
+    if ( ref($opt{$other}) eq 'HASH' ) {
+      $opt{$other} = [ map $opt{$other}{$_}, @items ];
+    }
+  }
+
+  my $report = new FS::Report::Table::Monthly (
+    #'items'       => $opt{'items'},
+    'items'       => \@items,
+    'params'      => $opt{'params'},
+    'start_month' => $opt{'start_month'},
+    'start_year'  => $opt{'start_year'},
+    'end_month'   => $opt{'end_month'},
+    'end_year'    => $opt{'end_year'},
+    'agentnum'    => $opt{'agentnum'},
+  );
+  my $data = $report->data;
+
+  if ( $cgi->param('_type') =~ /^(png)$/ ) {
+
+    #my $chart = Chart::LinesPoints->new(1024,480);
+    #my $chart = Chart::LinesPoints->new(768,480);
+
+    my $graph_type = 'LinesPoints';
+    if ( $opt{'graph_type'} =~ /^(LinesPoints|Mountain)$/ ) {
+      $graph_type = $1;
+    }
+    my $class = "Chart::$graph_type";
+
+    my $chart = $class->new(976,384);
+    
+    my $d = 0;
+    $chart->set(
+      #'min_val' => 0,
+      'legend' => 'bottom',
+      'colors' => { ( 
+                      map { my $color = $_;
+                            'dataset'.$d++ =>
+                              [ map hex($_), unpack 'a2a2a2', $color ]
+                          }
+                          @{ $opt{'colors'} }
+                    ),
+                    #'grey_background' => [ 211, 211, 211 ],
+                    'grey_background' => 'white',
+                    'background' => [ 0xe8, 0xe8, 0xe8 ], #grey
+                  },
+      #'grey_background' => 'false',
+      'legend_labels' => $opt{'graph_labels'},
+      'brush_size' => 4,
+      #'pt_size' => 12,
+    );
+
+    #my @data = map { $data->{$_} } ( 'label', @items );
+    my @data = @{ $data->{data} };
+    unshift @data, $data->{'label'};
+    
+    http_header('Content-Type' => 'image/png' );
+
+    $chart->_set_colors();
+
+    %><%= $chart->scalar_png(\@data) %><%
+
+  } else {
+
+    my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+
+%><%= include('/elements/header.html', $opt{'title'} ) %>
+
+<% $cgi->param('_type', 'png'); %>
+<IMG SRC="<%= $cgi->self_url %>" WIDTH="976" HEIGHT="384">
+<BR>
+
+<%= table('e8e8e8') %>
+
+<TR>
+
+  <TD></TD>
+
+  <% foreach my $column ( @{$data->{label}} ) {
+       #$column =~ s/^(\d+)\//$mon[$1-1]<BR>/e;
+       $column =~ s/^(\d+)\//$mon[$1-1]<BR>/;
+  %>
+    <TH><%= $column %></TH>
+  <% } %>
+
+  <% unless ( $opt{'nototal'} ) { %>
+    <TH>Total</TH>
+  <% } %>
+
+</TR>
+
+<% foreach my $row (@items) {
+
+     my $color = shift( @{ $opt{'colors'} } );
+%>
+
+  <TR>
+
+    <TH><FONT COLOR="#<%= $color %>"><%= shift( @{ $opt{'labels'} } ) %></FONT></TH>
+
+    <% my $link = exists($opt{'links'}{$row})
+         ? qq(<A HREF="$opt{'links'}{$row})
+         : '';
+       my @speriod = @{$data->{speriod}};
+       my @eperiod = @{$data->{eperiod}};
+       my $total = 0;
+    %>
+    <% foreach my $column ( @{ shift( @{$data->{data}} ) } ) { # ( @{$data->{$row}} ) {
+    %>
+
+      <TD ALIGN="right" BGCOLOR="#ffffff">
+        <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %><FONT COLOR="#<%= $color %>">$<%= sprintf("%.2f", $column) %></FONT><%= $link ? '</A>' : '' %>
+      </TD>
+      <% $total += $column; %>
+
+    <% } %>
+
+    <% unless ( $opt{'nototal'} ) { %>
+
+      <TD ALIGN="right" BGCOLOR="#f5f6be">
+        <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{eperiod}}[-1]. '">' : '' %><FONT COLOR="#<%= $color %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
+      </TD>
+
+    <% } %>
+
+  </TR>
+
+<% } %>
+
+</TABLE>
+
+<%= include('/elements/footer.html') %>
+
+<% } %>
diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
deleted file mode 100755
index 637a3bf94..000000000
--- a/httemplate/graph/money_time-graph.cgi
+++ /dev/null
@@ -1,84 +0,0 @@
-<%
-
-#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-my ($curmon,$curyear) = (localtime(time))[4,5];
-
-#find first month
-my $syear = $cgi->param('syear') || 1899+$curyear;
-my $smonth = $cgi->param('smonth') || $curmon+1;
-
-#find last month
-my $eyear = $cgi->param('eyear') || 1900+$curyear;
-my $emonth = $cgi->param('emonth') || $curmon+1;
-#if ( $emonth++>12 ) { $emonth-=12; $eyear++; }
-
-# XXX or virtual
-my $agentnum = '';
-if ( $cgi->param('agentnum') =~ /^(\d*)$/ ) {
-  $agentnum = $1;
-}
-
-#my @labels;
-#my %data;
-
-my @items = qw( invoiced netsales credits payments receipts );
-if ( $cgi->param('12mo') == 1 ) {
-  @items = map $_.'_12mo', @items;
-}
-
-my %label = (
- 'invoiced' => 'Gross Sales (invoiced)', 
- 'netsales' => 'Net Sales (invoiced - applied credits)',
- 'credits'  => 'Credits',
- 'payments' => 'Gross Receipts (payments)',
- 'receipts' => 'Net Receipts/Cashflow (payments - refunds)',
-);
-$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
-  foreach keys %label;
-
-my %color = (
-  'invoiced' => [ 153, 153, 255 ], #light blue
-  'netsales' => [   0,   0, 204 ], #blue
-  'credits'  => [ 204,   0,   0 ], #red
-  'payments' => [ 153, 204, 153 ], #light green
-  'receipts' => [   0, 204,   0 ], #green
-);
-$color{$_.'_12mo'} = $color{$_}
-  foreach keys %color;
-
-my $report = new FS::Report::Table::Monthly (
-  'items' => \@items,
-  'start_month' => $smonth,
-  'start_year'  => $syear,
-  'end_month'   => $emonth,
-  'end_year'    => $eyear,
-  'agentnum'    => $agentnum,
-);
-my %data = %{$report->data};
-
-#my $chart = Chart::LinesPoints->new(1024,480);
-#my $chart = Chart::LinesPoints->new(768,480);
-my $chart = Chart::LinesPoints->new(976,384);
-
-my $d = 0;
-$chart->set(
-  #'min_val' => 0,
-  'legend' => 'bottom',
-  'colors' => { ( map { 'dataset'.$d++ => $color{$_} } @items ),
-                #'grey_background' => [ 211, 211, 211 ],
-                'grey_background' => 'white',
-                'background' => [ 0xe8, 0xe8, 0xe8 ], #grey
-              },
-  #'grey_background' => 'false',
-  'legend_labels' => [ map { $label{$_} } @items ],
-  'brush_size' => 4,
-  #'pt_size' => 12,
-);
-
-my @data = map { $data{$_} } ( 'label', @items );
-
-http_header('Content-Type' => 'image/png' );
-
-$chart->_set_colors();
-
-%><%= $chart->scalar_png(\@data) %>
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index 73f9d23a2..f085c2264 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,15 +1,12 @@
 <%
 
-#	#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-#	my ($curmon,$curyear) = (localtime(time))[4,5];
-
 #find first month
-my $syear = $cgi->param('syear'); # || 1899+$curyear;
-my $smonth = $cgi->param('smonth'); # || $curmon+1;
+my $syear = $cgi->param('start_year'); # || 1899+$curyear;
+my $smonth = $cgi->param('start_month'); # || $curmon+1;
 
 #find last month
-my $eyear = $cgi->param('eyear'); # || 1900+$curyear;
-my $emonth = $cgi->param('emonth'); # || $curmon+1;
+my $eyear = $cgi->param('end_year'); # || 1900+$curyear;
+my $emonth = $cgi->param('end_month'); # || $curmon+1;
 
 #XXX or virtual
 my( $agentnum, $agent ) = ('', '');
@@ -20,18 +17,6 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
 }
 my $agentname = $agent ? $agent->agent.' ' : '';
 
-%>
-<%= include('/elements/header.html',
-              $agentname. 'Sales, Credits and Receipts Summary'
-           )
-%>
-
-<IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="976" HEIGHT="384">
-<BR>
-
-<%= table('e8e8e8') %>
-<%
-
 my @items = qw( invoiced netsales credits payments receipts );
 if ( $cgi->param('12mo') == 1 ) {
   @items = map $_.'_12mo', @items;
@@ -44,9 +29,22 @@ my %label = (
   'payments' => 'Gross Receipts',
   'receipts' => 'Net Receipts',
 );
+
+my %graph_suffix = (
+ 'invoiced' => ' (invoiced)', 
+ 'netsales' => ' (invoiced - applied credits)',
+ 'credits'  => '',
+ 'payments' => ' (payments)',
+ 'receipts' => '/Cashflow (payments - refunds)',
+);
+my %graph_label = map { $_ => $label{$_}.$graph_suffix{$_} } keys %label;
+
 $label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
   foreach keys %label;
 
+$graph_label{$_.'_12mo'} = $graph_label{$_}. " (previous 12 months)"
+  foreach keys %graph_label;
+
 my %color = (
   'invoiced' => '9999ff', #light blue
   'netsales' => '0000cc', #blue
@@ -64,50 +62,19 @@ my %link = (
 );
 # XXX link 12mo?
 
-my $report = new FS::Report::Table::Monthly (
-  'items' => \@items,
-  'start_month' => $smonth,
-  'start_year'  => $syear,
-  'end_month'   => $emonth,
-  'end_year'    => $eyear,
-  'agentnum'    => $agentnum,
-);
-my $data = $report->data;
-
-my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
-
+%><%= include('elements/monthly.html',
+                'title'        => $agentname.
+                                  'Sales, Credits and Receipts Summary',
+                'items'        => \@items,
+                'labels'       => \%label,
+                'graph_labels' => \%graph_label,
+                'colors'       => \%color,
+                'links'        => \%link,
+                'start_month'  => $smonth,
+                'start_year'   => $syear,
+                'end_month'    => $emonth,
+                'end_year'     => $eyear,
+                'agentnum'     => $agentnum,
+                'nototal'      => scalar($cgi->param('12mo')),
+             )
 %>
-
-<TR><TD></TD>
-<% foreach my $column ( @{$data->{label}} ) {
-     #$column =~ s/^(\d+)\//$mon[$1-1]<BR>/e;
-     $column =~ s/^(\d+)\//$mon[$1-1]<BR>/;
-     %>
-     <TH><%= $column %></TH>
-<% } %>
-  <TH>Total</TH>
-</TR>
-
-<% foreach my $row (@items) { %>
-  <TR><TH><FONT COLOR="#<%= $color{$row} %>"><%= $label{$row} %></FONT></TH>
-  <% my $link = exists($link{$row})
-       ? qq(<A HREF="$link{$row})
-       : '';
-     my @speriod = @{$data->{speriod}};
-     my @eperiod = @{$data->{eperiod}};
-     my $total = 0;
-  %>
-  <% foreach my $column ( @{$data->{$row}} ) { %>
-    <TD ALIGN="right" BGCOLOR="#ffffff">
-      <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT><%= $link ? '</A>' : '' %>
-    </TD>
-    <% $total += $column; %>
-  <% } %>
-  <TD ALIGN="right" BGCOLOR="#f5f6be">
-    <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{eperiod}}[-1]. '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
-  </TD>
-  </TR>
-<% } %>
-</TABLE>
-
-<%= include('/elements/footer.html') %>
diff --git a/httemplate/graph/report_cust_bill_pkg.html b/httemplate/graph/report_cust_bill_pkg.html
new file mode 100644
index 000000000..4f29b761f
--- /dev/null
+++ b/httemplate/graph/report_cust_bill_pkg.html
@@ -0,0 +1,29 @@
+<%= include('/elements/header.html', 'Sales Report' ) %>
+
+<FORM ACTION="cust_bill_pkg.cgi" METHOD="GET">
+
+<TABLE>
+
+<%= include('/elements/tr-select-from_to.html' ) %>
+
+<%= include('/elements/tr-select-agent.html', 'label' => 'For agent: ' ) %>
+
+<%= include('/elements/tr-select-pkg_class.html', '',
+              'pre_options' => [ '0' => 'all' ],
+              'empty_label' => '(empty class)',
+           )
+%>
+
+<!--
+<TR>
+  <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="separate_0freq" VALUE="1"></TD>
+  <TD>Separate one-time vs. recurring sales</TD>
+</TR>
+-->
+
+</TABLE>
+
+<BR><INPUT TYPE="submit" VALUE="Display">
+</FORM>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/graph/report_money_time.html b/httemplate/graph/report_money_time.html
index 6c7e42716..564749686 100644
--- a/httemplate/graph/report_money_time.html
+++ b/httemplate/graph/report_money_time.html
@@ -1,23 +1,3 @@
-<%
-
-#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-my ($curmon,$curyear) = (localtime(time))[4,5];
-
-#find first month
-my $syear = 1899+$curyear;
-my $smonth = $curmon+1;
-
-#want 12 month by default, not 13
-$smonth++;
-if ( $smonth > 12 ) { $smonth-=12; $syear++ }
-
-#find last month
-my $eyear = 1900+$curyear;
-my $emonth = $curmon+1;
-
-my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
-
-%>
 <%= include('/elements/header.html', 'Sales, Credits and Receipts Summary' ) %>
 
 <FORM ACTION="money_time.cgi" METHOD="GET">
@@ -34,38 +14,20 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 <BR>
 -->
 
-From: <SELECT NAME="smonth">
-<% foreach my $mon ( 1..12 ) { %>
-<OPTION VALUE="<%= $mon %>"<%= $mon == $smonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
-<% } %>
-</SELECT>
-<SELECT NAME="syear">
-<% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"<%= $y == $syear ? ' SELECTED' : '' %>><%= $y %>
-<% } %>
-</SELECT>
-<BR>
+<TABLE>
 
-To: <SELECT NAME="emonth">
-<% foreach my $mon ( 1..12 ) { %>
-<OPTION VALUE="<%= $mon %>"<%= $mon == $emonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
-<% } %>
-</SELECT>
-<SELECT NAME="eyear">
-<% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"<%= $y == $eyear ? ' SELECTED' : '' %>><%= $y %>
-<% } %>
-</SELECT>
-<BR>
+<%= include('/elements/tr-select-from_to.html' ) %>
 
-For agent: <%= include('/elements/select-agent.html' ) %>
-<BR>
+<%= include('/elements/tr-select-agent.html', '', 'label' => 'For agent: ' ) %>
 
-<INPUT TYPE="checkbox" NAME="12mo" VALUE="1"> Show 12 month totals instead of monthly values.
-<BR>
+<TR>
+  <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="12mo" VALUE="1"></TD>
+  <TD>Show 12 month totals instead of monthly values</TD>
+</TR>
+
+</TABLE>
 
-<INPUT TYPE="submit" VALUE="Display">
+<BR><INPUT TYPE="submit" VALUE="Display">
 </FORM>
 
 <%= include('/elements/footer.html') %>
-
-- 
cgit v1.2.1


From 896ef9b1a5302dc2d96d351702be94184825cc91 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 May 2006 10:01:54 +0000
Subject: sales report per agent and package class looks good

---
 FS/FS/Report/Table/Monthly.pm            | 89 ++++++++++++++++++++++++++++-
 httemplate/graph/cust_bill_pkg-graph.cgi | 84 ---------------------------
 httemplate/graph/cust_bill_pkg.cgi       | 32 +++++++----
 httemplate/graph/elements/monthly.html   | 97 ++++++++++++++++++++++++--------
 httemplate/index.html                    |  5 +-
 httemplate/search/cust_bill_pkg.cgi      | 16 ++++--
 6 files changed, 198 insertions(+), 125 deletions(-)
 delete mode 100755 httemplate/graph/cust_bill_pkg-graph.cgi

diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index e7f05e5f2..1b7e93aba 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -24,6 +24,11 @@ FS::Report::Table::Monthly - Tables of report data, indexed monthly
     'start_year'  => 2000,
     'end_month'   => 4,
     'end_year'    => 2020,
+    #opt
+    'agentnum'    => 54
+    'params'      => [ [ 'paramsfor', 'item_one' ], [ 'item', 'two' ] ], # ...
+    'remove_empty' => 1, #collapse empty rows, default 0
+    'item_labels' => [ ], #useful with remove_empty
   );
 
   my $data = $report->data;
@@ -41,6 +46,9 @@ Returns a hashref of data (!! describe)
 sub data {
   my $self = shift;
 
+  #use Data::Dumper;
+  #warn Dumper($self);
+
   my $smonth = $self->{'start_month'};
   my $syear = $self->{'start_year'};
   my $emonth = $self->{'end_month'};
@@ -59,24 +67,75 @@ sub data {
     my $eperiod = timelocal(0,0,0,1,$smonth-1,$syear);
     push @{$data{eperiod}}, $eperiod;
   
+    my $col = 0;
+    my @row = ();
+    foreach my $item ( @{$self->{'items'}} ) {
+      my @param = $self->{'params'} ? @{ $self->{'params'}[$col] }: ();
+      my $value = $self->$item($speriod, $eperiod, $agentnum, @param);
+      #push @{$data{$item}}, $value;
+      push @{$data{data}->[$col++]}, $value;
+    }
+
+  }
+
+  #these need to get generalized, sheesh
+  $data{'items'}       = $self->{'items'};
+  $data{'item_labels'} = $self->{'item_labels'} || $self->{'items'};
+  $data{'colors'}      = $self->{'colors'};
+  $data{'links'}       = $self->{'links'} || [];
+
+  #use Data::Dumper;
+  #warn Dumper(\%data);
+
+  if ( $self->{'remove_empty'} ) {
+
+    #warn "removing empty rows\n";
+
+    my $col = 0;
+    #these need to get generalized, sheesh
+    my @newitems = ();
+    my @newlabels = ();
+    my @newdata = ();
+    my @newcolors = ();
+    my @newlinks = ();
     foreach my $item ( @{$self->{'items'}} ) {
-      push @{$data{$item}}, $self->$item($speriod, $eperiod, $agentnum);
+
+      if ( grep { $_ != 0 } @{$data{'data'}->[$col]} ) {
+        push @newitems,  $data{'items'}->[$col];
+        push @newlabels, $data{'item_labels'}->[$col];
+        push @newdata,   $data{'data'}->[$col];
+        push @newcolors, $data{'colors'}->[$col];
+        push @newlinks,  $data{'links'}->[$col];
+      }
+
+      $col++;
     }
 
+    $data{'items'}       = \@newitems;
+    $data{'item_labels'} = \@newlabels;
+    $data{'data'}        = \@newdata;
+    $data{'colors'}      = \@newcolors;
+    $data{'links'}       = \@newlinks;
+
   }
 
+  #use Data::Dumper;
+  #warn Dumper(\%data);
+
   \%data;
 
 }
 
 sub invoiced { #invoiced
   my( $self, $speriod, $eperiod, $agentnum ) = @_;
+
   $self->scalar_sql("
     SELECT SUM(charged)
       FROM cust_bill
         LEFT JOIN cust_main USING ( custnum )
       WHERE ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum)
   );
+  
 }
 
 sub netsales { #net sales
@@ -197,6 +256,34 @@ sub _subtract_11mo {
   timelocal($sec,$min,$hour,$mday,$mon,$year);
 }
 
+sub cust_bill_pkg {
+  my( $self, $speriod, $eperiod, $agentnum, %opt ) = @_;
+
+  my $where = '';
+  if ( $opt{'classnum'} =~ /^(\d+)$/ ) {
+    if ( $1 == 0 ) {
+      $where = "classnum IS NULL";
+    } else {
+      $where = "classnum = $1";
+    }
+  }
+
+  $agentnum ||= $opt{'agentnum'};
+
+  $self->scalar_sql("
+    SELECT SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)
+      FROM cust_bill_pkg
+        LEFT JOIN cust_bill USING ( invnum )
+        LEFT JOIN cust_main USING ( custnum )
+        LEFT JOIN cust_pkg USING ( pkgnum )
+        LEFT JOIN part_pkg USING ( pkgpart )
+      WHERE pkgnum != 0
+        AND $where
+        AND ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum)
+  );
+  
+}
+
 # NEEDS TO BE AGENTNUM-capable
 sub canceled { #active
   my( $self, $speriod, $eperiod, $agentnum ) = @_;
diff --git a/httemplate/graph/cust_bill_pkg-graph.cgi b/httemplate/graph/cust_bill_pkg-graph.cgi
deleted file mode 100755
index 637a3bf94..000000000
--- a/httemplate/graph/cust_bill_pkg-graph.cgi
+++ /dev/null
@@ -1,84 +0,0 @@
-<%
-
-#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-my ($curmon,$curyear) = (localtime(time))[4,5];
-
-#find first month
-my $syear = $cgi->param('syear') || 1899+$curyear;
-my $smonth = $cgi->param('smonth') || $curmon+1;
-
-#find last month
-my $eyear = $cgi->param('eyear') || 1900+$curyear;
-my $emonth = $cgi->param('emonth') || $curmon+1;
-#if ( $emonth++>12 ) { $emonth-=12; $eyear++; }
-
-# XXX or virtual
-my $agentnum = '';
-if ( $cgi->param('agentnum') =~ /^(\d*)$/ ) {
-  $agentnum = $1;
-}
-
-#my @labels;
-#my %data;
-
-my @items = qw( invoiced netsales credits payments receipts );
-if ( $cgi->param('12mo') == 1 ) {
-  @items = map $_.'_12mo', @items;
-}
-
-my %label = (
- 'invoiced' => 'Gross Sales (invoiced)', 
- 'netsales' => 'Net Sales (invoiced - applied credits)',
- 'credits'  => 'Credits',
- 'payments' => 'Gross Receipts (payments)',
- 'receipts' => 'Net Receipts/Cashflow (payments - refunds)',
-);
-$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
-  foreach keys %label;
-
-my %color = (
-  'invoiced' => [ 153, 153, 255 ], #light blue
-  'netsales' => [   0,   0, 204 ], #blue
-  'credits'  => [ 204,   0,   0 ], #red
-  'payments' => [ 153, 204, 153 ], #light green
-  'receipts' => [   0, 204,   0 ], #green
-);
-$color{$_.'_12mo'} = $color{$_}
-  foreach keys %color;
-
-my $report = new FS::Report::Table::Monthly (
-  'items' => \@items,
-  'start_month' => $smonth,
-  'start_year'  => $syear,
-  'end_month'   => $emonth,
-  'end_year'    => $eyear,
-  'agentnum'    => $agentnum,
-);
-my %data = %{$report->data};
-
-#my $chart = Chart::LinesPoints->new(1024,480);
-#my $chart = Chart::LinesPoints->new(768,480);
-my $chart = Chart::LinesPoints->new(976,384);
-
-my $d = 0;
-$chart->set(
-  #'min_val' => 0,
-  'legend' => 'bottom',
-  'colors' => { ( map { 'dataset'.$d++ => $color{$_} } @items ),
-                #'grey_background' => [ 211, 211, 211 ],
-                'grey_background' => 'white',
-                'background' => [ 0xe8, 0xe8, 0xe8 ], #grey
-              },
-  #'grey_background' => 'false',
-  'legend_labels' => [ map { $label{$_} } @items ],
-  'brush_size' => 4,
-  #'pt_size' => 12,
-);
-
-my @data = map { $data{$_} } ( 'label', @items );
-
-http_header('Content-Type' => 'image/png' );
-
-$chart->_set_colors();
-
-%><%= $chart->scalar_png(\@data) %>
diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi
index 0dbd222ce..cb8225516 100644
--- a/httemplate/graph/cust_bill_pkg.cgi
+++ b/httemplate/graph/cust_bill_pkg.cgi
@@ -36,17 +36,22 @@ if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
 }
 
 my $hue = 0;
-my $hue_increment = 145;
+#my $hue_increment = 170;
+#my $hue_increment = 145;
+my $hue_increment = 125;
 
-my @items = ();
+my @items  = ();
 my @params = ();
 my @labels = ();
 my @colors = ();
+my @links  = ();
+
+my $link = "${p}search/cust_bill_pkg.cgi?nottax=1;include_comp_cust=1";
 
 foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
 
   my $col_scheme = Color::Scheme->new
-                     ->from_hue($hue)
+                     ->from_hue($hue) #->from_hex($agent->color)
                      ->scheme('analogic')
                    ;
   my @recur_colors = ();
@@ -67,9 +72,13 @@ foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
           : ''
       );
 
-    # push some params
-    push @params,
-      [ 'classnum' => ( ref($pkg_class) ? $pkg_class->classnum : '' ) ];
+    my $row_classnum = ref($pkg_class) ? $pkg_class->classnum : 0;
+    my $row_agentnum = $agent->agentnum;
+    push @params, [ 'classnum' => $row_classnum,
+                    'agentnum' => $row_agentnum,
+                  ];
+
+    push @links, "$link;agentnum=$row_agentnum;classnum=$row_classnum;";
 
     @recur_colors = ($col_scheme->colors)[0,4,8,1,5,9]
       unless @recur_colors;
@@ -83,18 +92,21 @@ foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
 
 }
 
-use Data::Dumper;
-warn Dumper(\@items);
+#use Data::Dumper;
+#warn Dumper(\@items);
 
 %><%= include('elements/monthly.html',
-                'title'        => $title. 'Sales Report',
+                'title'        => $title. 'Sales Report (Gross)',
                 'graph_type'   => 'Mountain',
                 'items'        => \@items,
                 'params'       => \@params,
                 'labels'       => \@labels,
                 'graph_labels' => \@labels,
                 'colors'       => \@colors,
-                #'links'        => \%link,
+                'links'        => \@links,
+                'remove_empty' => 1,
+                'bottom_total' => 1,
+                'bottom_link'  => "$link;",
                 'start_month'  => $smonth,
                 'start_year'   => $syear,
                 'end_month'    => $emonth,
diff --git a/httemplate/graph/elements/monthly.html b/httemplate/graph/elements/monthly.html
index c45113fa3..3b9f73aa1 100644
--- a/httemplate/graph/elements/monthly.html
+++ b/httemplate/graph/elements/monthly.html
@@ -5,10 +5,10 @@
   # 'title'        => 'Page title',
   # 'items'        => \@items,
   # 'params'       => \@params, # opt,
-  # 'labels'       => \@labels, # or \%labels (keys are items)
-  # 'graph_labels' => \%graph_labels,
-  # 'colors'       => \%colors,
-  # 'links         => \%link, #opt
+  # 'labels'       => \@labels,       # or \%labels (keys are items)
+  # 'graph_labels' => \@graph_labels, # or \%graph_labels,
+  # 'colors'       => \@colors,       # or \%colors,
+  # 'links         => \@links,        # or \%link, #opt
   # 'start_month'  => $smonth,
   # 'start_year'   => $syear,
   # 'end_month'    => $emonth,
@@ -16,26 +16,38 @@
   # 'agentnum'     => $agentnum, #opt
   # 'nototal'      => 1, #opt,
   # 'graph_type'   => 'LinesPoints', #opt
+  # 'remove_empty' => 1, #opt,
+  # 'bottom_total' => 1, #opt,
 
   my(%opt) = @_;
   my @items = @{ $opt{'items'} };
 
-  #foreach my $other (qw( labels graph_labels colors links )) {
-  foreach my $other (qw( labels graph_labels colors )) {
+  foreach my $other (qw( labels graph_labels colors links )) {
+  #foreach my $other (qw( labels graph_labels colors )) {
     if ( ref($opt{$other}) eq 'HASH' ) {
       $opt{$other} = [ map $opt{$other}{$_}, @items ];
     }
   }
 
   my $report = new FS::Report::Table::Monthly (
+
     #'items'       => $opt{'items'},
-    'items'       => \@items,
-    'params'      => $opt{'params'},
-    'start_month' => $opt{'start_month'},
-    'start_year'  => $opt{'start_year'},
-    'end_month'   => $opt{'end_month'},
-    'end_year'    => $opt{'end_year'},
-    'agentnum'    => $opt{'agentnum'},
+    'items'        => \@items,
+    'params'       => $opt{'params'},
+    'item_labels'  => ( $cgi->param('_type') =~ /^(png)$/
+                          ? $opt{'graph_labels'}
+                          : $opt{'labels'}
+                      ),
+    'colors'       => $opt{'colors'},
+    'links'        => $opt{'links'},
+
+    'start_month'  => $opt{'start_month'},
+    'start_year'   => $opt{'start_year'},
+    'end_month'    => $opt{'end_month'},
+    'end_year'     => $opt{'end_year'},
+
+    'agentnum'     => $opt{'agentnum'},
+    'remove_empty' => $opt{'remove_empty'},
   );
   my $data = $report->data;
 
@@ -61,14 +73,15 @@
                             'dataset'.$d++ =>
                               [ map hex($_), unpack 'a2a2a2', $color ]
                           }
-                          @{ $opt{'colors'} }
+                          #@{ $opt{'colors'} }
+                          @{ $data->{'colors'} }
                     ),
                     #'grey_background' => [ 211, 211, 211 ],
                     'grey_background' => 'white',
                     'background' => [ 0xe8, 0xe8, 0xe8 ], #grey
                   },
       #'grey_background' => 'false',
-      'legend_labels' => $opt{'graph_labels'},
+      'legend_labels' => $data->{'item_labels'},
       'brush_size' => 4,
       #'pt_size' => 12,
     );
@@ -112,36 +125,72 @@
 
 </TR>
 
-<% foreach my $row (@items) {
+<% my @bottom_total = ();
+   foreach my $row ( @{ $data->{'items'} } ) {
 
-     my $color = shift( @{ $opt{'colors'} } );
+     #my $color = shift( @{ $opt{'colors'} } );
+     my $color = shift( @{ $data->{'colors'} } );
+     my $link = shift( @{ $data->{'links'} } );
+     $link = $link ? qq(<A HREF="$link) : '';
 %>
 
   <TR>
 
-    <TH><FONT COLOR="#<%= $color %>"><%= shift( @{ $opt{'labels'} } ) %></FONT></TH>
+    <TH><FONT COLOR="#<%= $color %>"><%= shift( @{ $data->{'item_labels'} } ) %></FONT></TH>
 
-    <% my $link = exists($opt{'links'}{$row})
-         ? qq(<A HREF="$opt{'links'}{$row})
-         : '';
+    <% #my $link = exists($opt{'links'}{$row})
+       #  ? qq(<A HREF="$opt{'links'}{$row})
+       #  : '';
        my @speriod = @{$data->{speriod}};
        my @eperiod = @{$data->{eperiod}};
        my $total = 0;
     %>
-    <% foreach my $column ( @{ shift( @{$data->{data}} ) } ) { # ( @{$data->{$row}} ) {
+    <% my $col = 0;
+       foreach my $column ( @{ shift( @{$data->{data}} ) } ) { # ( @{$data->{$row}} ) {
     %>
 
       <TD ALIGN="right" BGCOLOR="#ffffff">
         <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %><FONT COLOR="#<%= $color %>">$<%= sprintf("%.2f", $column) %></FONT><%= $link ? '</A>' : '' %>
       </TD>
-      <% $total += $column; %>
+      <%
+         $total += $column;
+         $bottom_total[$col++] += $column;
+      %>
 
     <% } %>
 
     <% unless ( $opt{'nototal'} ) { %>
 
       <TD ALIGN="right" BGCOLOR="#f5f6be">
-        <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{eperiod}}[-1]. '">' : '' %><FONT COLOR="#<%= $color %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
+        <%= $link ? $link. 'begin='. ${$data->{speriod}}[0]. ';end='. ${$data->{eperiod}}[-1]. '">' : '' %><FONT COLOR="#<%= $color %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
+      </TD>
+
+      <% $bottom_total[$col++] += $total; %>
+
+    <% } %>
+
+  </TR>
+
+<% } %>
+
+<% if ( $opt{'bottom_total'} ) {
+     my @speriod = ( @{$data->{speriod}}, ${$data->{speriod}}[0] );
+     my @eperiod = ( @{$data->{eperiod}}, ${$data->{eperiod}}[-1] );
+%>
+
+  <TR>
+    <TH>Total</TH>
+
+    <% foreach my $total ( @bottom_total ) { %>
+
+      <TD ALIGN="right" BGCOLOR="#f5f6be">
+        <%= $opt{'bottom_link'}
+              ? '<A HREF="'. $opt{'bottom_link'}.
+                'begin='. shift(@speriod).
+                ';end='. shift(@eperiod). '">'
+              : ''
+        %>$<%= sprintf("%.2f", $total) %><%= $opt{'bottom_link'} ? '</A>' : '' %>
+
       </TD>
 
     <% } %>
diff --git a/httemplate/index.html b/httemplate/index.html
index 1a9293ecd..c8a46d08f 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -95,9 +95,10 @@
               <LI><a href="search/cust_bill_event.html">All invoice events for a date range</a>
               <LI><a href="search/cust_bill_event.html?failed=1">Invoice event errors for a date range (failed credit cards, processor or printer problems, etc.)</a>
             </UL>
-      <A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
+      <A HREF="graph/report_money_time.html">Sales, Credits and Receipts Summary</A>
+      <BR><BR><A HREF="graph/report_cust_bill_pkg.html">Sales report (by agent, package class and/or date range)</A>
       <BR><BR><A HREF="search/report_cust_credit.html">Credit report (by employee and/or date range)</A>
-      <BR><BR><A HREF="graph/report_money_time.html">Sales, Credits and Receipts Summary</A>
+      <BR><BR><A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
       <BR><BR><A HREF="search/report_receivables.html">Accounts Receivable Aging Summary</A>
       <BR><BR><A HREF="search/report_prepaid_income.html">Prepaid Income (Unearned Revenue) Report</A>
       <BR><BR><A HREF="search/report_tax.html">Sales Tax Liability Report</A>
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index cc0f97536..4779071a4 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -12,15 +12,23 @@ my $join_pkg = "
     LEFT JOIN part_pkg USING ( pkgpart )
 ";
 
-my $where = "
-  WHERE _date >= $beginning AND _date <= $ending
-    AND payby != 'COMP'
-";
+my $where = " WHERE _date >= $beginning AND _date <= $ending ";
+
+$where .= " AND payby != 'COMP' "
+  unless $cgi->param('include_comp_cust');
 
 if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
   $where .= " AND agentnum = $1 ";
 }
 
+if ( $cgi->param('classnum') =~ /^(\d+)$/ ) {
+  if ( $1 == 0 ) {
+    $where .= " AND classnum IS NULL ";
+  } else {
+    $where .= " AND classnum = $1 ";
+  }
+}
+
 if ( $cgi->param('out') ) {
 
   $where .= "
-- 
cgit v1.2.1


From c363307c1af959dce2ab4821ff5dfa697e3f0e19 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 May 2006 11:28:52 +0000
Subject: add config switch to base tax off shipping address if present

---
 FS/FS/Conf.pm                    |   7 +++
 FS/FS/cust_main.pm               |  39 +++++++-------
 httemplate/search/report_tax.cgi | 107 ++++++++++++++++++++++++++++++++-------
 3 files changed, 115 insertions(+), 38 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 21e752867..e7b9fa556 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1702,6 +1702,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'tax-ship_address',
+    'section'     => 'billing',
+    'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the shipping address instead.  Note: Tax reports can take a long time when enabled.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 298c01dee..65ccb343b 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1805,29 +1805,26 @@ sub bill {
 
         unless ( $self->tax =~ /Y/i || $self->payby eq 'COMP' ) {
 
-          my @taxes = qsearch( 'cust_main_county', {
-                                 'state'    => $self->state,
-                                 'county'   => $self->county,
-                                 'country'  => $self->country,
-                                 'taxclass' => $part_pkg->taxclass,
-                                                                      } );
+          my $prefix = 
+            ( $conf->exists('tax-ship_address') && length($self->ship_last) )
+            ? 'ship_'
+            : '';
+          my %taxhash = map { $_ => $self->get("$prefix$_") }
+                            qw( state county country );
+
+          $taxhash{'taxclass'} = $part_pkg->taxclass;
+
+          my @taxes = qsearch( 'cust_main_county', \%taxhash );
+
           unless ( @taxes ) {
-            @taxes =  qsearch( 'cust_main_county', {
-                                  'state'    => $self->state,
-                                  'county'   => $self->county,
-                                  'country'  => $self->country,
-                                  'taxclass' => '',
-                                                                      } );
+            $taxhash{'taxclass'} = '';
+            @taxes =  qsearch( 'cust_main_county', \%taxhash );
           }
 
           #one more try at a whole-country tax rate
           unless ( @taxes ) {
-            @taxes =  qsearch( 'cust_main_county', {
-                                  'state'    => '',
-                                  'county'   => '',
-                                  'country'  => $self->country,
-                                  'taxclass' => '',
-                                                                      } );
+            $taxhash{$_} = '' foreach qw( state county );
+            @taxes =  qsearch( 'cust_main_county', \%taxhash );
           }
 
           # maybe eliminate this entirely, along with all the 0% records
@@ -1835,8 +1832,10 @@ sub bill {
             $dbh->rollback if $oldAutoCommit;
             return
               "fatal: can't find tax rate for state/county/country/taxclass ".
-              join('/', ( map $self->$_(), qw(state county country) ),
-                        $part_pkg->taxclass ).  "\n";
+              join('/', ( map $self->get("$prefix$_"),
+                              qw(state county country)
+                        ),
+                        $part_pkg->taxclass ). "\n";
           }
   
           foreach my $tax ( @taxes ) {
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 0f33c4676..1b6f40b8a 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -19,14 +19,38 @@ my $join_pkg = "
     LEFT JOIN cust_pkg USING ( pkgnum )
     LEFT JOIN part_pkg USING ( pkgpart )
 ";
-my $where = "
-  WHERE _date >= $beginning AND _date <= $ending
-    AND ( county  = ? OR ? = '' )
-    AND ( state   = ? OR ? = '' )
-    AND   country = ?
-";
-#    AND payby != 'COMP'
+
+my $where = "WHERE _date >= $beginning AND _date <= $ending ";
 my @base_param = qw( county county state state country );
+if ( $conf->exists('tax-ship_address') ) {
+
+  $where .= "
+      AND (    (     ( ship_last IS NULL     OR  ship_last  = '' )
+                 AND ( county       = ? OR ? = '' )
+                 AND ( state        = ? OR ? = '' )
+                 AND   country      = ?
+               )
+            OR (       ship_last IS NOT NULL AND ship_last != ''
+                 AND ( ship_county  = ? OR ? = '' )
+                 AND ( ship_state   = ? OR ? = '' )
+                 AND   ship_country = ?
+               )
+          )
+  ";
+  #    AND payby != 'COMP'
+
+  push @base_param, @base_param;
+
+} else {
+
+  $where .= "
+      AND ( county  = ? OR ? = '' )
+      AND ( state   = ? OR ? = '' )
+      AND   country = ?
+  ";
+  #    AND payby != 'COMP'
+
+}
 
 my $agentname = '';
 if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
@@ -38,16 +62,63 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
 
 my $gotcust = "
   WHERE 0 < ( SELECT COUNT(*) FROM cust_main
-              WHERE ( cust_main.county  = cust_main_county.county
-                      OR cust_main_county.county = ''
-                      OR cust_main_county.county IS NULL )
-                AND ( cust_main.state   = cust_main_county.state
-                      OR cust_main_county.state = ''
-                      OR cust_main_county.state IS NULL )
-                AND ( cust_main.country = cust_main_county.country )
-              LIMIT 1
-            )
 ";
+if ( $conf->exists('tax-ship_address') ) {
+
+  $gotcust .= "
+                WHERE
+
+                (    cust_main_county.country = cust_main.country
+                  OR cust_main_county.country = cust_main.ship_country
+                )
+
+                AND
+
+                ( 
+
+                  (     ( ship_last IS NULL     OR  ship_last = '' )
+                    AND (    cust_main_county.country = cust_main.country )
+                    AND (    cust_main_county.state = cust_main.state
+                          OR cust_main_county.state = ''
+                          OR cust_main_county.state IS NULL )
+                    AND (    cust_main_county.county = cust_main.county
+                          OR cust_main_county.county = ''
+                          OR cust_main_county.county IS NULL )
+                  )
+  
+                  OR
+  
+                  (       ship_last IS NOT NULL AND ship_last != ''
+                    AND (    cust_main_county.country = cust_main.ship_country )
+                    AND (    cust_main_county.state = cust_main.ship_state
+                          OR cust_main_county.state = ''
+                          OR cust_main_county.state IS NULL )
+                    AND (    cust_main_county.county = cust_main.ship_county
+                          OR cust_main_county.county = ''
+                          OR cust_main_county.county IS NULL )
+                  )
+
+                )
+
+                LIMIT 1
+            )
+  ";
+
+} else {
+
+  $gotcust .= "
+                WHERE ( cust_main.county  = cust_main_county.county
+                        OR cust_main_county.county = ''
+                        OR cust_main_county.county IS NULL )
+                  AND ( cust_main.state   = cust_main_county.state
+                        OR cust_main_county.state = ''
+                        OR cust_main_county.state IS NULL )
+                  AND ( cust_main.country = cust_main_county.country )
+                LIMIT 1
+            )
+  ";
+
+}
 
 my($total, $tot_taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 );
 my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0 );
@@ -190,8 +261,8 @@ foreach my $r (
 
   my $label = getlabel($r);
 
-  my $fromwhere = $join_pkg. $where. " AND payby != 'COMP' ";
-  my @param = @base_param; 
+  #my $fromwhere = $join_pkg. $where. " AND payby != 'COMP' ";
+  #my @param = @base_param; 
 
   #match itemdesc if necessary!
   my $named_tax =
-- 
cgit v1.2.1


From 82653831d2e5a02f0f074b3c3f11c63cc67d3944 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 May 2006 11:48:32 +0000
Subject: suggest "make clean" on upgrade - something is not quite right with
 perl Makefile hoohaw

---
 README.1.5.8 | 3 +++
 README.1.7.0 | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.1.5.8 b/README.1.5.8
index cf414545e..6ad19b063 100644
--- a/README.1.5.8
+++ b/README.1.5.8
@@ -54,3 +54,6 @@ Installs w/integrated RT:
 make install-docs
  (or "make deploy" if you've got everything setup in the Makefile)
 
+(errors?  try "make clean" then "make install-perl-modules", then
+ "make install-docs" or "make deploy" again)
+
diff --git a/README.1.7.0 b/README.1.7.0
index 30f7ec7de..992a988c8 100644
--- a/README.1.7.0
+++ b/README.1.7.0
@@ -22,3 +22,6 @@ CREATE INDEX cust_main17 on cust_main ( ship_zip );
 make install-docs
  (or "make deploy" if you've got everything setup in the Makefile)
 
+(errors?  try "make clean" then "make install-perl-modules", then
+ "make install-docs" or "make deploy" again)
+
-- 
cgit v1.2.1


From 3059dc3cfe6fa7280c40f64e598fc05f37ffa96f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 May 2006 13:57:23 +0000
Subject: Pg 8.1 fix was incorrect and broke things, this should actually work

---
 httemplate/search/report_receivables.cgi | 113 +++++++++++++++----------------
 1 file changed, 53 insertions(+), 60 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 1dd0fee86..ac94e1a5c 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -1,6 +1,38 @@
 <%
 
-  my $charged = <<END;
+  sub owed {
+    my($start, $end, %opt) = @_;
+
+    my @where = ();
+
+    #handle start and end ranges
+
+    #24h * 60m * 60s
+    push @where, "cust_bill._date <= extract(epoch from now())-".
+                 ($start * 86400)
+      if $start;
+  
+    push @where, "cust_bill._date > extract(epoch from now()) - ".
+                 ($end * 86400)
+      if $end;
+
+    #handle 'cust' option
+  
+    push @where, "cust_main.custnum = cust_bill.custnum"
+      if $opt{'cust'};
+
+    #handle 'agentnum' option
+    my $join = '';
+    if ( $opt{'agentnum'} ) {
+      $join = 'LEFT JOIN cust_main USING ( custnum )';
+      push @where, "agentnum = '$opt{'agentnum'}'";
+    }
+
+    my $where = scalar(@where) ? 'WHERE '.join(' AND ', @where) : '';
+  
+    my $as = $opt{'noas'} ? '' : "as owed_${start}_$end";
+
+    my $charged = <<END;
   sum( charged
        - coalesce(
            ( select sum(amount) from cust_bill_pay
@@ -16,48 +48,19 @@
      )
 END
 
-  my $owed_cols = <<END;
-       coalesce(
-         ( select $charged from cust_bill
-           where cust_bill._date > extract(epoch from now())-2592000
-             and cust_main.custnum = cust_bill.custnum
-         )
-         ,0
-       ) as owed_0_30,
-
-       coalesce(
-         ( select $charged from cust_bill
-           where cust_bill._date >  extract(epoch from now())-5184000
-             and cust_bill._date <= extract(epoch from now())-2592000
-             and cust_main.custnum = cust_bill.custnum
-         )
-         ,0
-       ) as owed_30_60,
-
-       coalesce(
-         ( select $charged from cust_bill
-           where cust_bill._date >  extract(epoch from now())-7776000
-             and cust_bill._date <= extract(epoch from now())-5184000
-             and cust_main.custnum = cust_bill.custnum
-         )
-         ,0
-       ) as owed_60_90,
+    "coalesce( ( select $charged from cust_bill $join $where ) ,0 ) $as";
+  
+  }
 
-       coalesce(
-         ( select $charged from cust_bill
-           where cust_bill._date <= extract(epoch from now())-7776000
-             and cust_main.custnum = cust_bill.custnum
-         )
-         ,0
-       ) as owed_90_pl,
+  my @ranges = (
+    [  0, 30 ],
+    [ 30, 60 ],
+    [ 60, 90 ],
+    [ 90,  0 ],
+    [  0,  0 ],
+  );
 
-       coalesce(
-         ( select $charged from cust_bill
-           where cust_main.custnum = cust_bill.custnum
-         )
-         ,0
-       ) as owed_total
-END
+  my $owed_cols = join(',', map owed( @$_, 'cust'=>1 ), @ranges );
 
   my $recurring = <<END;
         '0' != ( select freq from part_pkg
@@ -81,15 +84,7 @@ END
 
 END
 
-  my $where = <<END;
-where 0 <
-  coalesce(
-           ( select $charged from cust_bill
-             where cust_main.custnum = cust_bill.custnum
-           )
-           ,0
-         )
-END
+  my $where = "where ". owed(0, 0, 'cust'=>1, 'noas'=>1). " > 0";
 
   my $agentnum = '';
   if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
@@ -106,13 +101,11 @@ END
     'extra_sql' => "$where order by coalesce(lower(company), ''), lower(last)",
   };
 
-  if ( $agentnum ) {
-    $owed_cols =~
-      s/cust_bill\.custnum/cust_bill.custnum AND cust_main.agentnum = '$agentnum'/g;
-  }
-  my $total_sql = "select $owed_cols from cust_main";
+  my $total_sql = "select ".
+                    join(',', map owed( @$_, 'agentnum'=>$agentnum ), @ranges );
+
   my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
-  $total_sth->execute or die $total_sth->errstr;
+  $total_sth->execute or die "error executing $total_sql: ". $total_sth->errstr;
   my $row = $total_sth->fetchrow_hashref();
 
   my $conf = new FS::Conf;
@@ -154,9 +147,9 @@ END
                                     sprintf( $money_char.'%.2f',
                                              $row->{'owed_60_90'} ),
                                     sprintf( $money_char.'%.2f',
-                                             $row->{'owed_90_pl'} ),
+                                             $row->{'owed_90_0'} ),
                                     sprintf( '<b>'. $money_char.'%.2f'. '</b>',
-                                             $row->{'owed_total'} ),
+                                             $row->{'owed_0_0'} ),
                                   ],
                  'fields'      => [
                                     \&FS::UI::Web::cust_fields,
@@ -182,9 +175,9 @@ END
                                     sub { sprintf( $money_char.'%.2f',
                                                    shift->get('owed_60_90') ) },
                                     sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_90_pl') ) },
+                                                   shift->get('owed_90_0') ) },
                                     sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_total') ) },
+                                                   shift->get('owed_0_0') ) },
                                   ],
                  'links'       => [
                                     ( map $clink, FS::UI::Web::cust_header() ),
-- 
cgit v1.2.1


From 20d1889a5fcecf66b720500326726ab266c7b712 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 May 2006 15:31:58 +0000
Subject: adding new images

---
 httemplate/images/32clear.gif             | Bin 0 -> 815 bytes
 httemplate/images/arrow.down.png          | Bin 0 -> 170 bytes
 httemplate/images/arrow.right.black.png   | Bin 0 -> 160 bytes
 httemplate/images/arrow.right.png         | Bin 0 -> 160 bytes
 httemplate/images/black-gradient.png      | Bin 0 -> 397 bytes
 httemplate/images/black-gray-corner.png   | Bin 0 -> 460 bytes
 httemplate/images/black-gray-gradient.png | Bin 0 -> 384 bytes
 httemplate/images/black-gray-side.png     | Bin 0 -> 198 bytes
 httemplate/images/black-gray-top.png      | Bin 0 -> 203 bytes
 9 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 httemplate/images/32clear.gif
 create mode 100644 httemplate/images/arrow.down.png
 create mode 100644 httemplate/images/arrow.right.black.png
 create mode 100644 httemplate/images/arrow.right.png
 create mode 100644 httemplate/images/black-gradient.png
 create mode 100644 httemplate/images/black-gray-corner.png
 create mode 100644 httemplate/images/black-gray-gradient.png
 create mode 100644 httemplate/images/black-gray-side.png
 create mode 100644 httemplate/images/black-gray-top.png

diff --git a/httemplate/images/32clear.gif b/httemplate/images/32clear.gif
new file mode 100644
index 000000000..5fdcea204
Binary files /dev/null and b/httemplate/images/32clear.gif differ
diff --git a/httemplate/images/arrow.down.png b/httemplate/images/arrow.down.png
new file mode 100644
index 000000000..675d84bde
Binary files /dev/null and b/httemplate/images/arrow.down.png differ
diff --git a/httemplate/images/arrow.right.black.png b/httemplate/images/arrow.right.black.png
new file mode 100644
index 000000000..933c25894
Binary files /dev/null and b/httemplate/images/arrow.right.black.png differ
diff --git a/httemplate/images/arrow.right.png b/httemplate/images/arrow.right.png
new file mode 100644
index 000000000..60bcb76ab
Binary files /dev/null and b/httemplate/images/arrow.right.png differ
diff --git a/httemplate/images/black-gradient.png b/httemplate/images/black-gradient.png
new file mode 100644
index 000000000..225732d16
Binary files /dev/null and b/httemplate/images/black-gradient.png differ
diff --git a/httemplate/images/black-gray-corner.png b/httemplate/images/black-gray-corner.png
new file mode 100644
index 000000000..17954cdd7
Binary files /dev/null and b/httemplate/images/black-gray-corner.png differ
diff --git a/httemplate/images/black-gray-gradient.png b/httemplate/images/black-gray-gradient.png
new file mode 100644
index 000000000..f5c318fe7
Binary files /dev/null and b/httemplate/images/black-gray-gradient.png differ
diff --git a/httemplate/images/black-gray-side.png b/httemplate/images/black-gray-side.png
new file mode 100644
index 000000000..f7a98a43d
Binary files /dev/null and b/httemplate/images/black-gray-side.png differ
diff --git a/httemplate/images/black-gray-top.png b/httemplate/images/black-gray-top.png
new file mode 100644
index 000000000..ed0707573
Binary files /dev/null and b/httemplate/images/black-gray-top.png differ
-- 
cgit v1.2.1


From c46235292c6bf929615ac28fc48c1d5609ce4590 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 May 2006 18:34:39 +0000
Subject: yay for cheating

---
 httemplate/images/background-cheat.png | Bin 0 -> 338 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 httemplate/images/background-cheat.png

diff --git a/httemplate/images/background-cheat.png b/httemplate/images/background-cheat.png
new file mode 100644
index 000000000..ad332f675
Binary files /dev/null and b/httemplate/images/background-cheat.png differ
-- 
cgit v1.2.1


From 2c757d7db4cb6a7b9655de13206fcc84fb7ce61f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 14 May 2006 16:47:31 +0000
Subject: first part of ACL and re-skinning work and some other small stuff

---
 CREDITS                                         |   6 +
 Changes.1.7.0                                   |  39 ++
 FS/FS/AccessRight.pm                            |  77 +++
 FS/FS/CGI.pm                                    |   5 +-
 FS/FS/Schema.pm                                 |  87 ++-
 FS/FS/UI/Web.pm                                 |  14 +-
 FS/FS/access_group.pm                           | 121 +++++
 FS/FS/access_groupagent.pm                      | 124 +++++
 FS/FS/access_right.pm                           | 127 +++++
 FS/FS/access_user.pm                            | 167 ++++++
 FS/FS/access_user_pref.pm                       | 127 +++++
 FS/FS/access_usergroup.pm                       | 144 +++++
 FS/FS/agent_type.pm                             |   3 +-
 FS/FS/cust_bill.pm                              |   5 +
 FS/FS/m2m_Common.pm                             | 110 ++++
 FS/FS/part_pkg/billoneday.pm                    |  48 --
 FS/FS/payby.pm                                  |   3 +-
 FS/FS/svc_domain.pm                             |   6 +-
 FS/MANIFEST                                     |   1 +
 FS/bin/freeside-addoutsourceuser                |   4 +-
 FS/t/AccessRight.t                              |   5 +
 FS/t/access_group.t                             |   5 +
 FS/t/access_groupagent.t                        |   5 +
 FS/t/access_right.t                             |   5 +
 FS/t/access_user.t                              |   5 +
 FS/t/access_user_pref.t                         |   5 +
 FS/t/access_usergroup.t                         |   5 +
 htetc/handler.pl                                |   2 +
 httemplate/autohandler                          |  10 +-
 httemplate/browse/access_group.html             |  33 ++
 httemplate/browse/access_user.html              |  63 +++
 httemplate/browse/agent_type.cgi                | 108 ++--
 httemplate/browse/cust_main_county.cgi          | 185 +++----
 httemplate/browse/msgcat.cgi                    |  20 +-
 httemplate/browse/part_pkg.cgi                  |  14 +-
 httemplate/edit/access_group.html               |  10 +
 httemplate/edit/access_user.html                |  37 ++
 httemplate/edit/agent_type.cgi                  |  52 +-
 httemplate/edit/cust_bill_pay.cgi               |  87 ++-
 httemplate/edit/cust_credit.cgi                 |  71 ++-
 httemplate/edit/cust_credit_bill.cgi            |  90 ++--
 httemplate/edit/cust_main.cgi                   | 105 ++--
 httemplate/edit/cust_pkg.cgi                    | 136 +++--
 httemplate/edit/elements/edit.html              |  36 +-
 httemplate/edit/part_referral.cgi               |  36 +-
 httemplate/edit/part_virtual_field.cgi          |  19 +-
 httemplate/edit/process/access_group.html       |   5 +
 httemplate/edit/process/access_user.html        |   8 +
 httemplate/edit/process/agent_type.cgi          |  39 +-
 httemplate/edit/process/cust_bill_pay.cgi       |  16 +-
 httemplate/edit/process/cust_credit.cgi         |  17 +-
 httemplate/edit/process/cust_credit_bill.cgi    |  16 +-
 httemplate/edit/process/elements/process.html   |  19 +-
 httemplate/edit/svc_domain.cgi                  |  55 +-
 httemplate/elements/checkboxes-table.html       | 110 ++++
 httemplate/elements/cssexpr.js                  |  66 +++
 httemplate/elements/footer.html                 |   3 +
 httemplate/elements/header.html                 | 289 +++++++++-
 httemplate/elements/menubar.html                |   1 +
 httemplate/elements/select-access_group.html    |  15 +
 httemplate/elements/tr-select-access_group.html |  22 +
 httemplate/elements/xmenu.css                   | 185 +++++++
 httemplate/elements/xmenu.js                    | 668 ++++++++++++++++++++++++
 httemplate/index.html                           |  12 +-
 httemplate/misc/batch-cust_pay.html             |   2 -
 httemplate/misc/payment.cgi                     |  38 +-
 httemplate/search/cust_bill.cgi                 | 165 ------
 httemplate/search/cust_main-otaker.cgi          |  47 +-
 httemplate/search/cust_main-payinfo.html        |  20 -
 httemplate/search/cust_main-quickpay.html       |  44 --
 httemplate/search/cust_main.cgi                 |  50 +-
 httemplate/search/cust_pay.html                 |  18 -
 httemplate/search/cust_pkg_report.cgi           |  39 +-
 httemplate/search/report_cust_bill.html         |  54 +-
 httemplate/search/report_cust_credit.html       |  62 +--
 httemplate/search/report_cust_pay.html          |  81 +--
 httemplate/search/report_prepaid_income.html    |  26 +-
 httemplate/search/report_tax.html               |  73 ++-
 httemplate/search/sqlradius.html                |  52 +-
 httemplate/search/svc_acct.html                 |  19 -
 httemplate/search/svc_domain.cgi                |   2 +-
 httemplate/search/svc_domain.html               |  19 -
 httemplate/search/svc_external.cgi              |  21 +-
 httemplate/view/cust_main/packages.html         |   4 +-
 httemplate/view/cust_main/payment_history.html  |  26 +-
 85 files changed, 3577 insertions(+), 1198 deletions(-)
 create mode 100644 Changes.1.7.0
 create mode 100644 FS/FS/AccessRight.pm
 create mode 100644 FS/FS/access_group.pm
 create mode 100644 FS/FS/access_groupagent.pm
 create mode 100644 FS/FS/access_right.pm
 create mode 100644 FS/FS/access_user.pm
 create mode 100644 FS/FS/access_user_pref.pm
 create mode 100644 FS/FS/access_usergroup.pm
 create mode 100644 FS/FS/m2m_Common.pm
 delete mode 100644 FS/FS/part_pkg/billoneday.pm
 create mode 100644 FS/t/AccessRight.t
 create mode 100644 FS/t/access_group.t
 create mode 100644 FS/t/access_groupagent.t
 create mode 100644 FS/t/access_right.t
 create mode 100644 FS/t/access_user.t
 create mode 100644 FS/t/access_user_pref.t
 create mode 100644 FS/t/access_usergroup.t
 create mode 100644 httemplate/browse/access_group.html
 create mode 100644 httemplate/browse/access_user.html
 create mode 100644 httemplate/edit/access_group.html
 create mode 100644 httemplate/edit/access_user.html
 create mode 100644 httemplate/edit/process/access_group.html
 create mode 100644 httemplate/edit/process/access_user.html
 create mode 100644 httemplate/elements/checkboxes-table.html
 create mode 100644 httemplate/elements/cssexpr.js
 create mode 100644 httemplate/elements/select-access_group.html
 create mode 100644 httemplate/elements/tr-select-access_group.html
 create mode 100644 httemplate/elements/xmenu.css
 create mode 100644 httemplate/elements/xmenu.js
 delete mode 100755 httemplate/search/cust_bill.cgi
 delete mode 100755 httemplate/search/cust_main-payinfo.html
 delete mode 100755 httemplate/search/cust_main-quickpay.html
 delete mode 100755 httemplate/search/cust_pay.html
 delete mode 100755 httemplate/search/svc_acct.html
 delete mode 100755 httemplate/search/svc_domain.html

diff --git a/CREDITS b/CREDITS
index 930b4f351..72b049129 100644
--- a/CREDITS
+++ b/CREDITS
@@ -157,5 +157,11 @@ Perl backend version (c) copyright 2005 Nathan Schmidt
 Scott Edwards <supadupa@gmail.com> contributed magic for XMLHTTP error
 handling, and other patches.
 
+Contains XMenu <http://webfx.eae.net/dhtml/xmenu/xmenu.html>
+by Erik Arvidsson, licensed under the terms of the GNU GPL.
+
+Contains public domain artwork from openclipart.org by mimooh and other
+authors.
+
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/Changes.1.7.0 b/Changes.1.7.0
new file mode 100644
index 000000000..8dcc36e08
--- /dev/null
+++ b/Changes.1.7.0
@@ -0,0 +1,39 @@
+- tax report overhaul
+- package classes
+- UI overhaul.  No more Apache::ASP support, HTML::Mason only
+- lots of CDR/telephony work
+- inventory classes and inventory (better description from directleap/specs.txt)
+- vonage click2call bs :)
+- zip code report
+- sales/credit/receipt summary report now has options for agent, 12mo cumulative totals
+- gross sales report/graph broken down by agent and package class
+- config switch to base tax off shipping address if present (warning: tax reports can take a long time with this switch on)
+- plesk provisioning
+
+-------- some of the above, nicely:
+
+- Charge taxes based on shipping address if present.  Note that tax 
+  reports can take a bit longer than they used to.
+
+- Per-agent A/R Aging
+  - Bookeeping/Collections | Accounts Receivable Aging Summary
+
+- Per-agent Sales/Credit/Receipt Summary and "pre-selection" of agent 
+  and time period as you requested.
+  - Bookeeping/Collections | Sales, Credits and Receipts Summary
+
+- Package classes
+  - go to Sysadmin | View/Edit package classes and create some classes
+  - go to Sysadmin | View/Edit package definitions, edit the existing
+    package defs and put them into classes
+
+- The sales report you requested, broken down by agent and 
+  package class.  This works fine right now, but it will show more
+  information once you enter some package classes.
+  - Bookeeping/Collections | Sales report (by agent, package class ...
+
+--------
+
+and...
+- ACLs
+- Agent virtualization
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
new file mode 100644
index 000000000..01d63e35d
--- /dev/null
+++ b/FS/FS/AccessRight.pm
@@ -0,0 +1,77 @@
+package FS::AccessRight;
+
+use strict;
+user vars qw(@rights %rights);
+use Tie::IxHash;
+
+=head1 NAME
+
+FS::AccessRight - Access control rights.
+
+=head1 SYNOPSIS
+
+  use FS::AccessRight;
+
+=head1 DESCRIPTION
+
+Access control rights - Permission to perform specific actions that can be
+assigned to users and/or groups.
+
+=cut
+
+@rights = (
+  'Reports' => [
+    '_desc' => 'Access to high-level reporting',
+  ],
+  'Configuration' => [
+    '_desc' => 'Access to configuration',
+
+    'Settings' => {},
+
+    'agent' => [
+      '_desc' => 'Master access to reseller configuration',
+      'agent_type'  => {},
+      'agent'       => {},
+    ],
+
+    'export_svc_pkg' => [
+      '_desc' => 'Access to export, service and package configuration',
+      'part_export' => {},
+      'part_svc'    => {},
+      'part_pkg'    => {},
+      'pkg_class'   => {},
+    ],
+
+    'billing' => [
+      '_desc' => 'Access to billing configuration',
+      'payment_gateway'  => {},
+      'part_bill_event'  => {},
+      'prepay_credit'    => {},
+      'rate'             => {},
+      'cust_main_county' => {},
+    ],
+
+    'dialup' => [
+      '_desc' => 'Access to dialup configuraiton',
+      'svc_acct_pop' => {},
+    ],
+
+    'broadband' => [
+      '_desc' => 'Access to broadband configuration',
+      'router'     => {},
+      'addr_block' => {},
+    ],
+
+    'misc' => [
+      'part_referral'      => {},
+      'part_virtual_field' => {},
+      'msgcat'             => {},
+      'inventory_class'    => {},
+    ],
+
+  },
+
+);
+
+#turn it into a more hash-like structure, but ordered via IxHash
+
diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index f1f2a3dca..d598f5218 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -62,9 +62,9 @@ sub header {
       </HEAD>
       <BODY BGCOLOR="#e8e8e8"$etc>
           <FONT SIZE=6>
-            $title
+            <CENTER>$title</CENTER>
           </FONT>
-          <BR><BR>
+          <BR><!--<BR>-->
 END
   $x .=  $menubar. "<BR><BR>" if $menubar;
   $x;
@@ -115,6 +115,7 @@ sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... );
   my($item,$url,@html);
   while (@_) {
     ($item,$url)=splice(@_,0,2);
+    next if $item =~ /^\s*Main\s+Menu\s*$/i;
     push @html, qq!<A HREF="$url">$item</A>!;
   }
   join(' | ',@html);
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 9125758d0..e81185666 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -244,6 +244,8 @@ sub tables_hashref {
 
   my $username_len = 32; #usernamemax config file
 
+    # name type nullability length default local
+
   return {
 
     'agent' => {
@@ -445,6 +447,9 @@ sub tables_hashref {
       'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ],
                    [ 'daytime' ], [ 'night' ], [ 'fax' ], [ 'refnum' ],
                    [ 'county' ], [ 'state' ], [ 'country' ], [ 'zip' ],
+                   [ 'ship_last' ], [ 'ship_company' ],
+                   [ 'payby' ], [ 'paydate' ],
+
                  ],
     },
 
@@ -1444,16 +1449,94 @@ sub tables_hashref {
 
     'inventory_class' => {
       'columns' => [
-        'classnum',  'serial',       '', '', '', '',
-        'classname', 'varchar', $char_d, '', '', '',
+        'classnum',  'serial',       '',      '', '', '',
+        'classname', 'varchar',      '', $char_d, '', '',
       ],
       'primary_key' => 'classnum',
       'unique' => [],
       'index'  => [],
     },
 
+    'access_user' => {
+      'columns' => [
+        'usernum',   'serial',  '',      '', '', '',
+        'username',  'varchar', '', $char_d, '', '',
+        '_password', 'varchar', '', $char_d, '', '',
+        'last',      'varchar', '', $char_d, '', '', 
+        'first',     'varchar', '', $char_d, '', '', 
+      ],
+      'primary_key' => 'usernum',
+      'unique' => [ [ 'username' ] ],
+      'index'  => [],
+    },
+
+    'access_user_pref' => {
+      'columns' => [
+        'prefnum',    'serial',       '', '', '', '',
+        'usernum',     'int',       '', '', '', '',
+        'prefname', 'varchar', '', $char_d, '', '', 
+        'prefvalue', 'text', 'NULL', '', '', '', 
+      ],
+      'primary_key' => 'prefnum',
+      'unique' => [],
+      'index'  => [ [ 'usernum' ] ],
+    },
+
+    'access_group' => {
+      'columns' => [
+        'groupnum',   'serial', '',      '', '', '',
+        'groupname', 'varchar', '', $char_d, '', '',
+      ],
+      'primary_key' => 'groupnum',
+      'unique' => [ [ 'groupname' ] ],
+      'index'  => [],
+    },
+
+    'access_usergroup' => {
+      'columns' => [
+        'usergroupnum', 'serial', '', '', '', '',
+        'usernum',         'int', '', '', '', '',
+        'groupnum',        'int', '', '', '', '',
+      ],
+      'primary_key' => 'usergroupnum',
+      'unique' => [ [ 'usernum', 'groupnum' ] ],
+      'index'  => [ [ 'usernum' ] ],
+    },
+
+    'access_groupagent' => {
+      'columns' => [
+        'groupagentnum', 'serial', '', '', '', '',
+        'groupnum',         'int', '', '', '', '',
+        'agentnum',         'int', '', '', '', '',
+      ],
+      'primary_key' => 'groupagentnum',
+      'unique' => [ [ 'groupnum', 'agentnum' ] ],
+      'index'  => [ [ 'groupnum' ] ],
+    },
+
+    'access_right' => {
+      'columns' => [
+        'rightnum',   'serial', '',      '', '', '',
+        'righttype', 'varchar', '', $char_d, '', '',
+        'rightobjnum',   'int', '',      '', '', '',
+        'rightname', 'varchar', '',      '', '', '',
+      ],
+      'primary_key' => 'rightnum',
+      'unique' => [ [ 'righttype', 'rightobjnum', 'rightname' ] ],
+      'index'  => [],
+    },
+
   };
 
+    #'new_table' => {
+    #  'columns' => [
+    #    'num', 'serial',       '', '', '', '',
+    #  ],
+    #  'primary_key' => 'num',
+    #  'unique' => [],
+    #  'index'  => [],
+    #},
+
 }
 
 =back
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index dc45e0188..10ddbf33f 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -184,6 +184,10 @@ sub process {
 
     $self->job_status(@args);
 
+  } else {
+
+    die "unknown sub $sub";
+
   }
 
 }
@@ -228,11 +232,19 @@ sub start_job {
   my $error = $job->insert( '_JOB', encode_base64(nfreeze(\%param)) );
 
   if ( $error ) {
+
+    warn "job not inserted: $error\n"
+      if $DEBUG;
+
     $error;  #this doesn't seem to be handled well,
              # will trigger "illegal jobnum" below?
              # (should never be an error inserting the job, though, only thing
              #  would be Pg f%*kage)
   } else {
+
+    warn "job inserted successfully with jobnum ". $job->jobnum. "\n"
+      if $DEBUG;
+
     $job->jobnum;
   }
   
@@ -253,7 +265,7 @@ sub job_status {
   my @return;
   if ( $job && $job->status ne 'failed' ) {
     @return = ( 'progress', $job->statustext );
-  } elsif ( !$job ) { #handle job gone case : job sucessful
+  } elsif ( !$job ) { #handle job gone case : job successful
                       # so close popup, redirect parent window...
     @return = ( 'complete' );
   } else {
diff --git a/FS/FS/access_group.pm b/FS/FS/access_group.pm
new file mode 100644
index 000000000..9d870e57f
--- /dev/null
+++ b/FS/FS/access_group.pm
@@ -0,0 +1,121 @@
+package FS::access_group;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::access_group - Object methods for access_group records
+
+=head1 SYNOPSIS
+
+  use FS::access_group;
+
+  $record = new FS::access_group \%hash;
+  $record = new FS::access_group { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::access_group object represents an example.  FS::access_group inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item groupnum - primary key
+
+=item groupname - 
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'access_group'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('groupnum')
+    || $self->ut_text('groupname')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/access_groupagent.pm b/FS/FS/access_groupagent.pm
new file mode 100644
index 000000000..6b5def1a3
--- /dev/null
+++ b/FS/FS/access_groupagent.pm
@@ -0,0 +1,124 @@
+package FS::access_groupagent;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::access_groupagent - Object methods for access_groupagent records
+
+=head1 SYNOPSIS
+
+  use FS::access_groupagent;
+
+  $record = new FS::access_groupagent \%hash;
+  $record = new FS::access_groupagent { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::access_groupagent object represents an example.  FS::access_groupagent inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item groupagentnum - primary key
+
+=item groupnum - 
+
+=item agentnum - 
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'access_groupagent'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('groupagentnum')
+    || $self->ut_number('groupnum')
+    || $self->ut_number('agentnum')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
new file mode 100644
index 000000000..67200f245
--- /dev/null
+++ b/FS/FS/access_right.pm
@@ -0,0 +1,127 @@
+package FS::access_right;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::access_right - Object methods for access_right records
+
+=head1 SYNOPSIS
+
+  use FS::access_right;
+
+  $record = new FS::access_right \%hash;
+  $record = new FS::access_right { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::access_right object represents an example.  FS::access_right inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item rightnum - primary key
+
+=item righttype - 
+
+=item rightobjnum - 
+
+=item rightname - 
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'access_right'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('rightnum')
+    || $self->ut_text('righttype')
+    || $self->ut_text('rightobjnum')
+    || $self->ut_text('rightname')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
new file mode 100644
index 000000000..ca311d3b8
--- /dev/null
+++ b/FS/FS/access_user.pm
@@ -0,0 +1,167 @@
+package FS::access_user;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::m2m_Common;
+use FS::access_usergroup;
+
+@ISA = qw( FS::m2m_Common FS::Record );
+
+=head1 NAME
+
+FS::access_user - Object methods for access_user records
+
+=head1 SYNOPSIS
+
+  use FS::access_user;
+
+  $record = new FS::access_user \%hash;
+  $record = new FS::access_user { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::access_user object represents an example.  FS::access_user inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item usernum - primary key
+
+=item username - 
+
+=item _password - 
+
+=item last -
+
+=item first -
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'access_user'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('usernum')
+    || $self->ut_text('username')
+    || $self->ut_text('_password')
+    || $self->ut_text('last')
+    || $self->ut_text('first')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=item name
+
+Returns a name string for this user: "Last, First".
+
+=cut
+
+sub name {
+  my $self = shift;
+  $self->get('last'). ', '. $self->first;
+}
+
+=item access_usergroup
+
+=cut
+
+sub access_usergroup {
+  my $self = shift;
+  qsearch( 'access_usergroup', { 'usernum' => $self->usernum } );
+}
+
+#=item access_groups
+#
+#=cut
+#
+#sub access_groups {
+#
+#}
+#
+#=item access_groupnames
+#
+#=cut
+#
+#sub access_groupnames {
+#
+#}
+
+=back
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/access_user_pref.pm b/FS/FS/access_user_pref.pm
new file mode 100644
index 000000000..ff957f2a1
--- /dev/null
+++ b/FS/FS/access_user_pref.pm
@@ -0,0 +1,127 @@
+package FS::access_user_pref;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::access_user_pref - Object methods for access_user_pref records
+
+=head1 SYNOPSIS
+
+  use FS::access_user_pref;
+
+  $record = new FS::access_user_pref \%hash;
+  $record = new FS::access_user_pref { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::access_user_pref object represents an example.  FS::access_user_pref inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item prefnum - primary key
+
+=item usernum - 
+
+=item prefname - 
+
+=item prefvalue - 
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'access_user_pref'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('prefnum')
+    || $self->ut_number('usernum')
+    || $self->ut_text('prefname')
+    || $self->ut_textn('prefvalue')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/access_usergroup.pm b/FS/FS/access_usergroup.pm
new file mode 100644
index 000000000..4d8836c15
--- /dev/null
+++ b/FS/FS/access_usergroup.pm
@@ -0,0 +1,144 @@
+package FS::access_usergroup;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+use FS::access_user;
+use FS::access_group;
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::access_usergroup - Object methods for access_usergroup records
+
+=head1 SYNOPSIS
+
+  use FS::access_usergroup;
+
+  $record = new FS::access_usergroup \%hash;
+  $record = new FS::access_usergroup { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::access_usergroup object represents an example.  FS::access_usergroup inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item usergroupnum - primary key
+
+=item usernum - 
+
+=item groupnum - 
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'access_usergroup'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('usergroupnum')
+    || $self->ut_number('usernum')
+    || $self->ut_number('groupnum')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=item access_user
+
+=cut
+
+sub access_user {
+  my $self = shift;
+  qsearchs( 'access_user', { 'usernum' => $self->usernum } );
+}
+
+=item access_group
+
+=cut
+
+sub access_group {
+  my $self = shift;
+  qsearchs( 'access_group', { 'groupnum' => $self->groupnum } );
+}
+
+=back
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/agent_type.pm b/FS/FS/agent_type.pm
index 968b3b72e..b28c57285 100644
--- a/FS/FS/agent_type.pm
+++ b/FS/FS/agent_type.pm
@@ -3,10 +3,11 @@ package FS::agent_type;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch );
+use FS::m2m_Common;
 use FS::agent;
 use FS::type_pkgs;
 
-@ISA = qw( FS::Record );
+@ISA = qw( FS::m2m_Common FS::Record );
 
 =head1 NAME
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index cce028b2c..bcae4d646 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2463,6 +2463,7 @@ use Data::Dumper;
 use MIME::Base64;
 sub process_re_X {
   my( $method, $job ) = ( shift, shift );
+  warn "process_re_X $method for job $job\n" if $DEBUG;
 
   my $param = thaw(decode_base64(shift));
   warn Dumper($param) if $DEBUG;
@@ -2478,6 +2479,10 @@ sub process_re_X {
 sub re_X {
   my($method, $job, %param ) = @_;
 #              [ 'begin', 'end', 'agentnum', 'open', 'days', 'newest_percust' ],
+  if ( $DEBUG ) {
+    warn "re_X $method for job $job with param:\n".
+         join( '', map { "  $_ => ". $param{$_}. "\n" } keys %param );
+  }
 
   #some false laziness w/search/cust_bill.html
   my $distinct = '';
diff --git a/FS/FS/m2m_Common.pm b/FS/FS/m2m_Common.pm
new file mode 100644
index 000000000..fd8700a2d
--- /dev/null
+++ b/FS/FS/m2m_Common.pm
@@ -0,0 +1,110 @@
+package FS::m2m_Common;
+
+use strict;
+use vars qw( @ISA $DEBUG );
+use FS::Schema qw( dbdef );
+use FS::Record qw( qsearch qsearchs ); #dbh );
+
+@ISA = qw( FS::Record );
+
+$DEBUG = 0;
+
+=head1 NAME
+
+FS::m2m_Common - Base class for classes in a many-to-many relationship
+
+=head1 SYNOPSIS
+
+use FS::m2m_Common;
+
+@ISA = qw( FS::m2m_Common );
+
+=head1 DESCRIPTION
+
+FS::m2m_Common is intended as a base class for classes which have a
+many-to-many relationship with another table (via a linking table).
+
+Note: It is currently assumed that the link table contains two fields
+named the same as the primary keys of ths base and target tables.
+
+=head1 METHODS
+
+=over 4
+
+=item process_m2m
+
+=cut
+
+sub process_m2m {
+  my( $self, %opt ) = @_;
+
+  my $self_pkey = $self->dbdef_table->primary_key;
+
+  my $link_table = $self->_load_table($opt{'link_table'});
+
+  my $target_table = $self->_load_table($opt{'target_table'});
+  my $target_pkey = dbdef->table($target_table)->primary_key;
+
+  foreach my $target_obj ( qsearch($target_table, {} ) ) {
+
+    my $targetnum = $target_obj->$target_pkey();
+
+    my $link_obj = qsearchs( $link_table, {
+        $self_pkey   => $self->$self_pkey(),
+        $target_pkey => $targetnum,
+    });
+
+    if ( $link_obj && ! $opt{'params'}->{"$target_pkey$targetnum"} ) {
+
+      my $d_link_obj = $link_obj; #need to save $link_obj for below.
+      my $error = $d_link_obj->delete;
+      die $error if $error;
+
+    } elsif ( $opt{'params'}->{"$target_pkey$targetnum"} && ! $link_obj ) {
+
+      #ok to clobber it now (but bad form nonetheless?)
+      #$link_obj = new "FS::$link_table" ( {
+      $link_obj = "FS::$link_table"->new( {
+        $self_pkey   => $self->$self_pkey(),
+        $target_pkey => $targetnum,
+      });
+      my $error = $link_obj->insert;
+      die $error if $error;
+    }
+
+  }
+
+  '';
+}
+
+sub _load_table {
+  my( $self, $table ) = @_;
+  eval "use FS::$table";
+  die $@ if $@;
+  $table;
+}
+
+#=item target_table
+#
+#=cut
+#
+#sub target_table {
+#  my $self = shift;
+#  my $target_table = $self->_target_table;
+#  eval "use FS::$target_table";
+#  die $@ if $@;
+#  $target_table;
+#}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_pkg/billoneday.pm b/FS/FS/part_pkg/billoneday.pm
deleted file mode 100644
index 8740547a3..000000000
--- a/FS/FS/part_pkg/billoneday.pm
+++ /dev/null
@@ -1,48 +0,0 @@
-package FS::part_pkg::billoneday;
-
-use strict;
-use vars qw(@ISA %info);
-use Time::Local qw(timelocal);
-#use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
-
-@ISA = qw(FS::part_pkg::flat);
-
-%info = (
-  'name' => 'charge a full month  every (selectable) billing day',
-  'fields' => {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
-    'recur_fee' => { 'name' => 'Recurring fee for this package',
-                     'default' => 0,
-			   },
-    'cutoff_day' => { 'name' => 'billing day',
-                      'default' => 1,
-                    },
-
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day'],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year); \' + what.recur_fee.value',
-  'freq' => 'm',
-  'weight' => 30,
-);
-
-sub calc_recur {
-  my($self, $cust_pkg, $sdate ) = @_;
-
-  my $mnow = $$sdate;
-  my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
-  my $mstart = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year);
-  my $mend = timelocal(0,0,0,$self->option('cutoff_day'), $mon == 11 ? 0 : $mon+1, $year+($mon==11));
-
-  if($mday > $self->option('cutoff_date') and $mstart != $mnow ) {
-    $$sdate = timelocal(0,0,0,$self->option('cutoff_day'), $mon == 11 ? 0 : $mon+1,  $year+($mon==11));
-  }
-  else{
-    $$sdate = timelocal(0,0,0,$self->option('cutoff_day'), $mon, $year);
-  }
-  $self->option('recur_fee');
-}
-1;
diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 4425df040..9f8b68918 100644
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -115,7 +115,8 @@ sub cust_payby2longname {
 
 =head1 BUGS
 
-This should eventually be an actual database table.
+This should eventually be an actual database table, and all tables that
+currently have a char payby field should have a foreign key into here instead.
 
 =head1 SEE ALSO
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 191d85604..bdaf79b2f 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -230,7 +230,11 @@ sub delete {
     my $error = $domain_record->delete;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return $error;
+      return "can't delete DNS entry: ".
+             join(' ', map $domain_record->$_(),
+                           qw( reczone recaf rectype recdata )
+                 ).
+             ":$error";
     }
   }
 
diff --git a/FS/MANIFEST b/FS/MANIFEST
index c309251ff..bd810a8db 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -339,3 +339,4 @@ FS/access_groupagent.pm
 t/access_groupagent.t
 FS/access_right.pm
 t/access_right.t
+FS/m2m_Common.pm
diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser
index cad07f1fd..02a435141 100644
--- a/FS/bin/freeside-addoutsourceuser
+++ b/FS/bin/freeside-addoutsourceuser
@@ -3,6 +3,7 @@
 username=$1
 domain=$2
 password=$3
+realdomain=$4
 
 freeside-adduser -h /usr/local/etc/freeside/htpasswd \
                  -s conf.DBI:Pg:dbname=$domain/secrets \
@@ -10,6 +11,5 @@ freeside-adduser -h /usr/local/etc/freeside/htpasswd \
                  $username $password 2>/dev/null
 
 [ -e /usr/local/etc/freeside/dbdef.DBI:Pg:dbname=$domain ] \
- || ( freeside-setup -s $username 2>/dev/null; \
-      /home/ivan/freeside/bin/populate-msgcat $username 2>/dev/null )
+ || ( freeside-setup -d $realdomain $username 2>/dev/null )
 
diff --git a/FS/t/AccessRight.t b/FS/t/AccessRight.t
new file mode 100644
index 000000000..a96684224
--- /dev/null
+++ b/FS/t/AccessRight.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::AccessRight;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/access_group.t b/FS/t/access_group.t
new file mode 100644
index 000000000..be141099b
--- /dev/null
+++ b/FS/t/access_group.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::access_group;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/access_groupagent.t b/FS/t/access_groupagent.t
new file mode 100644
index 000000000..aff1f2524
--- /dev/null
+++ b/FS/t/access_groupagent.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::access_groupagent;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/access_right.t b/FS/t/access_right.t
new file mode 100644
index 000000000..66cd362e8
--- /dev/null
+++ b/FS/t/access_right.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::access_right;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/access_user.t b/FS/t/access_user.t
new file mode 100644
index 000000000..cab679d8d
--- /dev/null
+++ b/FS/t/access_user.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::access_user;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/access_user_pref.t b/FS/t/access_user_pref.t
new file mode 100644
index 000000000..282209830
--- /dev/null
+++ b/FS/t/access_user_pref.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::access_user_pref;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/access_usergroup.t b/FS/t/access_usergroup.t
new file mode 100644
index 000000000..383a7cf9c
--- /dev/null
+++ b/FS/t/access_usergroup.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::access_usergroup;
+$loaded=1;
+print "ok 1\n";
diff --git a/htetc/handler.pl b/htetc/handler.pl
index e8cd3333b..cbe2dd35d 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -179,6 +179,8 @@ sub handler
       use FS::inventory_class;
       use FS::inventory_item;
       use FS::pkg_class;
+      use FS::access_user;
+      use FS::access_group;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
diff --git a/httemplate/autohandler b/httemplate/autohandler
index a3f7eb008..ad0ab8ba6 100644
--- a/httemplate/autohandler
+++ b/httemplate/autohandler
@@ -9,7 +9,15 @@ if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
 
   if ( lc($r->content_type) eq 'text/html' ) {
 
-    $profile = '<PRE>'. encode_entities(dbh->sprintProfile()).
+    # barely worth it, just in case someone tries to use profiling on a
+    # non-RT install
+    eval "use Text::Wrapper;";
+    die $@ if $@;
+
+    my $wrapper = new Text::Wrapper( columns => 80 );
+
+    $profile = '<PRE>'.
+               encode_entities( $wrapper->wrap( dbh->sprintProfile() ) ).
                #"\n\n". &sprintAutoProfile(). '</PRE>';
                "\n\n".                        '</PRE>';
   } 
diff --git a/httemplate/browse/access_group.html b/httemplate/browse/access_group.html
new file mode 100644
index 000000000..6ba89ea81
--- /dev/null
+++ b/httemplate/browse/access_group.html
@@ -0,0 +1,33 @@
+<%
+
+my $html_init = 
+  "Internal access groups control access to the back-office interface.<BR><BR>".
+  qq!<A HREF="${p}edit/access_group.html"><I>Add an internal access group</I></A><BR><BR>!;
+
+my $count_query = 'SELECT COUNT(*) FROM access_group';
+
+my $link = [ $p.'edit/access_group.html?', 'groupnum' ];
+
+%><%= include( 'elements/browse.html',
+                 'title'       => 'Internal Access Groups',
+                 'menubar'     => [ # 'Main menu' => $p,
+                                    'Internal users' => $p.'browse/access_user.html',
+                                  ],
+                 'html_init'   => $html_init,
+                 'name'        => 'internal access groups',
+                 'query'       => { 'table'     => 'access_group',
+                                    'hashref'   => {},
+                                    'extra_sql' => 'ORDER BY groupname', #??
+                                  },
+                 'count_query' => $count_query,
+                 'header'      => [ '#',
+                                    'Group name',
+                                  ],
+                 'fields'      => [ 'groupnum',
+                                    'groupname',
+                                  ],
+                 'links'       => [ $link,
+                                    $link,
+                                  ],
+             )
+%>
diff --git a/httemplate/browse/access_user.html b/httemplate/browse/access_user.html
new file mode 100644
index 000000000..38d5430b1
--- /dev/null
+++ b/httemplate/browse/access_user.html
@@ -0,0 +1,63 @@
+<%
+
+my $html_init = 
+  "Internal users have access to the back-office interface.  Typically, this is your employees and contractors, but in a VISP setup, you can also add accounts for your reseller's employees.  It is <B>highly recommended</B> to add a <B>separate account for each person</B> rather than using role accounts.<BR><BR>".
+  qq!<A HREF="${p}edit/access_user.html"><I>Add an internal user</I></A><BR><BR>!;
+
+#false laziness w/agent_type.cgi
+my $groups_sub = sub {
+  my $access_user = shift;
+
+  [ map {
+          my $access_usergroup = $_;
+          my $access_group = $access_usergroup->access_group;
+          [
+            {
+              'data'  => $access_group->groupname,
+              'align' => 'left',
+              'link'  =>
+                $p. 'edit/access_group.html?'. $access_usergroup->groupnum,
+            },
+          ];
+        }
+    grep { $_->access_group # and ! $_->access_group->disabled
+         }
+    $access_user->access_usergroup,
+
+  ];
+
+};
+
+my $count_query = 'SELECT COUNT(*) FROM access_user';
+
+my $link = [ $p.'edit/access_user.html?', 'usernum' ];
+
+%><%= include( 'elements/browse.html',
+                 'title'       => 'Internal Users',
+                 'menubar'     => [ #'Main menu' => $p,
+                                    'Internal access groups' => $p.'browse/access_group.html',
+                                  ],
+                 'html_init'   => $html_init,
+                 'name'        => 'internal users',
+                 'query'       => { 'table'     => 'access_user',
+                                    'hashref'   => {},
+                                    'extra_sql' => 'ORDER BY last, first',
+                                  },
+                 'count_query' => $count_query,
+                 'header'      => [ '#',
+                                    'Username',
+                                    'Full name',
+                                    'Groups'
+                                  ],
+                 'fields'      => [ 'usernum',
+                                    'username',
+                                    'name', # sub { shift->name },
+                                    $groups_sub,
+                                  ],
+                 'links'       => [ $link,
+                                    $link,
+                                    $link,
+                                    ''
+                                  ],
+             )
+%>
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index 2e1bdad42..a5ffb1048 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,60 +1,62 @@
-<!-- mason kludge -->
-<%= include("/elements/header.html","Agent Type Listing", menubar(
-  'Main Menu' => $p,
-  'Agents'    => $p. 'browse/agent.cgi',
-)) %>
-Agent types define groups of packages that you can then assign to particular
-agents.<BR><BR>
-<A HREF="<%= $p %>edit/agent_type.cgi"><I>Add a new agent type</I></A><BR><BR>
+<%
 
-<%= table() %>
-<TR>
-  <TH COLSPAN=2>Agent Type</TH>
-  <TH COLSPAN=2>Packages</TH>
-</TR>
+my $html_init = 
+  'Agent types define groups of packages that you can then assign to'.
+  ' particular agents.<BR><BR>'.
+  qq!<A HREF="${p}edit/agent_type.cgi"><I>Add a new agent type</I></A><BR><BR>!;
 
-<% 
-foreach my $agent_type ( sort { 
-  $a->getfield('typenum') <=> $b->getfield('typenum')
-} qsearch('agent_type',{}) ) {
-  my $hashref = $agent_type->hashref;
-  #more efficient to do this with SQL...
-  my @type_pkgs = grep { $_->part_pkg and ! $_->part_pkg->disabled }
-                       qsearch('type_pkgs',{'typenum'=> $hashref->{typenum} });
-  my $rowspan = scalar(@type_pkgs);
-  $rowspan = int($rowspan/2+0.5) ;
-  print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">
-          $hashref->{typenum}
-        </A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
-END
+my $count_query = 'SELECT COUNT(*) FROM agent_type';
 
-  my($type_pkgs);
-  my($tdcount) = -1 ;
-  foreach $type_pkgs ( @type_pkgs ) {
-    my($pkgpart)=$type_pkgs->getfield('pkgpart');
-    my($part_pkg) = qsearchs('part_pkg',{'pkgpart'=> $pkgpart });
-    print qq!<TR>! if ($tdcount == 0) ;
-    $tdcount = 0 if ($tdcount == -1) ;
-    print qq!<TD><A HREF="${p}edit/part_pkg.cgi?$pkgpart">!,
-          $part_pkg->getfield('pkg'),"</A></TD>";
-    $tdcount ++ ;
-    if ($tdcount == 2)
-    {
-	print qq!</TR>\n! ;
-	$tdcount = 0 ;
-    }
-  }
+#false laziness w/access_user.html
+my $packages_sub = sub {
+  my $agent_type = shift;
 
-  print "</TR>";
-}
+  [ map  {
+           my $type_pkgs = $_;
+           my $part_pkg = $type_pkgs->part_pkg;
+           [
+             {
+               'data'  => $part_pkg->pkg. ' - '. $part_pkg->comment,
+               'align' => 'left',
+               'link'  => $p. 'edit/part_pkg.cgi?'. $type_pkgs->pkgpart,
+             },
+           ];
+         }
+    #sort {
+    #     }
+    grep {
+           $_->part_pkg and ! $_->part_pkg->disabled
+         }
+    $agent_type->type_pkgs #XXX the method should order itself by something
+  ];
 
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
+};
 
+my $link = [ $p.'edit/agent_type.cgi?', 'typenum' ];
+
+%><%= include( 'elements/browse.html',
+                 'title'   => 'Agent Types',
+                 'menubar'     => [ #'Main menu' => $p,
+                                    'Agents'    =>"${p}browse/agent.cgi",
+                                  ],
+                 'html_init'   => $html_init,
+                 'name'        => 'agent types',
+                 'query'       => { 'table'     => 'agent_type',
+                                    'hashref'   => {},
+                                    'extra_sql' => 'ORDER BY typenum', # 'ORDER BY atype',
+                                  },
+                 'count_query' => $count_query,
+                 'header'      => [ '#',
+                                    'Agent Type',
+                                    'Packages',
+                                  ],
+                 'fields'      => [ 'typenum',
+                                    'atype',
+                                    $packages_sub,
+                                  ],
+                 'links'       => [ $link,
+                                    $link,
+                                    '',
+                                  ],
+             )
 %>
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 1e0e0880c..9e3feb8f3 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,33 +1,34 @@
-<!-- mason kludge -->
-<%
+<%= include('/elements/header.html', "Tax Rate Listing", menubar(
+  'Edit tax rates' => $p. "edit/cust_main_county.cgi",
+)) %>
+
+    Click on <u>expand country</u> to specify a country's tax rates by state.
+    <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
 
+<%
 my $conf = new FS::Conf;
 my $enable_taxclasses = $conf->exists('enable_taxclasses');
 
-print header("Tax Rate Listing", menubar(
-  'Main Menu' => $p,
-  'Edit tax rates' => $p. "edit/cust_main_county.cgi",
-)),<<END;
-    Click on <u>expand country</u> to specify a country's tax rates by state.
-    <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
-END
+if ( $enable_taxclasses ) { %>
 
-if ( $enable_taxclasses ) {
-  print '<BR>Click on <u>expand taxclasses</u> to specify tax classes';
-}
+  <BR>Click on <u>expand taxclasses</u> to specify tax classes
 
-print '<BR><BR>'. &table(). <<END;
-      <TR>
-        <TH><FONT SIZE=-1>Country</FONT></TH>
-        <TH><FONT SIZE=-1>State</FONT></TH>
-        <TH>County</TH>
-        <TH>Taxclass<BR><FONT SIZE=-1>(per-package classification)</FONT></TH>
-        <TH>Tax name<BR><FONT SIZE=-1>(printed on invoices)</FONT></TH>
-        <TH><FONT SIZE=-1>Tax</FONT></TH>
-        <TH><FONT SIZE=-1>Exemption</TH>
-      </TR>
-END
+<% } %>
+
+<BR><BR>
+<%= table() %>
+
+  <TR>
+    <TH><FONT SIZE=-1>Country</FONT></TH>
+    <TH><FONT SIZE=-1>State</FONT></TH>
+    <TH>County</TH>
+    <TH>Taxclass<BR><FONT SIZE=-1>(per-package classification)</FONT></TH>
+    <TH>Tax name<BR><FONT SIZE=-1>(printed on invoices)</FONT></TH>
+    <TH><FONT SIZE=-1>Tax</FONT></TH>
+    <TH><FONT SIZE=-1>Exemption</TH>
+  </TR>
 
+<%
 my @regions = sort {    $a->country  cmp $b->country
                      or $a->state    cmp $b->state
                      or $a->county   cmp $b->county
@@ -39,10 +40,12 @@ my $sup=0;
 for ( my $i=0; $i<@regions; $i++ ) { 
   my $cust_main_county = $regions[$i];
   my $hashref = $cust_main_county->hashref;
-  print <<END;
+
+  %>
       <TR>
-        <TD BGCOLOR="#ffffff">$hashref->{country}</TD>
-END
+        <TD BGCOLOR="#ffffff"><%= $hashref->{country} %></TD>
+
+  <%
 
   my $j;
   if ( $sup ) {
@@ -74,69 +77,73 @@ END
       $j = 1;
     }
 
-    print "<TD ROWSPAN=$j", $hashref->{state}
+    %>
+
+    <TD ROWSPAN=<%= $j %><%=
+      $hashref->{state}
         ? ' BGCOLOR="#ffffff">'. $hashref->{state}
         : qq! BGCOLOR="#cccccc">(ALL) <FONT SIZE=-1>!.
           qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
-          qq!">expand country</A></FONT>!;
-
-    print qq! <FONT SIZE=-1><A HREF="${p}edit/process/cust_main_county-collapse.cgi?!. $hashref->{taxnum}. qq!">collapse state</A></FONT>! if $j>1;
-
-    print "</TD>";
-  }
-
-#  $sup=$newsup;
-
-  print "<TD";
-  if ( $hashref->{county} ) {
-    print ' BGCOLOR="#ffffff">'. $hashref->{county};
-  } else {
-    print ' BGCOLOR="#cccccc">(ALL)';
-    if ( $hashref->{state} ) {
-      print qq!<FONT SIZE=-1>!.
-          qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
-          qq!">expand state</A></FONT>!;
-    }
-  }
-  print "</TD>";
-
-  print "<TD";
-  if ( $hashref->{taxclass} ) {
-    print ' BGCOLOR="#ffffff">'. $hashref->{taxclass};
-  } else {
-    print ' BGCOLOR="#cccccc">(ALL)';
-    if ( $enable_taxclasses ) {
-      print qq!<FONT SIZE=-1>!.
-            qq!<A HREF="${p}edit/cust_main_county-expand.cgi?taxclass!.
-            $hashref->{taxnum}. qq!">expand taxclasses</A></FONT>!;
-    }
-
-  }
-  print "</TD>";
-
-  print "<TD";
-  if ( $hashref->{taxname} ) {
-    print ' BGCOLOR="#ffffff">'. $hashref->{taxname};
-  } else {
-    print ' BGCOLOR="#cccccc">Tax';
-  }
-  print "</TD>";
-
-  print "<TD BGCOLOR=\"#ffffff\">$hashref->{tax}%</TD>".
-        '<TD BGCOLOR="#ffffff">';
-  print '$'. sprintf("%.2f", $hashref->{exempt_amount} ).
-        '&nbsp;per&nbsp;month<BR>'
-    if $hashref->{exempt_amount} > 0;
-  print 'Setup&nbsp;fee<BR>' if $hashref->{setuptax} =~ /^Y$/i;
-  print 'Recurring&nbsp;fee<BR>' if $hashref->{recurtax} =~ /^Y$/i;
-  print '</TD></TR>';
-
-}
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-%>
+          qq!">expand country</A></FONT>!
+      %>
+      <% if ( $j>1 ) { %>
+        <FONT SIZE=-1><A HREF="<%= $p %>edit/process/cust_main_county-collapse.cgi?<%= $hashref->{taxnum} %>">collapse state</A></FONT>
+      <% } %>
+
+    </TD>
+  <% } %>
+
+<% #  $sup=$newsup; %>
+
+    <TD<% if ( $hashref->{county} ) {
+            %> BGCOLOR="#ffffff"><%= $hashref->{county} %>
+       <% } else {
+            %> BGCOLOR="#cccccc">(ALL)
+            <% if ( $hashref->{state} ) { %>
+                 <FONT SIZE=-1><A HREF="<%= $p %>edit/cust_main_county-expand.cgi?<%= $hashref->{taxnum} %>">expand state</A></FONT>
+            <% } %>
+       <% } %>
+    </TD>
+
+    <TD<% if ( $hashref->{taxclass} ) {
+            %> BGCOLOR="#ffffff"><%= $hashref->{taxclass} %>
+       <% } else {
+            %> BGCOLOR="#cccccc">(ALL)
+            <% if ( $enable_taxclasses ) { %>
+                 <FONT SIZE=-1><A HREF="<%= $p %>edit/cust_main_county-expand.cgi?taxclass<%= $hashref->{taxnum} %>">expand taxclasses</A></FONT>
+            <% } %>
+       <% } %>
+    </TD>
+
+    <TD<% if ( $hashref->{taxname} ) {
+            %> BGCOLOR="#ffffff"><%= $hashref->{taxname} %>
+       <% } else {
+            %> BGCOLOR="#cccccc">Tax
+       <% } %>
+    </TD>
+
+    <TD BGCOLOR="#ffffff"><%= $hashref->{tax} %>%</TD>
+
+    <TD BGCOLOR="#ffffff">
+
+      <% if ( $hashref->{exempt_amount} > 0 ) { %>
+        $<%= sprintf("%.2f", $hashref->{exempt_amount} ) %>&nbsp;per&nbsp;month<BR>
+      <% } %>
+
+      <% if ( $hashref->{setuptax} =~ /^Y$/i ) { %>
+        Setup&nbsp;fee<BR>
+      <% } %>
+      
+      <% if ( $hashref->{recurtax} =~ /^Y$/i ) { %>
+        Recurring&nbsp;fee<BR>
+      <% } %>
+
+    </TD>
+
+  </TR>
+
+<% } %>
+
+</TABLE>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/browse/msgcat.cgi b/httemplate/browse/msgcat.cgi
index d4adf9f1a..318ebfdff 100755
--- a/httemplate/browse/msgcat.cgi
+++ b/httemplate/browse/msgcat.cgi
@@ -1,10 +1,6 @@
-<!-- mason kludge -->
-<%
-
-print header("View Message catalog", menubar(
-  'Main Menu' => $p,
+<%= include('/elements/header.html', "View Message catalog", menubar(
   'Edit message catalog' => $p. "edit/msgcat.cgi",
-)), '<BR>';
+)) %><%
 
 my $widget = new HTML::Widgets::SelectLayers(
   'selected_layer' => 'en_US',
@@ -38,13 +34,7 @@ my $widget = new HTML::Widgets::SelectLayers(
   },
 
 );
-
-print $widget->html;
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
 %>
+
+<%=  $widget->html %>
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 0afa54750..41d86358c 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -11,8 +11,8 @@ my $select = '*';
 my $orderby = 'pkgpart';
 if ( $cgi->param('active') ) {
 
-  $orderby = 'num_active';
-
+  $orderby = 'num_active DESC';
+}
   $select = "
 
     *,
@@ -33,13 +33,13 @@ if ( $cgi->param('active') ) {
 
   ";
 
-}
+#}
 
 my $conf = new FS::Conf;
 my $taxclasses = $conf->exists('enable_taxclasses');
 
 my $html_init;
-unless ( $cgi->param('active') ) {
+#unless ( $cgi->param('active') ) {
   $html_init = qq!
     One or more service definitions are grouped together into a package 
     definition and given pricing information.  Customers purchase packages
@@ -47,7 +47,7 @@ unless ( $cgi->param('active') ) {
     <A HREF="${p}edit/part_pkg.cgi"><I>Add a new package definition</I></A>
     <BR><BR>
   !;
-}
+#}
 
 my $posttotal;
 if ( $cgi->param('showdisabled') ) {
@@ -85,7 +85,7 @@ unless ( 0 ) { #already showing only one class or something?
   $align .= 'l';
 }
 
-if ( $cgi->param('active') ) {
+#if ( $cgi->param('active') ) {
   push @header, 'Customer<BR>packages';
   my %col = (
     'active'      => '00CC00',
@@ -117,7 +117,7 @@ if ( $cgi->param('active') ) {
                             } (qw( active suspended cancelled ))
                       ]; };
   $align .= 'r';
-}
+#}
 
 push @header, 'Frequency';
 push @fields, sub { shift->freq_pretty; };
diff --git a/httemplate/edit/access_group.html b/httemplate/edit/access_group.html
new file mode 100644
index 000000000..11b8df7bc
--- /dev/null
+++ b/httemplate/edit/access_group.html
@@ -0,0 +1,10 @@
+<%= include( 'elements/edit.html',
+                 'name'   => 'Internal Access Group',
+                 'table'  => 'access_group',
+                 'labels' => { 
+                               'groupnum'   => 'Group number',
+                               'groupname'  => 'Group name',
+                             },
+                 'viewall_dir' => 'browse',
+           )
+%>
diff --git a/httemplate/edit/access_user.html b/httemplate/edit/access_user.html
new file mode 100644
index 000000000..2b19dbf7b
--- /dev/null
+++ b/httemplate/edit/access_user.html
@@ -0,0 +1,37 @@
+<%= include( 'elements/edit.html',
+                 'name'   => 'Internal User',
+                 'table'  => 'access_user',
+                 'fields' => [
+                               'username',
+                               { field=>'_password', type=>'password' },
+                               'last',
+                               'first',
+                             ],
+                 'labels' => { 
+                               'usernum'   => 'User number',
+                               'username'  => 'Username',
+                               '_password' => 'Password',
+                               'last'      => 'Last name',
+                               'first'     => 'First name',
+                             },
+                 'viewall_dir' => 'browse',
+                 'html_bottom' =>
+                   sub {
+                     my $access_user = shift;
+
+                     '<BR>Internal Access Groups<BR>'.
+                     ntable("#cccccc",2).
+                     '<TR><TD>'.
+                     include( '/elements/checkboxes-table.html',
+                                'source_obj'   => $access_user,
+                                'link_table'   => 'access_usergroup',
+                                'target_table' => 'access_group',
+                                'name_col'     => 'groupname',
+                                'target_link'  => $p.'edit/access_group.html?',
+                                #'disable-able' => 1,
+                            ).
+                     '</TR></TD></TABLE>'
+                     ;
+                   },
+           )
+%>
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 944ddd0d0..f5afd3a96 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -14,9 +14,7 @@ if ( $cgi->param('error') ) {
 }
 my $action = $agent_type->typenum ? 'Edit' : 'Add';
 
-%>
-
-<%= include("/elements/header.html","$action Agent Type", menubar(
+%><%= include("/elements/header.html","$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
 ))
@@ -29,47 +27,29 @@ my $action = $agent_type->typenum ? 'Edit' : 'Add';
 <FORM ACTION="<%= popurl(1) %>process/agent_type.cgi" METHOD=POST>
 <INPUT TYPE="hidden" NAME="typenum" VALUE="<%= $agent_type->typenum %>">
 Agent Type #<%= $agent_type->typenum || "(NEW)" %>
-<BR><BR>
+<BR>
 
 Agent Type
 <INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="<%= $agent_type->atype %>">
 <BR><BR>
 
 Select which packages agents of this type may sell to customers<BR>
-
-<% foreach my $part_pkg (
-     qsearch({ 'table'     => 'part_pkg',
-               'hashref'   => { 'disabled' => '' },
-               'select'    => 'part_pkg.*',
-               'addl_from' => 'LEFT JOIN type_pkgs USING ( pkgpart )',
-               'extra_sql' => ( $agent_type->typenum
-                                  ? 'OR typenum = '. $agent_type->typenum
-                                  : ''
-                              ),
-            })
-   ) {
+<%= ntable("#cccccc", 2) %><TR><TD>
+<%= include('/elements/checkboxes-table.html',
+              'source_obj'    => $agent_type,
+              'link_table'    => 'type_pkgs',
+              'target_table'  => 'part_pkg',
+              'name_callback' => sub { $_[0]->pkg. ' - '. $_[0]->comment; },
+              'target_link'   => $p.'edit/part_pkg.cgi?',
+              'disable-able'  => 1,
+
+           )
 %>
-
-  <BR>
-  <INPUT TYPE="checkbox" NAME="pkgpart<%= $part_pkg->pkgpart %>" <%=
-        qsearchs('type_pkgs',{
-          'typenum' => $agent_type->typenum,
-          'pkgpart' => $part_pkg->pkgpart,
-        })
-          ? 'CHECKED '
-          : ''
-  %> VALUE="ON">
-
-  <A HREF="<%= $p %>edit/part_pkg.cgi?<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkgpart %>: 
-  <%= $part_pkg->pkg %> - <%= $part_pkg->comment %></A>
-  <%= $part_pkg->disabled =~ /^Y/i ? ' (DISABLED)' : '' %>
-
-<% } %>
-
-<BR><BR>
+</TD></TR></TABLE>
+<BR>
 
 <INPUT TYPE="submit" VALUE="<%= $agent_type->typenum ? "Apply changes" : "Add agent type" %>">
 
     </FORM>
-  </BODY>
-</HTML>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index 24bce308a..9d3bdd8cb 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my($paynum, $amount, $invnum);
@@ -18,78 +17,76 @@ my $otaker = getotaker;
 
 my $p1 = popurl(1);
 
-print header("Apply Payment", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT><BR><BR>"
-  if $cgi->param('error');
-print <<END;
-    <FORM ACTION="${p1}process/cust_bill_pay.cgi" METHOD=POST>
-END
+%><%= header("Apply Payment", '') %>
 
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
+<% } %>
+
+<FORM ACTION="<%= $p1 %>process/cust_bill_pay.cgi" METHOD=POST>
+
+<%
 my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
 die "payment $paynum not found!" unless $cust_pay;
 
 my $unapplied = $cust_pay->unapplied;
+%>
+
+Payment #<B><%= $paynum %></B>
+<INPUT TYPE="hidden" NAME="paynum" VALUE="<%= $paynum %>">
 
-print "Payment # <B>$paynum</B>".
-      qq!<INPUT TYPE="hidden" NAME="paynum" VALUE="$paynum">!.
-      '<BR>Date: <B>'. time2str("%D", $cust_pay->_date). '</B>'.
-      '<BR>Amount: $<B>'. $cust_pay->paid. '</B>'.
-      "<BR>Unapplied amount: \$<B>$unapplied</B>"
-      ;
+<BR>Date: <B><%= time2str("%D", $cust_pay->_date) %></B>
 
+<BR>Amount: $<B><%= $cust_pay->paid %></B>
+
+<BR>Unapplied amount: $<B><%= $unapplied %></B>
+
+<%
 my @cust_bill = grep $_->owed != 0,
                 qsearch('cust_bill', { 'custnum' => $cust_pay->custnum } );
 
-print <<END;
+%>
+
 <SCRIPT>
 function changed(what) {
   cust_bill = what.options[what.selectedIndex].value;
-END
 
-foreach my $cust_bill ( @cust_bill ) {
+<% foreach my $cust_bill ( @cust_bill ) {
   my $invnum = $cust_bill->invnum;
   my $changeto = $cust_bill->owed < $unapplied
                    ? $cust_bill->owed 
                    : $unapplied;
-  print <<END;
+%>
   if ( cust_bill == $invnum ) {
-    what.form.amount.value = "$changeto";
+    what.form.amount.value = "<%= $changeto %>";
   }
-END
-}
+<% } %>
 
-print <<END;
   if ( cust_bill == "Refund" ) {
-    what.form.amount.value = "$unapplied";
+    what.form.amount.value = "<%= $unapplied %>";
   }
 }
 </SCRIPT>
-END
-
-print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
-      '<OPTION VALUE="">';
-foreach my $cust_bill ( @cust_bill ) {
-  print '<OPTION'. ( $cust_bill->invnum eq $invnum ? ' SELECTED' : '' ).
-        ' VALUE="'. $cust_bill->invnum. '">'. $cust_bill->invnum.
-        ' -  '. time2str("%D",$cust_bill->_date).
-        ' - $'. $cust_bill->owed;
-}
-print qq!<OPTION VALUE="Refund">Refund!;
-print "</SELECT>";
 
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">
+<OPTION VALUE="">
+
+<% foreach my $cust_bill ( @cust_bill ) { %>
+
+  <OPTION<%= $cust_bill->invnum eq $invnum ? ' SELECTED' : '' %> VALUE="<%= $cust_bill->invnum %>"><%= $cust_bill->invnum %> - <%= time2str("%D", $cust_bill->_date) %> - $<%= $cust_bill->owed %>
+
+<% } %>
+
+<OPTION VALUE="Refund">Refund
+</SELECT>
+
+<BR>Amount $<INPUT TYPE="text" NAME="amount" VALUE="<%= $amount %>" SIZE=8 MAXLENGTH=8>
 
-print <<END;
 <BR>
-<INPUT TYPE="submit" VALUE="Apply">
-END
+<CENTER><INPUT TYPE="submit" VALUE="Apply"></CENTER>
 
-print <<END;
+</FORM>
 
-    </FORM>
-  </BODY>
+</BODY>
 </HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index aae0df2fc..946b1087b 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
@@ -25,39 +24,57 @@ my $otaker = getotaker;
 
 my $p1 = popurl(1);
 
-print header("Post Credit", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-print <<END, small_custview($custnum, $conf->config('countrydefault'));
-    <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
-    <INPUT TYPE="hidden" NAME="crednum" VALUE="">
-    <INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">
-    <INPUT TYPE="hidden" NAME="paybatch" VALUE="">
-    <INPUT TYPE="hidden" NAME="_date" VALUE="$_date">
-    <INPUT TYPE="hidden" NAME="credited" VALUE="">
-    <INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">
-END
-
-print '<BR><BR>Credit'. ntable("#cccccc", 2).
-      '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
-      time2str("%D",$_date).  '</TD></TR>';
-
-print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8></TD></TR>!;
+%>
+
+<%= header("Post Credit", '') %>
+
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
+<% } %>
+
+<!-- <%= small_custview($custnum, $conf->config('countrydefault')) %> -->
+
+<FORM ACTION="<%= $p1 %>process/cust_credit.cgi" METHOD=POST>
+<INPUT TYPE="hidden" NAME="crednum" VALUE="">
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
+<INPUT TYPE="hidden" NAME="paybatch" VALUE="">
+<INPUT TYPE="hidden" NAME="_date" VALUE="<%= $_date %>">
+<INPUT TYPE="hidden" NAME="credited" VALUE="">
+<INPUT TYPE="hidden" NAME="otaker" VALUE="<%= $otaker %>">
+
+Credit
+
+<%= ntable("#cccccc", 2) %>
 
+  <TR>
+    <TD ALIGN="right">Date</TD>
+    <TD BGCOLOR="#ffffff"><%= time2str("%D",$_date) %></TD>
+  </TR>
+
+  <TR>
+    <TD ALIGN="right">Amount</TD>
+    <TD BGCOLOR="#ffffff">$<INPUT TYPE="text" NAME="amount" VALUE="<%= $amount %>" SIZE=8 MAXLENGTH=8></TD>
+  </TR>
+
+<%
 #print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
+%>
 
-print qq!<TR><TD ALIGN="right">Reason</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="reason" VALUE="$reason"></TD></TR>!;
+  <TR>
+    <TD ALIGN="right">Reason</TD>
+    <TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="reason" VALUE="<%= $reason %>" SIZE=32></TD>
+  </TR>
 
-print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
+  <TR>
+    <TD ALIGN="right">Auto-apply<BR>to invoices</TD>
+    <TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>
+  </TR>
 
-print <<END;
 </TABLE>
+
 <BR>
-<INPUT TYPE="submit" VALUE="Post credit">
+<CENTER><INPUT TYPE="submit" VALUE="Post credit"></CENTER>
     </FORM>
   </BODY>
 </HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 1a97e1312..409ea3c25 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my($crednum, $amount, $invnum);
@@ -23,79 +22,78 @@ my $otaker = getotaker;
 
 my $p1 = popurl(1);
 
-print header("Apply Credit", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT><BR><BR>"
-  if $cgi->param('error');
-print <<END;
-    <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
-END
+%><%=  header("Apply Credit", '') %>
 
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
+<% } %>
+
+<FORM ACTION="<%= $p1 %>process/cust_credit_bill.cgi" METHOD=POST>
+
+<%
 my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
 die "credit $crednum not found!" unless $cust_credit;
 
 my $credited = $cust_credit->credited;
+%>
+
+Credit #<B><%= $crednum %></B>
+<INPUT TYPE="hidden" NAME="crednum" VALUE="<%= $crednum %>">
+
+<BR>Date: <B><%= time2str("%D", $cust_credit->_date) %></B>
 
-print "Credit # <B>$crednum</B>".
-      qq!<INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!.
-      '<BR>Date: <B>'. time2str("%D", $cust_credit->_date). '</B>'.
-      '<BR>Amount: $<B>'. $cust_credit->amount. '</B>'.
-      "<BR>Unapplied amount: \$<B>$credited</B>".
-      '<BR>Reason: <B>'. $cust_credit->reason. '</B>'
-      ;
+<BR>Amount: $<B><%= $cust_credit->amount %></B>
 
+<BR>Unapplied amount: $<B><%= $credited %></B>
+
+<BR>Reason: <B><%= $cust_credit->reason %></B>
+
+<%
 my @cust_bill = grep $_->owed != 0,
                 qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } );
 
-print <<END;
+%>
+
 <SCRIPT>
 function changed(what) {
   cust_bill = what.options[what.selectedIndex].value;
-END
 
-foreach my $cust_bill ( @cust_bill ) {
+<% foreach my $cust_bill ( @cust_bill ) {
   my $invnum = $cust_bill->invnum;
   my $changeto = $cust_bill->owed < $cust_credit->credited
                    ? $cust_bill->owed 
                    : $cust_credit->credited;
-  print <<END;
+%>
   if ( cust_bill == $invnum ) {
-    what.form.amount.value = "$changeto";
+    what.form.amount.value = "<%= $changeto %>";
   }
-END
-}
+<% } %>
 
-print <<END;
   if ( cust_bill == "Refund" ) {
-    what.form.amount.value = "$credited";
+    what.form.amount.value = "<%= $credited %>";
   }
 }
 </SCRIPT>
-END
-
-print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
-      '<OPTION VALUE="">';
-foreach my $cust_bill ( @cust_bill ) {
-  print '<OPTION'. ( $cust_bill->invnum eq $invnum ? ' SELECTED' : '' ).
-        ' VALUE="'. $cust_bill->invnum. '">'. $cust_bill->invnum.
-        ' -  '. time2str("%D",$cust_bill->_date).
-        ' - $'. $cust_bill->owed;
-}
-print qq!<OPTION VALUE="Refund">Refund!;
-print "</SELECT>";
 
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">
+<OPTION VALUE="">
+
+<% foreach my $cust_bill ( @cust_bill ) { %>
+
+<OPTION<%= $cust_bill->invnum eq $invnum ? ' SELECTED' : '' %> VALUE="<%= $cust_bill->invnum %>"><%= $cust_bill->invnum %> - <%= time2str("%D",$cust_bill->_date) %> - $<%= $cust_bill->owed %>
+
+<% } %>
+
+<OPTION VALUE="Refund">Refund
+</SELECT>
+
+<BR>Amount $<INPUT TYPE="text" NAME="amount" VALUE="<%= $amount %>" SIZE=8 MAXLENGTH=8>
 
-print <<END;
 <BR>
-<INPUT TYPE="submit" VALUE="Apply">
-END
+<CENTER><INPUT TYPE="submit" VALUE="Apply"></CENTER>
 
-print <<END;
+</FORM>
 
-    </FORM>
-  </BODY>
+</BODY>
 </HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 80fec9359..bb2a8618e 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -397,49 +397,66 @@ unless ( $custnum ) {
 
   if ( @part_pkg ) {
 
-#    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"),
-#apiabuse & undesirable wrapping
-    print "<BR>First package", &ntable("#cccccc"),
-          qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
-
-    print qq!<OPTION VALUE="">(none)!;
-
-    foreach my $part_pkg ( @part_pkg ) {
-      print qq!<OPTION VALUE="!,
-#              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
-              $part_pkg->pkgpart. "_". $part_pkg->svcpart('svc_acct'), '"';
-      print " SELECTED" if $saved_pkgpart && ( $part_pkg->pkgpart == $saved_pkgpart );
-      print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
-    }
-    print "</SELECT></TD></TR>";
-
-    #false laziness: (mostly) copied from edit/svc_acct.cgi
-    #$ulen = $svc_acct->dbdef_table->column('username')->length;
-    my $ulen = dbdef->table('svc_acct')->column('username')->length;
-    my $ulen2 = $ulen+2;
-    my $passwordmax = $conf->config('passwordmax') || 8;
-    my $pmax2 = $passwordmax + 2;
-    print <<END;
-<TR><TD ALIGN="right">Username</TD>
-<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
-<TR><TD ALIGN="right">Password</TD>
-<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=$pmax2 MAXLENGTH=$passwordmax>
-(blank to generate)</TD></TR>
-END
-
-    print '<TR><TD ALIGN="right">Access number</TD><TD>'
-          .
-          &FS::svc_acct_pop::popselector($popnum).
-          '</TD></TR></TABLE>'
-          ;
-  }
-}
+    #    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"),
+    #apiabuse & undesirable wrapping
+
+    %>
+    <BR>First package
+    <%= ntable("#cccccc") %>
+    
+      <TR>
+        <TD COLSPAN=2>
+          <SELECT NAME="pkgpart_svcpart">
+            <OPTION VALUE="">(none)
+    
+            <% foreach my $part_pkg ( @part_pkg ) { %>
+    
+              <OPTION VALUE="<%= $part_pkg->pkgpart. "_". $part_pkg->svcpart('svc_acct') %>"<%= ( $saved_pkgpart && $part_pkg->pkgpart == $saved_pkgpart ) ? ' SELECTED' : '' %>><%= $part_pkg->pkg. " - ". $part_pkg->comment %>
+    
+            <% } %>
+          </SELECT>
+        </TD>
+      </TR>
+    
+      <% 
+        #false laziness: (mostly) copied from edit/svc_acct.cgi
+        #$ulen = $svc_acct->dbdef_table->column('username')->length;
+        my $ulen = dbdef->table('svc_acct')->column('username')->length;
+        my $ulen2 = $ulen+2;
+        my $passwordmax = $conf->config('passwordmax') || 8;
+        my $pmax2 = $passwordmax + 2;
+      %>
+    
+      <TR>
+        <TD ALIGN="right">Username</TD>
+        <TD>
+          <INPUT TYPE="text" NAME="username" VALUE="<%= $username %>" SIZE=<%= $ulen2 %> MAXLENGTH=<%= $ulen %>>
+        </TD>
+      </TR>
+    
+      <TR>
+        <TD ALIGN="right">Password</TD>
+        <TD>
+          <INPUT TYPE="text" NAME="_password" VALUE="<%= $password %>" SIZE=<%= $pmax2 %> MAXLENGTH=<%= $passwordmax %>>
+          (blank to generate)
+        </TD>
+      </TR>
+    
+      <TR>
+        <TD ALIGN="right">Access number</TD>
+        <TD><%= FS::svc_acct_pop::popselector($popnum) %></TD>
+      </TR>
+    </TABLE>
+    
+  <% } %>
+
+<% } %>
 
-my $otaker = $cust_main->otaker;
-print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
-      qq!<BR><INPUT TYPE="submit" NAME="submit" VALUE="!,
-      $custnum ?  "Apply Changes" : "Add Customer", qq!"><BR>!,
-      "</FORM></DIV></BODY></HTML>",
-;
+<INPUT TYPE="hidden" NAME="otaker" VALUE="<%= $cust_main->otaker %>">
+<BR>
+<INPUT TYPE="submit" NAME="submit" VALUE="<%= $custnum ?  "Apply Changes" : "Add Customer" %>">
+<BR>
+</FORM>
+
+<%= include('/elements/footer.html') %>
 
-%>
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index ce1c86612..174d4dde1 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my %pkg = ();
@@ -29,48 +28,62 @@ if ( $cgi->param('error') ) {
 }
 
 my $p1 = popurl(1);
-print header("Add/Edit Packages", '');
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+%><%= include('/elements/header.html', "Add/Edit Packages", '') %>
 
-print qq!<FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>!;
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
 
-print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+<FORM ACTION="<%= $p1 %>process/cust_pkg.cgi" METHOD=POST>
 
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
+
+<%
 #current packages
-my @cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
+my @cust_pkg = qsearch('cust_pkg', { 'custnum' => $custnum, 'cancel' => '' } );
 
 if (@cust_pkg) {
-  print <<END;
-Current packages - select to remove (services are moved to a new package below)
-<TABLE>
-  <TR STYLE="background-color: #cccccc;">
-    <TH COLSPAN="2">Pkg #</TH>
-    <TH>Package description</TH>
-  </TR>
-<BR><BR>
-END
+%>
+
+  Current packages - select to remove (services are moved to a new package below)
+  <TABLE>
+    <TR STYLE="background-color: #cccccc;">
+      <TH COLSPAN="2">Pkg #</TH>
+      <TH>Package description</TH>
+    </TR>
+  <BR><BR>
 
-  foreach (sort { $all_pkg{$a->getfield('pkgpart')} cmp $all_pkg{$b->getfield('pkgpart')} } @cust_pkg) {
+  <%
+
+  foreach ( sort {     $all_pkg{ $a->getfield('pkgpart') }
+                   cmp $all_pkg{ $b->getfield('pkgpart') }
+                 }
+                 @cust_pkg
+          )
+  {
     my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
     my $checked = $remove_pkg{$pkgnum} ? ' CHECKED' : '';
-    print <<END;
-  <TR>
-    <TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"${checked}></TD>
-    <TD ALIGN="right">$pkgnum:</TD>\n
-    <TD>$all_pkg{$pkgpart} - $all_comment{$pkgpart}</TD>
-  </TR>
-END
-  }
-  print qq!</TABLE><BR><BR>!;
-}
 
-print <<END;
-Order new packages<BR><BR>
-END
+  %>
+
+    <TR>
+      <TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="<%= $pkgnum %>"<%= $checked %>></TD>
+      <TD ALIGN="right"><%= $pkgnum %>:</TD>
+      <TD><%= $all_pkg{$pkgpart} %> - <%= $all_comment{$pkgpart} %></TD>
+    </TR>
+
+  <% } %>
+
+  </TABLE>
+  <BR><BR>
 
+<% } %>
+
+Order new packages
+<BR><BR>
+
+<%
 my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 my $agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
 
@@ -79,13 +92,15 @@ my %agent_pkgs = map { ( $_->pkgpart , $all_pkg{$_->pkgpart} ) }
 
 my $count = 0;
 my $pkgparts = 0;
-print <<END;
+%>
+
 <TABLE>
   <TR STYLE="background-color: #cccccc;">
     <TH>Qty.</TH>
     <TH COLSPAN="2">Package Description</TH>
   </TR>
-END
+
+<%
 #foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
 foreach my $pkgpart ( sort { $agent_pkgs{$a} cmp $agent_pkgs{$b} }
                              keys(%agent_pkgs) ) {
@@ -93,38 +108,43 @@ foreach my $pkgpart ( sort { $agent_pkgs{$a} cmp $agent_pkgs{$b} }
   next unless exists $pkg{$pkgpart}; #skip disabled ones
   #print qq!<TR>! if ( $count == 0 );
   my $value = $cgi->param("pkg$pkgpart") || 0;
-  print <<END;
+%>
+
   <TR>
-    <TD><INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2"></TD>
-    <TD ALIGN="right">$pkgpart:</TD>
-    <TD>$pkg{$pkgpart} - $comment{$pkgpart}</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="<%= "pkg$pkgpart" %>" VALUE="<%= $value %>" SIZE="2" MAXLENGTH="2">
+    </TD>
+    <TD ALIGN="right"><%= $pkgpart %>:</TD>
+    <TD><%= $pkg{$pkgpart} %> - <%= $comment{$pkgpart}%></TD>
   </TR>
-END
+
+<%
   $count ++ ;
   #if ( $count == 2 ) {
   #  print qq!</TR>\n! ;
   #  $count = 0;
   #}
 }
-print qq!</TABLE>!;
-
-unless ( $pkgparts ) {
-  my $p2 = popurl(2);
-  my $typenum = $agent->typenum;
-  my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
-  my $atype = $agent_type->atype;
-  print <<END;
-(No <a href="${p2}browse/part_pkg.cgi">package definitions</a>, or agent type
-<a href="${p2}edit/agent_type.cgi?$typenum">$atype</a> not allowed to purchase
-any packages.)
-END
-}
+%>
 
-#submit
-print <<END;
-<P><INPUT TYPE="submit" VALUE="Order">
-    </FORM>
-  </BODY>
-</HTML>
-END
+</TABLE>
+
+<% unless ( $pkgparts ) {
+     my $p2 = popurl(2);
+     my $typenum = $agent->typenum;
+     my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
+     my $atype = $agent_type->atype;
 %>
+
+     (No <A HREF="<%= $p2 %>browse/part_pkg.cgi">package definitions</A>,
+     or agent type
+     <A HREF="<%= $p2 %>edit/agent_type.cgi?<%= $typenum %>"><%= $atype %></a>
+     is not allowed to purchase any packages.)
+
+<% } %>
+
+<P><INPUT TYPE="submit" VALUE="Order">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 5486b4b00..120c03a3c 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -17,6 +17,13 @@
   # 'menubar'     => '', #menubar arrayref
   #
   # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
+  #
+  # 'html_bottom' => '', #string
+  # 'html_bottom' => sub {
+  #                        my $object = shift;
+  #                        # ...
+  #                        "html_string";
+  #                      },
 
   my(%opt) = @_;
 
@@ -27,6 +34,7 @@
   my $fields = $opt{'fields'}
                #|| [ grep { $_ ne $pkey } dbdef->table($table)->columns ];
                || [ grep { $_ ne $pkey } fields($table) ];
+  #my @actualfields = map { ref($_) ? $_->{'field'} : $_ } @$fields;
 
   my $object;
   if ( $cgi->param('error') ) {
@@ -63,10 +71,7 @@
     );
   }
 
-%>
-
-
-<%= include("/elements/header.html", $title,
+%><%= include("/elements/header.html", $title,
               include( '/elements/menubar.html', @menubar )
            )
 %>
@@ -86,7 +91,18 @@
 
 <%= ntable("#cccccc",2) %>
 
-<% foreach my $field ( @$fields ) { %>
+<% foreach my $f ( @$fields ) {
+
+    my( $field, $type);
+    if ( ref($f) ) {
+      $field = $f->{'field'},
+      $type  = $f->{'type'} || 'text',
+    } else {
+      $field = $f;
+      $type = 'text';
+    }
+
+%>
 
   <TR>
 
@@ -98,12 +114,11 @@
     </TD>
 
     <%
-      #just text in one size for now... eventually more options for
-      # uneditable, hidden, <SELECT>, etc. fields
+      #eventually more options for <SELECT>, etc. fields
     %>
 
     <TD>
-      <INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= $object->$field() %>">
+      <INPUT TYPE="<%= $type %>" NAME="<%= $field %>" VALUE="<%= $object->$field() %>">
     <TD>
 
   </TR>
@@ -112,6 +127,11 @@
 
 </TABLE>
 
+<%= ref( $opt{'html_bottom'} )
+      ? &{ $opt{'html_bottom'} }( $object )
+      : $opt{'html_bottom'}
+%>
+
 <BR>
 
 <INPUT TYPE="submit" VALUE="<%= $object->$pkey() ? "Apply changes" : "Add $opt{'name'}" %>">
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index f784dfa3e..dce1e6394 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my $part_referral;
@@ -17,32 +16,29 @@ my $action = $part_referral->refnum ? 'Edit' : 'Add';
 my $hashref = $part_referral->hashref;
 
 my $p1 = popurl(1);
-print header("$action Advertising source", menubar(
+
+%><%= include('/elements/header.html', "$action Advertising source", menubar(
   'Main Menu' => popurl(2),
   'View all advertising sources' => popurl(2). "browse/part_referral.cgi",
-));
+)) %>
+
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+<FORM ACTION="<%= $p1 %>process/part_referral.cgi" METHOD=POST>
 
-print qq!<FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>!;
+<INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $hashref->{refnum} %>">
 
-print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!;
+<%
 #print "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
+%>
 
-print <<END;
-Advertising source <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
-END
+Advertising source <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="<%= $hashref->{referral} %>">
 
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{refnum} ? "Apply changes" : "Add advertising source",
-      qq!">!;
+<BR>
+<INPUT TYPE="submit" VALUE="<%= $hashref->{refnum} ? "Apply changes" : "Add advertising source" %>">
 
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
+</FORM>
 
-%>
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/edit/part_virtual_field.cgi b/httemplate/edit/part_virtual_field.cgi
index fb10321e8..7b2c768a7 100644
--- a/httemplate/edit/part_virtual_field.cgi
+++ b/httemplate/edit/part_virtual_field.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 my ($vfieldpart, $part_virtual_field);
 
@@ -21,12 +20,14 @@ if ( $cgi->param('error') ) {
 my $action = $part_virtual_field->vfieldpart ? 'Edit' : 'Add';
 
 my $p1 = popurl(1);
-print header("$action Virtual Field Definition", '');
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-%>
+%><%= include('/elements/header.html', "$action Virtual Field Definition") %>
+
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
+<% } %>
+
 <FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST">
 
 <INPUT TYPE="hidden" NAME="table" VALUE="part_virtual_field">
@@ -83,10 +84,8 @@ Field #<B><%=$vfieldpart or "(NEW)"%></B><BR><BR>
 
 </FORM>
 
-<BR><BR>
+<BR>
 <FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
 <I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
 
-
-</BODY>
-</HTML>
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/edit/process/access_group.html b/httemplate/edit/process/access_group.html
new file mode 100644
index 000000000..e8c6d07b1
--- /dev/null
+++ b/httemplate/edit/process/access_group.html
@@ -0,0 +1,5 @@
+<%= include( 'elements/process.html',
+               'table'       => 'access_group',
+               'viewall_dir' => 'browse',
+           )
+%>
diff --git a/httemplate/edit/process/access_user.html b/httemplate/edit/process/access_user.html
new file mode 100644
index 000000000..a6c2a36b1
--- /dev/null
+++ b/httemplate/edit/process/access_user.html
@@ -0,0 +1,8 @@
+<%= include( 'elements/process.html',
+               'table'       => 'access_user',
+               'viewall_dir' => 'browse',
+               'process_m2m' => { 'link_table'   => 'access_usergroup',
+                                  'target_table' => 'access_group',
+                                },
+           )
+%>
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 516594573..fd8ca8833 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -11,43 +11,24 @@ my $new = new FS::agent_type ( {
 
 my $error;
 if ( $typenum ) {
-  $error=$new->replace($old);
+  $error = $new->replace($old);
 } else {
-  $error=$new->insert;
-  $typenum=$new->getfield('typenum');
+  $error    = $new->insert;
+  $typenum  = $new->getfield('typenum');
 }
+#$error  ||= $new->process_m2m( );
 
 if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
 } else {
 
-  #false laziness w/ edit/process/part_svc.cgi
-  foreach my $part_pkg (qsearch('part_pkg',{})) {
-    my($pkgpart)=$part_pkg->getfield('pkgpart');
-
-    my($type_pkgs)=qsearchs('type_pkgs',{
-        'typenum' => $typenum,
-        'pkgpart' => $pkgpart,
-    });
-    if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
-      my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
-      $error=$d_type_pkgs->delete;
-      die $error if $error;
-
-    } elsif ( $cgi->param("pkgpart$pkgpart")
-              && ! $type_pkgs
-    ) {
-      #ok to clobber it now (but bad form nonetheless?)
-      $type_pkgs=new FS::type_pkgs ({
-        'typenum' => $typenum,
-        'pkgpart' => $pkgpart,
-      });
-      $error= $type_pkgs->insert;
-      die $error if $error;
-    }
-
-  }
+  my $error = $new->process_m2m(
+    'link_table'   => 'type_pkgs',
+    'target_table' => 'part_pkg',
+    'params'       => scalar($cgi->Vars)
+  );
+  die $error if $error;
 
   print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
 }
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
index 0025b16b5..fc668bb07 100755
--- a/httemplate/edit/process/cust_bill_pay.cgi
+++ b/httemplate/edit/process/cust_bill_pay.cgi
@@ -33,11 +33,19 @@ if ($cgi->param('invnum') =~ /^Refund$/) {
 my $error = $new->insert;
 
 if ( $error ) {
+
   $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_bill_pay.cgi?". $cgi->query_string );
+  %><%= $cgi->redirect(popurl(2). "cust_bill_pay.cgi?". $cgi->query_string ) %><%
+
 } else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-}
 
+  #print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+
+  %><%= header('Payment application sucessful') %>
+  <SCRIPT TYPE="text/javascript">
+    window.top.location.reload();
+  </SCRIPT>
+
+  </BODY></HTML>
 
-%>
+<% } %>
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 85bfd4489..6a4ef194a 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -13,14 +13,23 @@ my $error = $new->insert;
 
 if ( $error ) {
   $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string );
+
+  %><%= $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string ) %><%
+
 } else {
+
   if ( $cgi->param('apply') eq 'yes' ) {
     my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum })
       or die "unknown custnum $custnum";
     $cust_main->apply_credits;
   }
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-}
+  #print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+
+  %><%= header('Credit sucessful') %>
+  <SCRIPT TYPE="text/javascript">
+    window.top.location.reload();
+  </SCRIPT>
+
+  </BODY></HTML>
 
-%>
+<% } %>
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index 28f892f62..3b759536f 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -34,11 +34,19 @@ if ($cgi->param('invnum') =~ /^Refund$/) {
 my $error = $new->insert;
 
 if ( $error ) {
+
   $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_credit_bill.cgi?". $cgi->query_string );
+  %><%= $cgi->redirect(popurl(2). "cust_credit_bill.cgi?". $cgi->query_string ) %><%
+
 } else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-}
 
+  #print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+
+  %><%= header('Credit application sucessful') %>
+  <SCRIPT TYPE="text/javascript">
+    window.top.location.reload();
+  </SCRIPT>
+
+  </BODY></HTML>
 
-%>
+<% } %>
diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index 83ff6f728..59ad35ee4 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -2,10 +2,21 @@
 
   # options example...
   # 
+  ###
+  ##req
+  ##
   # 'table' => 
+  #
   # #? 'primary_key' => #required when the dbdef doesn't know...???
   # #? 'fields' => []
+  #
+  ###
+  ##opt
+  ###
   # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
+  # 'process_m2m' => { 'link_table'   => 'link_table_name',
+  #                    'target_table' => 'target_table_name',
+  #                  }.
 
   my(%opt) = @_;
 
@@ -31,12 +42,16 @@
   if ( $pkeyvalue ) {
     $error = $new->replace($old);
   } else {
-    warn $new;
     $error = $new->insert;
-    warn $error;
     $pkeyvalue = $new->getfield($pkey);
   }
 
+  if ( !$error && $opt{'process_m2m'} ) {
+    $error = $new->process_m2m( %{ $opt{'process_m2m'} },
+                                'params' => scalar($cgi->Vars),
+                              );
+  }
+
   if ( $error ) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(2). "$table.html?". $cgi->query_string );
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index ca0e3398f..f47ba0a8f 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my($svcnum, $pkgnum, $svcpart, $kludge_action, $purpose, $part_svc,
@@ -66,33 +65,31 @@ my $otaker = getotaker;
 my $domain = $svc_domain->domain;
 
 my $p1 = popurl(1);
-print header("$action $svc", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print <<END;
-    <FORM ACTION="${p1}process/svc_domain.cgi" METHOD=POST>
-      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
-      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-END
-
-print qq!<INPUT TYPE="radio" NAME="action" VALUE="N"!;
-print ' CHECKED' if $kludge_action eq 'N';
-print qq!>New!;
-print qq!<BR><INPUT TYPE="radio" NAME="action" VALUE="M"!;
-print ' CHECKED' if $kludge_action eq 'M';
-print qq!>Transfer!;
-
-print <<END;
-<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=63>
-<BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
-<P><INPUT TYPE="submit" VALUE="Submit">
-    </FORM>
-  </BODY>
-</HTML>
-END
 
 %>
+
+<%= include('/elements/header.html', "$action $svc", '') %>
+
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
+
+<FORM ACTION="<%= $p1 %>process/svc_domain.cgi" METHOD=POST>
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%= $svcnum %>">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $svcpart %>">
+
+<INPUT TYPE="radio" NAME="action" VALUE="N"<%= $kludge_action eq 'N' ? ' CHECKED' : '' %>>New
+<BR>
+
+<INPUT TYPE="radio" NAME="action" VALUE="M"<%= $kludge_action eq 'M' ? ' CHECKED' : '' %>>Transfer
+
+<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="<%= $domain %>" SIZE=28 MAXLENGTH=63>
+
+<BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="<%= $purpose %>" SIZE=64>
+
+<P><INPUT TYPE="submit" VALUE="Submit">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/elements/checkboxes-table.html b/httemplate/elements/checkboxes-table.html
new file mode 100644
index 000000000..d26ebef35
--- /dev/null
+++ b/httemplate/elements/checkboxes-table.html
@@ -0,0 +1,110 @@
+<%
+
+  ##
+  # required
+  ##
+  # 'target_table'    => 'table_name',
+  # 'link_table'      => 'table_name',
+  #
+  # 'name_col' => 'name_column',
+  # #or
+  # 'name_callback' => sub { },
+  #
+  ##
+  # recommended (required?)
+  ##
+  # 'source_obj'   => $obj,
+  # #or?
+  # #'source_table' => 'table_name',
+  # #'sourcenum'    => '4', #current value of primary key in source_table
+  # #                       # (none is okay, just pass it if you have it)
+  ##
+  # optional
+  ##
+  # 'disable-able' => 1,
+
+  my( %opt ) = @_;
+
+  my $target_pkey = dbdef->table($opt{'target_table'})->primary_key;
+
+  my( $source_pkey, $sourcenum, $source_obj );
+  if ( $opt{'source_obj'} ) {
+
+    $source_obj = $opt{'source_obj'};
+    #$source_table = $source_obj->dbdef_table->table;
+    $source_pkey = $source_obj->dbdef_table->primary_key;
+    $sourcenum = $source_obj->$source_pkey();
+
+  } else {
+
+    #$source_obj?
+    $source_pkey = $opt{'source_table'}
+                     ? dbdef->table($opt{'source_table'})->primary_key
+                     : '';
+    $sourcenum = $opt{'sourcenum'};
+  }
+
+  my $hashref = $opt{'hashref'} || {};
+
+  my $extra_sql = '';
+
+  if ( $opt{'disable-able'} ) {
+    $hashref->{'disabled'} = '';
+
+    $extra_sql .= ( $sourcenum && $source_pkey ) 
+                    ? "OR $source_pkey = $sourcenum"
+                    : '';
+  }
+
+%>
+
+<% foreach my $target_obj (
+     qsearch({ 'table'     => $opt{'target_table'},
+               'hashref'   => $hashref,
+               'select'    => $opt{'target_table'}. '.*',
+               'addl_from' => "LEFT JOIN $opt{'link_table'} USING ( $target_pkey )",
+               'extra_sql' => $extra_sql,
+            })
+   ) {
+
+     my $targetnum = $target_obj->$target_pkey();
+%>
+
+  <INPUT TYPE="checkbox" NAME="<%= $target_pkey. $targetnum %>" <%=
+        qsearchs( $opt{'link_table'}, {
+          $source_pkey => $sourcenum,
+          $target_pkey => $targetnum,
+        })
+          ? 'CHECKED '
+          : ''
+  %> VALUE="ON">
+
+  <% if ( $opt{'target_link'} ) { %>
+
+    <A HREF="<%= $opt{'target_link'} %><%= $targetnum %>"><%
+
+  }
+  %><%= $targetnum %>: 
+
+  <% if ( $opt{'name_callback'} ) { %>
+
+    <%= &{ $opt{'name_callback'} }( $target_obj ) %><%= $opt{'target_link'} ? '</A>' : '' %>
+
+  <% } else {
+       my $name_col = $opt{'name_col'};
+  %>
+
+    <%= $target_obj->$name_col() %><%= $opt{'target_link'} ? '</A>' : '' %>
+
+  <% } %>
+
+  <% if ( $opt{'disable-able'} ) { %>
+
+    <%= $target_obj->disabled =~ /^Y/i ? ' (DISABLED)' : '' %>
+
+  <% } %>
+
+  <BR>
+
+<% } %>
+
diff --git a/httemplate/elements/cssexpr.js b/httemplate/elements/cssexpr.js
new file mode 100644
index 000000000..c434d8da0
--- /dev/null
+++ b/httemplate/elements/cssexpr.js
@@ -0,0 +1,66 @@
+function constExpression(x) {
+	return x;
+}
+
+function simplifyCSSExpression() {
+	try {
+		var ss,sl, rs, rl;
+		ss = document.styleSheets;
+		sl = ss.length
+	
+		for (var i = 0; i < sl; i++) {
+			simplifyCSSBlock(ss[i]);
+		}
+	}
+	catch (exc) {
+		//alert("Got an error while processing css. The page should still work but might be a bit slower");
+		throw exc;
+	}
+}
+
+function simplifyCSSBlock(ss) {
+	var rs, rl;
+	
+	for (var i = 0; i < ss.imports.length; i++)
+		simplifyCSSBlock(ss.imports[i]);
+	
+	if (ss.cssText.indexOf("expression(constExpression(") == -1)
+		return;
+
+	rs = ss.rules;
+	rl = rs.length;
+	for (var j = 0; j < rl; j++)
+		simplifyCSSRule(rs[j]);
+	
+}
+
+function simplifyCSSRule(r) {
+	var str = r.style.cssText;
+	var str2 = str;
+	var lastStr;
+	do {
+		lastStr = str2;
+		str2 = simplifyCSSRuleHelper(lastStr);
+	} while (str2 != lastStr)
+
+	if (str2 != str)
+		r.style.cssText = str2;
+}
+
+function simplifyCSSRuleHelper(str) {
+	var i, i2;
+	i = str.indexOf("expression(constExpression(");
+	if (i == -1) return str;
+	i2 = str.indexOf("))", i);
+	var hd = str.substring(0, i);
+	var tl = str.substring(i2 + 2);
+	var exp = str.substring(i + 27, i2);
+	var val = eval(exp)
+	return hd + val + tl;
+}
+
+if (/msie/i.test(navigator.userAgent) && window.attachEvent != null) {
+	window.attachEvent("onload", function () {
+		simplifyCSSExpression();
+	});
+}
diff --git a/httemplate/elements/footer.html b/httemplate/elements/footer.html
index 6029d7637..32d121996 100644
--- a/httemplate/elements/footer.html
+++ b/httemplate/elements/footer.html
@@ -1,2 +1,5 @@
+        </TD>
+      </TR>
+    </TABLE>
   </BODY>
 </HTML>
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 10e4e40f1..49814577e 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -2,20 +2,285 @@
   my($title, $menubar) = ( shift, shift );
   my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
   my $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
+  my $conf = new FS::Conf;
 %>
-    <HTML>
-      <HEAD>
-        <TITLE>
-          <%= $title %>
-        </TITLE>
-        <META HTTP-Equiv="Cache-Control" Content="no-cache">
-        <META HTTP-Equiv="Pragma" Content="no-cache">
-        <META HTTP-Equiv="Expires" Content="0"> 
-        <%= $head %>
-      </HEAD>
-      <BODY BGCOLOR="#e8e8e8"<%= $etc %>>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>
+      <%= $title %>
+    </TITLE>
+    <META HTTP-Equiv="Cache-Control" Content="no-cache">
+    <META HTTP-Equiv="Pragma" Content="no-cache">
+    <META HTTP-Equiv="Expires" Content="0"> 
+    <script type="text/javascript" src="<%=$fsurl%>elements/cssexpr.js"></script>
+    <script type="text/javascript" src="<%=$fsurl%>elements/xmenu.js"></script>
+    <link href="<%=$fsurl%>elements/xmenu.css" type="text/css" rel="stylesheet">
+    <%
+
+      tie my %report_menu, 'Tie::IxHash',
+        'Report one' => [ 'there', 'theretip' ],
+        'Report too' => [ 'here',  'heretip'  ],
+      ;
+
+      tie my %config_employees, 'Tie::IxHash',
+        'View/Edit employees' => [ $fsurl.'browse/access_user.html', 'Setup internal users' ],
+        'View/Edit employee groups' => [ $fsurl.'browse/access_group.html', 'Employee groups allow you to control access to the backend' ],
+      ;
+
+      tie my %config_export_svc_pkg, 'Tie::IxHash',
+        'View/Edit exports'             => [ $fsurl.'browse/part_export.cgi', 'Provisioning services to external machines, databases and APIs' ],
+        'View/Edit service definitions' => [ $fsurl.'browse/part_svc.cgi', 'Services are items you offer to your customers' ],
+        'View/Edit package definitions' => [ $fsurl.'browse/part_pkg.cgi', 'One or more services are grouped together into a package and given pricing information. Customers purchase packages, not services' ],
+        'View/Edit package classes'     => [ $fsurl.'browse/pkg_class.html', 'Package classes define groups of packages, for reporting and convenience purposes.' ],
+      ;
+
+      tie my %config_agent, 'Tie::IxHash',
+        'View/Edit agent types' => [ $fsurl.'browse/agent_type.cgi', 'Agent types define groups of package definitions that you can then assign to particular agents' ],
+        'View/Edit agents'      => [ $fsurl.'browse/agent.cgi', 'Agents are resellers of your service. Agents may be limited to a subset of your full offerings (via their type)' ],
+      ;
+
+      tie my %config_billing, 'Tie::IxHash',
+        'View/Edit payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ],
+        'View/Edit invoice events'           => [ $fsurl.'browse/part_bill_event.cgi', 'Actions for overdue invoices' ],
+        'View/Edit prepaid cards'            => [ $fsurl.'browse/prepay_credit.html', 'View outstanding cards, generate new cards' ],
+        'View/Edit call rates and regions'   => [ $fsurl.'browse/rate.cgi', 'Manage rate plans, regions and prefixes for VoIP and call billing' ],
+        'View/Edit locales and tax rates'    => [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ],
+      ;
+
+      tie my %config_dialup, 'Tie::IxHash',
+        'View/Edit access numbers' => [ $fsurl.'browse/svc_acct_pop.cgi', 'Points of Presence' ],
+      ;
+
+      tie my %config_broadband, 'Tie::IxHash',
+        'View/Edit routers'        => [ $fsurl.'browse/router.cgi', 'Broadband access routers' ],
+        'View/Edit address blocks' => [ $fsurl.'browse/addr_block.cgi', 'Manage address blocks and block assignments to broadband routers' ],
+      ;
+
+      tie my %config_misc, 'Tie::IxHash',
+        'View/Edit advertising sources' => [ $fsurl.'browse/part_referral.cgi', 'Where a customer heard about your service.  Tracked for informational purposes' ],
+        'View/Edit virtual fields' => [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ],
+        'View/Edit message catalog' => [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ],
+        'View/Edit inventory classes and inventory' => [ $fsurl.'browse/inventory_class.html', 'Setup inventory classes and stock inventory' ],
+      ;
+
+      tie my %config_menu, 'Tie::IxHash',
+        'Settings'      => [ $fsurl.'config/config-view.cgi', 'XXXconfigittip' ],
+        'separator'     => '', #its a separator!
+        'Employees'     => [ \%config_employees, 'XXXtooltip' ],
+        'Provisioning, services and packages'
+                        => [ \%config_export_svc_pkg, 'XXXtootip'    ],
+        'Resellers'     => [ \%config_agent, 'XXXtootip'    ],
+        'Billing'       => [ \%config_billing, 'XXXtootip'    ],
+        'Dialup'        => [ \%config_dialup, 'XXXtootip'    ],
+        'Fixed (username-less) broadband'
+                        => [ \%config_broadband, 'XXXtootip'    ],
+        'Miscellaneous' => [ \%config_misc, 'XXXtootip'    ],
+      ;
+
+      tie my %menu, 'Tie::IxHash',
+        'Home'          => [ $fsurl, 'hometip', ],
+        'Top item one'  => [ 'nowhere_yet', 'nowheretip', ],
+        'Top item too'  => [ 'nowhere_yet_either', 'eithertip', ],
+        'Reports'       => [ \%report_menu, 'reportmenutip' ],
+        'Configuration' => [ \%config_menu, 'configmenutip' ],
+      ;
+
+      use vars qw($gmenunum);
+      $gmenunum = 0;
+
+      sub submenu {
+        my($submenu, $title) = @_;
+        my $menunum = $gmenunum++;
+
+        #return two args: html, menuname
+
+        "var myMenu$menunum = new WebFXMenu;\n".
+        #"myMenu$menunum.useAutoPosition = true;\n".
+        "myMenu$menunum.emptyText = '$title';\n".
+
+        (
+          join("\n", map {
+  
+            if ( !ref( $submenu->{$_} ) ) {
+  
+              "myMenu$menunum.add(new WebFXMenuSeparator());";
+  
+            } else {
+  
+              my($url_or_submenu, $tooltip ) = @{ $submenu->{$_} };
+              if ( ref($url_or_submenu) ) {
+  
+                my($subhtml, $submenuname ) = submenu($url_or_submenu, $_); #mmm, recursion
+  
+                "$subhtml\n".
+                "myMenu$menunum.add(new WebFXMenuItem(\"$_\", null, \"$tooltip\", $submenuname ));";
+  
+              } else {
+  
+                "myMenu$menunum.add(new WebFXMenuItem(\"$_\", \"$url_or_submenu\", \"$tooltip\" ));";
+  
+              }
+  
+            }
+  
+          } keys %$submenu )
+        ). "\n".
+        "myMenu$menunum.width = 224\n",
+
+        "myMenu$menunum";
+
+      }
+
+    %>
+    <SCRIPT TYPE="text/javascript">
+
+      webfxMenuImagePath      = "<%=$fsurl%>images/";
+      webfxMenuUseHover       = 1;
+      webfxMenuShowTime       = 300;
+      webfxMenuHideTime       = 500;
+
+      var myBar = new WebFXMenuBar;
+
+      <% foreach my $item ( keys %menu ) {
+
+           my( $url_or_submenu, $tooltip ) = @{ $menu{$item} };
+
+           if ( ref($url_or_submenu) ) {
+
+             warn $item;
+
+             my( $subhtml, $submenuname ) = submenu($url_or_submenu, $item);
+
+      %>
+
+             <%= $subhtml %>
+             myBar.add(new WebFXMenuButton("<%= $item %>", null, "<%= $tooltip %>", <%= $submenuname %> ));
+
+      <%   } else { %>
+        
+             myBar.add(new WebFXMenuButton("<%= $item %>", "<%= $url_or_submenu %>", "<%= $tooltip %>" ));
+
+      <%   }
+
+        }
+      %>
+
+      myBar.show( null, 'vertical' );
+      //myBar.show( null, 'horizontal' );
+
+      //var myMenu = new WebFXMenu;
+      //myMenu.add(new WebFXMenuItem("Menu Item 1", "http://www.domain.com", "Tool tip to show"));
+      //myMenu.add(new WebFXMenuSeparator());
+      //myMenu.add(new WebFXMenuItem("Menu Item 2", "http://www.domain.com", "Tool tip to show"));
+      
+      //var mySubMenu = new WebFXMenu;
+      //mySubMenu.add(new WebFXMenuItem("Menu Item 3", "http://www.domain.com", "Tool tip to show"));
+      //myMenu.add(new WebFXMenuItem("Menu Item 4 with sub menu", null, "Tool tip to show", mySubMenu));
+
+      myBar.width = 154;
+
+    </SCRIPT>
+
+    <SCRIPT TYPE="text/javascript">
+      function clearhint_search_cust () {
+        alert(this);
+        if ( this.value='(cust #, name or company)' )
+          this.value = '';
+      }
+    </SCRIPT>
+
+    <%= $head %>
+
+  </HEAD>
+  <BODY BACKGROUND="<%=$fsurl%>images/background-cheat.png" <%= $etc %> STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0">
+    <table width="100%" CELLPADDING=0 CELLSPACING=0 STYLE="padding-left:0; padding-right:4">
+      <tr>
+        <td rowspan=2 BGCOLOR="#ffffff">
+          <IMG BORDER=0 ALT="freeside" SRC="<%=$fsurl%>images/small-logo.png">
+        </td>
+        <td align=left rowspan=2 BGCOLOR="#ffffff"> <!-- valign="top" -->
+          <font size=6><%= $conf->config('company_name') %> Billing</font>
+        </td>
+        <td align=right valign=top BGCOLOR="#ffffff">Logged in as <b><%= getotaker %>&nbsp</b><br><FONT SIZE="-2"><a href="<%=$fsurl%>pref/XXXwritethis">Preferences</a>&nbsp;<BR><BR></FONT>
+        </td>
+      </tr>
+      <tr>
+        <td align=right valign=bottom BGCOLOR="#ffffff">
+  
+          <table>
+            <tr>
+              <td align=right BGCOLOR="#ffffff">
+                <FONT SIZE="-2">
+                 <A HREF="http://www.sisd.com/freeside">Freeside</A>&nbsp;v<%= $FS::VERSION %><BR>
+                 <A HREF="<%= $fsurl %>docs/">Documentation</A><BR>
+                </FONT>
+              </td>
+              <% if ( $conf->config('ticket_system') eq 'RT_Internal' ) { %>
+              <% eval "use RT;"; %>
+                <td bgcolor=#000000></td>
+                <td align=left>
+                  <FONT SIZE="-2">
+                   <A HREF="http://www.bestpractical.com/rt">RT<A>&nbsp;v<%= $RT::VERSION %><BR>
+                   <A HREF="http://wiki.bestpractical.com/">Documentation</A><BR>
+                  </FONT>
+                </td>
+              <% } %>
+  
+            </tr>
+          </table>
+  
+        </td>
+      </tr>
+    </table>
+
+    <TABLE WIDTH="100%" CELLSPACING=0 CELLPADDING=4>
+      <TR>
+        <TD COLSPAN=4 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
+      </TR>
+      <TR>
+        <TD COLSPAN=1 BGCOLOR="#000000" WIDTH="154">
+        </TD>
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
+          <FORM ACTION="<%=$fsurl%>edit/cust_main.cgi" METHOD="GET" STYLE="margin:0">
+            <INPUT TYPE="submit" VALUE="New customer">
+          </FORM>
+        </TD>
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
+          <FORM ACTION="<%=$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
+            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name or company)" SIZE="23" onFocus="clearhint_search_cust" onClick="clearhint_search_cust">
+            <INPUT TYPE="submit" VALUE="Search customers">
+          </FORM>
+        </TD>
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
+          <FORM ACTION="<%=$fsurl%>rt/index.html" METHOD="GET" STYLE="margin:0">
+            <INPUT NAME="q" TYPE="text" VALUE="" onFocus="clearhint_search_ticket" onClick="clearhint_search_ticket">
+            <INPUT TYPE="submit" VALUE="Search tickets">
+          </FORM>
+        </TD>
+      </TR>
+    </TABLE>
+    <TABLE WIDTH="100%" HEIGHT="100%" CELLSPACING=0 CELLPADDING=4>
+      <TR>
+        <TD BGCOLOR="#000000" STYLE="padding:0" WIDTH="154"></TD>
+        <TD STYLE="padding:0" WIDTH="13"><IMG BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gray-corner.png"></TD>
+        <TD STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gray-top.png" HEIGHT="13" WIDTH="100%"></TD>
+      </TR>
+      <TR HEIGHT="100%">
+        <TD BGCOLOR="#000000" ALIGN="left" HEIGHT="100%" WIDTH="154" VALIGN="top" ALIGN="right">
+          <SCRIPT TYPE="text/javascript">
+            document.write(myBar);
+          </SCRIPT>
+          <BR>
+          <IMG SRC="<%=$fsurl%>images/32clear.gif" HEIGHT="1" WIDTH="154">
+
+        </TD>
+        <TD STYLE="padding:0" HEIGHT="100%" WIDTH=13 VALIGN="top"><IMG WIDTH="13" HEIGHT="100%" BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gray-side.png"></TD>
+        <TD BGCOLOR="#e8e8e8" HEIGHT="100%"> <!-- WIDTH="100%"> -->
+
           <FONT SIZE=6>
             <%= $title %>
           </FONT>
+
           <BR><BR>
-          <%= $menubar ? "$menubar<BR><BR>" : '' %>
+          <%= $menubar !~ /^\s*$/ ? "$menubar<BR><BR>" : '' %>
diff --git a/httemplate/elements/menubar.html b/httemplate/elements/menubar.html
index 87a50312c..29facb6b6 100644
--- a/httemplate/elements/menubar.html
+++ b/httemplate/elements/menubar.html
@@ -2,6 +2,7 @@
   my($item, $url, @html);
   while (@_) {
     ($item, $url) = splice(@_,0,2);
+    next if $item =~ /^\s*Main\s+Menu\s*$/i;
     push @html, qq!<A HREF="$url">$item</A>!;
   }
 %>
diff --git a/httemplate/elements/select-access_group.html b/httemplate/elements/select-access_group.html
new file mode 100644
index 000000000..b05f565ea
--- /dev/null
+++ b/httemplate/elements/select-access_group.html
@@ -0,0 +1,15 @@
+<% 
+  my( $groupnum, %opt ) = @_;
+
+  %opt{'records'} = delete $opt{'access_group'}
+    if $opt{'access_group'};
+
+%><%= include( '/elements/select-table.html',
+                 'table'       => 'access_group',
+                 'name_col'    => 'groupname',
+                 'value'       => $groupnum,
+                 'empty_label' => '(none)',
+                 #'hashref'     => { 'disabled' => '' },
+                 %opt,
+             )
+%>
diff --git a/httemplate/elements/tr-select-access_group.html b/httemplate/elements/tr-select-access_group.html
new file mode 100644
index 000000000..0beec0842
--- /dev/null
+++ b/httemplate/elements/tr-select-access_group.html
@@ -0,0 +1,22 @@
+<%
+  my( $groupnum, %opt ) = @_;
+
+  $opt{'access_group'} ||= [ qsearch( 'access_group', {} ) ]; # { disabled=>'' } )
+
+  #warn "***** tr-select-access_group: \n". Dumper(%opt);
+%>
+
+<% if ( scalar(@{ $opt{'access_group'} }) == 0 ) { %>
+
+  <INPUT TYPE="hidden" NAME="groupnum" VALUE="">
+
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right"><%= $opt{'label'} || 'Access group' %></TD>
+    <TD>
+      <%= include( '/elements/select-access_group.html', $groupnum, %opt ) %>
+    </TD>
+  </TR>
+
+<% } %>
diff --git a/httemplate/elements/xmenu.css b/httemplate/elements/xmenu.css
new file mode 100644
index 000000000..5bb8a0deb
--- /dev/null
+++ b/httemplate/elements/xmenu.css
@@ -0,0 +1,185 @@
+
+.webfx-menu, .webfx-menu * {
+	/*
+	Set the box sizing to content box
+	in the future when IE6 supports box-sizing
+	there will be an issue to fix the sizes
+
+	There is probably an issue with IE5 mac now
+	because IE5 uses content-box but the script
+	assumes all versions of IE uses border-box.
+
+	At the time of this writing mozilla did not support
+	box-sizing for absolute positioned element.
+
+	Opera only supports content-box
+	*/
+	box-sizing:			content-box;
+	-moz-box-sizing:	content-box;
+}
+
+.webfx-menu {
+	position:		absolute;
+	z-index:		100;
+	visibility:		hidden;
+	width:			154px;
+	border:			1px solid black;
+	padding:		1px;
+	background:		white;
+	filter:			progid:DXImageTransform.Microsoft.Shadow(color="#777777", Direction=135, Strength=4)
+				alpha(Opacity=95);
+	-moz-opacity:		0.95;
+	/* a drop shadow would be nice in moz/others too... */
+}
+
+.webfx-menu-empty {
+	display:		block;
+	border:			1px solid white;
+	padding:		2px 5px 2px 5px;
+	font-size:		11px;
+	/* font-family:		Tahoma, Verdan, Helvetica, Sans-Serif; */
+	color:			black;
+}
+
+.webfx-menu a {
+	display:		block;
+	width:			expression(constExpression(ieBox ? "100%": "auto"));	/* should be ignored by mz and op */
+	height:			expression(constExpression("1px"));
+	overflow:		visible;	
+	padding:		2px 0px 2px 5px;
+	font-size:		11px;
+	font-family:		Tahoma, Verdan, Helvetica, Sans-Serif;
+	text-decoration:	none;
+	vertical-align:		center;
+	color:			black;
+	border:			1px solid white;
+}	
+
+.webfx-menu a:visited,
+.webfx-menu a:visited:hover {
+	color:			black;
+}
+
+.webfx-menu a:hover {
+	color:			black;
+	/* background:		#faf7fa; #f5ebf4; #efdfef; white; #BC79B8; */
+	/* background:		#ffe6fe; */
+	/* background:		#ffc2fe; */
+	background:		#fff2fe;
+	border:			1px solid #7e0079; /*rgb(120,172,255);#ff8800;*/
+}	
+
+.webfx-menu a .arrow {
+	float:			right;
+	border:			0;
+	width:			3px;
+	margin-right:	3px;
+	margin-top:		4px;
+}
+
+/* separtor */
+.webfx-menu div {
+	height:			0;
+	height:			expression(constExpression(ieBox ? "2px" : "0"));
+	border-top:		1px solid #7e0079; /* rgb(120,172,255); */
+	border-bottom:	1px solid rgb(234,242,255);
+	overflow:		hidden;
+	margin:			2px 0px 2px 0px;
+	font-size:		0mm;
+}
+
+.webfx-menu-bar {
+        /* i want a vertical bar */
+        display:                        block;
+
+	/* background:		rgb(120,172,255);/*rgb(255,128,0);*/
+	/* background:		 #a097ed; */
+	background:		 #000000;
+	/* border:			1px solid #7E0079; */
+	/* border:			1px solid #000000; */
+	/* border: none */
+
+	padding:		2px;
+	
+	font-family:	Verdana, Helvetica, Sans-Serif;
+	font-size:		11px;
+	
+	/* IE5.0 has the wierdest box model for inline elements */
+	padding:		expression(constExpression(ie50 ? "0px" : "2px"));
+}
+
+.webfx-menu-bar a,
+.webfx-menu-bar a:visited {
+        /* i want a vertical bar */
+        display:                        block;
+
+	/* border:				1px solid black; /*rgb(0,0,0);/*rgb(255,128,0);*/
+	/* border: 1px solid black; /* #ffffff; */
+	/* border-bottom: 1px solid black; */
+	border-bottom: 1px solid white;
+	/* border-bottom:	1px solid rgb(0,66,174);
+	/* border-bottom: 1px solid black;
+	border-bottom: 1px solid black;
+	border-bottom: 1px solid black; */
+
+	padding:			1px 5px 1px 5px;
+
+	/* color:				black; */
+	color:				white;
+	text-decoration:	none;
+
+	/* IE5.0 Does not paint borders and padding on inline elements without a height/width */
+	height:		expression(constExpression(ie50 ? "17px" : "auto"));
+}
+
+.webfx-menu-bar a:hover {
+	/* color:			black; */
+	color:			white;
+	/* background:		rgb(120,172,255);	 */
+	/* background:		#BC79B8; */
+	background:		#7E0079;
+	/* border-left:	1px solid rgb(234,242,255);
+	border-right:	1px solid rgb(0,66,174);
+	border-top:		1px solid rgb(234,242,255);
+	border-bottom:	1px solid rgb(0,66,174); */
+}
+
+.webfx-menu-bar a .arrow {
+	border:			0;
+	float:			right;
+/*	vertical-align:		top; */
+	width:			3px;
+	margin-right:	3px;
+	margin-top:		4px;
+}
+
+.webfx-menu-bar a:active, .webfx-menu-bar a:focus {
+	-moz-outline:	none;
+	outline:		none;
+	/*
+		ie does not support outline but ie55 can hide the outline using
+		a proprietary property on HTMLElement. Did I say that IE sucks at CSS?
+	*/
+	ie-dummy:		expression(this.hideFocus=true);
+
+	border-left:	1px solid rgb(0,66,174);
+	border-right:	1px solid rgb(234,242,255);
+	border-top:		1px solid rgb(0,66,174);
+	border-bottom:	1px solid rgb(234,242,255);
+}
+
+.webfx-menu-title  {
+	color:			black;
+	/* background:		#faf7fa; #f5ebf4; #efdfef; white; #BC79B8; */
+	background:		#7e0079;
+/*	border:			1px solid #7e0079; /*rgb(120,172,255);#ff8800;*/
+	padding:		3px 1px 3px 6px;
+	display:		block;
+	font-size:		13px;
+	font-family:		Tahoma, Verdan, Helvetica, Sans-Serif;
+	text-decoration:	none;
+	color:			white;
+/*	border:			1px solid white; */
+	border-bottom:		1px solid white;
+}	
+
diff --git a/httemplate/elements/xmenu.js b/httemplate/elements/xmenu.js
new file mode 100644
index 000000000..134265f53
--- /dev/null
+++ b/httemplate/elements/xmenu.js
@@ -0,0 +1,668 @@
+//<script>
+/*
+ * This script was created by Erik Arvidsson (erik@eae.net)
+ * for WebFX (http://webfx.eae.net)
+ * Copyright 2001
+ * 
+ * For usage see license at http://webfx.eae.net/license.html	
+ *
+ * Created:		2001-01-12
+ * Updates:		2001-11-20	Added hover mode support and removed Opera focus hacks
+ *				2001-12-20	Added auto positioning and some properties to support this
+ *				2002-08-13	toString used ' for attributes. Changed to " to allow in args
+ */
+ 
+// check browsers
+var ua = navigator.userAgent;
+var opera = /opera [56789]|opera\/[56789]/i.test(ua);
+var ie = !opera && /MSIE/.test(ua);
+var ie50 = ie && /MSIE 5\.[01234]/.test(ua);
+var ie6 = ie && /MSIE [6789]/.test(ua);
+var ieBox = ie && (document.compatMode == null || document.compatMode != "CSS1Compat");
+var moz = !opera && /gecko/i.test(ua);
+var nn6 = !opera && /netscape.*6\./i.test(ua);
+var khtml = /KHTML/i.test(ua);
+
+// define the default values
+
+webfxMenuDefaultWidth			= 154;
+
+webfxMenuDefaultBorderLeft		= 1;
+webfxMenuDefaultBorderRight		= 1;
+webfxMenuDefaultBorderTop		= 1;
+webfxMenuDefaultBorderBottom	= 1;
+
+webfxMenuDefaultPaddingLeft		= 1;
+webfxMenuDefaultPaddingRight	= 1;
+webfxMenuDefaultPaddingTop		= 1;
+webfxMenuDefaultPaddingBottom	= 1;
+
+webfxMenuDefaultShadowLeft		= 0;
+webfxMenuDefaultShadowRight		= ie && !ie50 && /win32/i.test(navigator.platform) ? 4 :0;
+webfxMenuDefaultShadowTop		= 0;
+webfxMenuDefaultShadowBottom	= ie && !ie50 && /win32/i.test(navigator.platform) ? 4 : 0;
+
+
+webfxMenuItemDefaultHeight		= 18;
+webfxMenuItemDefaultText		= "Untitled";
+webfxMenuItemDefaultHref		= "javascript:void(0)";
+
+webfxMenuSeparatorDefaultHeight	= 6;
+
+webfxMenuDefaultEmptyText		= "Empty";
+
+webfxMenuDefaultUseAutoPosition	= nn6 ? false : true;
+
+
+
+// other global constants
+
+webfxMenuImagePath				= "";
+
+webfxMenuUseHover				= opera ? true : false;
+webfxMenuHideTime				= 500;
+webfxMenuShowTime				= 200;
+
+
+
+var webFXMenuHandler = {
+	idCounter		:	0,
+	idPrefix		:	"webfx-menu-object-",
+	all				:	{},
+	getId			:	function () { return this.idPrefix + this.idCounter++; },
+	overMenuItem	:	function (oItem) {
+		if (this.showTimeout != null)
+			window.clearTimeout(this.showTimeout);
+		if (this.hideTimeout != null)
+			window.clearTimeout(this.hideTimeout);
+		var jsItem = this.all[oItem.id];
+		if (webfxMenuShowTime <= 0)
+			this._over(jsItem);
+		else if ( jsItem )
+			//this.showTimeout = window.setTimeout(function () { webFXMenuHandler._over(jsItem) ; }, webfxMenuShowTime);
+			// I hate IE5.0 because the piece of shit crashes when using setTimeout with a function object
+			this.showTimeout = window.setTimeout("webFXMenuHandler._over(webFXMenuHandler.all['" + jsItem.id + "'])", webfxMenuShowTime);
+	},
+	outMenuItem	:	function (oItem) {
+		if (this.showTimeout != null)
+			window.clearTimeout(this.showTimeout);
+		if (this.hideTimeout != null)
+			window.clearTimeout(this.hideTimeout);
+		var jsItem = this.all[oItem.id];
+		if (webfxMenuHideTime <= 0)
+			this._out(jsItem);
+		else if ( jsItem ) 
+			//this.hideTimeout = window.setTimeout(function () { webFXMenuHandler._out(jsItem) ; }, webfxMenuHideTime);
+			this.hideTimeout = window.setTimeout("webFXMenuHandler._out(webFXMenuHandler.all['" + jsItem.id + "'])", webfxMenuHideTime);
+	},
+	blurMenu		:	function (oMenuItem) {
+		window.setTimeout("webFXMenuHandler.all[\"" + oMenuItem.id + "\"].subMenu.hide();", webfxMenuHideTime);
+	},
+	_over	:	function (jsItem) {
+		if (jsItem.subMenu) {
+			jsItem.parentMenu.hideAllSubs();
+			jsItem.subMenu.show();
+		}
+		else
+			jsItem.parentMenu.hideAllSubs();
+	},
+	_out	:	function (jsItem) {
+		// find top most menu
+		var root = jsItem;
+		var m;
+		if (root instanceof WebFXMenuButton)
+			m = root.subMenu;
+		else {
+			m = jsItem.parentMenu;
+			while (m.parentMenu != null && !(m.parentMenu instanceof WebFXMenuBar))
+				m = m.parentMenu;
+		}
+		if (m != null)	
+			m.hide();	
+	},
+	hideMenu	:	function (menu) {
+		if (this.showTimeout != null)
+			window.clearTimeout(this.showTimeout);
+		if (this.hideTimeout != null)
+			window.clearTimeout(this.hideTimeout);
+
+		this.hideTimeout = window.setTimeout("webFXMenuHandler.all['" + menu.id + "'].hide()", webfxMenuHideTime);
+	},
+	showMenu	:	function (menu, src, dir) {
+		if (this.showTimeout != null)
+			window.clearTimeout(this.showTimeout);
+		if (this.hideTimeout != null)
+			window.clearTimeout(this.hideTimeout);
+
+		if (arguments.length < 3)
+			dir = "vertical";
+		
+		menu.show(src, dir);
+	}
+};
+
+function WebFXMenu() {
+	this._menuItems	= [];
+	this._subMenus	= [];
+	this.id			= webFXMenuHandler.getId();
+	this.top		= 0;
+	this.left		= 0;
+	this.shown		= false;
+	this.parentMenu	= null;
+	webFXMenuHandler.all[this.id] = this;
+}
+
+WebFXMenu.prototype.width			= webfxMenuDefaultWidth;
+WebFXMenu.prototype.emptyText		= webfxMenuDefaultEmptyText;
+WebFXMenu.prototype.useAutoPosition	= webfxMenuDefaultUseAutoPosition;
+
+WebFXMenu.prototype.borderLeft		= webfxMenuDefaultBorderLeft;
+WebFXMenu.prototype.borderRight		= webfxMenuDefaultBorderRight;
+WebFXMenu.prototype.borderTop		= webfxMenuDefaultBorderTop;
+WebFXMenu.prototype.borderBottom	= webfxMenuDefaultBorderBottom;
+
+WebFXMenu.prototype.paddingLeft		= webfxMenuDefaultPaddingLeft;
+WebFXMenu.prototype.paddingRight	= webfxMenuDefaultPaddingRight;
+WebFXMenu.prototype.paddingTop		= webfxMenuDefaultPaddingTop;
+WebFXMenu.prototype.paddingBottom	= webfxMenuDefaultPaddingBottom;
+
+WebFXMenu.prototype.shadowLeft		= webfxMenuDefaultShadowLeft;
+WebFXMenu.prototype.shadowRight		= webfxMenuDefaultShadowRight;
+WebFXMenu.prototype.shadowTop		= webfxMenuDefaultShadowTop;
+WebFXMenu.prototype.shadowBottom	= webfxMenuDefaultShadowBottom;
+
+
+
+WebFXMenu.prototype.add = function (menuItem) {
+	this._menuItems[this._menuItems.length] = menuItem;
+	if (menuItem.subMenu) {
+		this._subMenus[this._subMenus.length] = menuItem.subMenu;
+		menuItem.subMenu.parentMenu = this;
+	}
+	
+	menuItem.parentMenu = this;
+};
+
+WebFXMenu.prototype.show = function (relObj, sDir) {
+	if (this.useAutoPosition)
+		this.position(relObj, sDir);
+
+	var divElement = document.getElementById(this.id);
+	if ( divElement ) {
+
+	  divElement.style.left = opera ? this.left : this.left + "px";
+	  divElement.style.top = opera ? this.top : this.top + "px";
+	  divElement.style.visibility = "visible";
+
+	  if ( ie ) {
+	    var shimElement = document.getElementById(this.id + "Shim");
+	    if ( shimElement ) {
+	      shimElement.style.width = divElement.offsetWidth;
+	      shimElement.style.height = divElement.offsetHeight;
+	      shimElement.style.top = divElement.style.top;
+	      shimElement.style.left = divElement.style.left;
+	      /*shimElement.style.zIndex = divElement.style.zIndex - 1; */
+	      shimElement.style.display = "block";
+	      shimElement.style.filter='progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)';
+	    }
+	  }
+
+	}
+
+	this.shown = true;
+
+	if (this.parentMenu)
+		this.parentMenu.show();
+};
+
+WebFXMenu.prototype.hide = function () {
+	this.hideAllSubs();
+	var divElement = document.getElementById(this.id);
+	if ( divElement ) {
+	  divElement.style.visibility = "hidden";
+	  if ( ie ) {
+	    var shimElement = document.getElementById(this.id + "Shim");
+	    if ( shimElement ) {
+	      shimElement.style.display = "none";
+	    }
+	  }
+	}
+
+	this.shown = false;
+};
+
+WebFXMenu.prototype.hideAllSubs = function () {
+	for (var i = 0; i < this._subMenus.length; i++) {
+		if (this._subMenus[i].shown)
+			this._subMenus[i].hide();
+	}
+};
+
+WebFXMenu.prototype.toString = function () {
+	var top = this.top + this.borderTop + this.paddingTop;
+	var str = "<div id='" + this.id + "' class='webfx-menu' style='" + 
+	"width:" + (!ieBox  ?
+		this.width - this.borderLeft - this.paddingLeft - this.borderRight - this.paddingRight  : 
+		this.width) + "px;" +
+	(this.useAutoPosition ?
+		"left:" + this.left + "px;" + "top:" + this.top + "px;" :
+		"") +
+	(ie50 ? "filter: none;" : "") +
+	"'>";
+
+	if (this._menuItems.length == 0) {
+		str +=	"<span class='webfx-menu-empty'>" + this.emptyText + "</span>";
+	}
+	else {	
+		str += '<span class="webfx-menu-title" onmouseover="webFXMenuHandler.overMenuItem(this)"' +
+			(webfxMenuUseHover ? " onmouseout='webFXMenuHandler.outMenuItem(this)'" : "") +
+			 '>' + this.emptyText + '</span>';
+        	// str += '<div id="' + this.id + '-title">' + this.emptyText + '</div>';
+		// loop through all menuItems
+		for (var i = 0; i < this._menuItems.length; i++) {
+			var mi = this._menuItems[i];
+			str += mi;
+			if (!this.useAutoPosition) {
+				if (mi.subMenu && !mi.subMenu.useAutoPosition)
+					mi.subMenu.top = top - mi.subMenu.borderTop - mi.subMenu.paddingTop;
+				top += mi.height;
+			}
+		}
+
+	}
+	
+	str += "</div>";
+
+	if ( ie ) {
+          str += "<iframe id='" + this.id + "Shim' src='javascript:false;' scrolling='no' frameBorder='0' style='position:absolute; top:0px; left: 0px; display:none;'></iframe>";
+	}
+	
+	for (var i = 0; i < this._subMenus.length; i++) {
+		this._subMenus[i].left = this.left + this.width - this._subMenus[i].borderLeft;
+		str += this._subMenus[i];
+	}
+	
+	return str;
+};
+// WebFXMenu.prototype.position defined later
+
+function WebFXMenuItem(sText, sHref, sToolTip, oSubMenu) {
+	this.text = sText || webfxMenuItemDefaultText;
+	this.href = (sHref == null || sHref == "") ? webfxMenuItemDefaultHref : sHref;
+	this.subMenu = oSubMenu;
+	if (oSubMenu)
+		oSubMenu.parentMenuItem = this;
+	this.toolTip = sToolTip;
+	this.id = webFXMenuHandler.getId();
+	webFXMenuHandler.all[this.id] = this;
+};
+WebFXMenuItem.prototype.height = webfxMenuItemDefaultHeight;
+WebFXMenuItem.prototype.toString = function () {
+	return	"<a" +
+			" id='" + this.id + "'" +
+			" href=\"" + this.href + "\"" +
+			(this.toolTip ? " title=\"" + this.toolTip + "\"" : "") +
+			" onmouseover='webFXMenuHandler.overMenuItem(this)'" +
+			(webfxMenuUseHover ? " onmouseout='webFXMenuHandler.outMenuItem(this)'" : "") +
+			(this.subMenu ? " unselectable='on' tabindex='-1'" : "") +
+			">" +
+			(this.subMenu ? "<img class='arrow' src=\"" + webfxMenuImagePath + "arrow.right.black.png\">" : "") +
+			this.text + 
+			"</a>";
+};
+
+
+function WebFXMenuSeparator() {
+	this.id = webFXMenuHandler.getId();
+	webFXMenuHandler.all[this.id] = this;
+};
+WebFXMenuSeparator.prototype.height = webfxMenuSeparatorDefaultHeight;
+WebFXMenuSeparator.prototype.toString = function () {
+	return	"<div" +
+			" id='" + this.id + "'" +
+			(webfxMenuUseHover ? 
+			" onmouseover='webFXMenuHandler.overMenuItem(this)'" +
+			" onmouseout='webFXMenuHandler.outMenuItem(this)'"
+			:
+			"") +
+			"></div>"
+};
+
+function WebFXMenuBar() {
+	this._parentConstructor = WebFXMenu;
+	this._parentConstructor();
+}
+WebFXMenuBar.prototype = new WebFXMenu;
+WebFXMenuBar.prototype.toString = function () {
+	var str = "<div id='" + this.id + "' class='webfx-menu-bar'>";
+	
+	// loop through all menuButtons
+	for (var i = 0; i < this._menuItems.length; i++)
+		str += this._menuItems[i];
+	
+	str += "</div>";
+
+	for (var i = 0; i < this._subMenus.length; i++)
+		str += this._subMenus[i];
+	
+	return str;
+};
+
+function WebFXMenuButton(sText, sHref, sToolTip, oSubMenu) {
+	this._parentConstructor = WebFXMenuItem;
+	this._parentConstructor(sText, sHref, sToolTip, oSubMenu);
+}
+WebFXMenuButton.prototype = new WebFXMenuItem;
+WebFXMenuButton.prototype.toString = function () {
+	return	"<a" +
+			" id='" + this.id + "'" +
+			" href='" + this.href + "'" +
+			(this.toolTip ? " title='" + this.toolTip + "'" : "") +
+			(webfxMenuUseHover ?
+				(" onmouseover='webFXMenuHandler.overMenuItem(this)'" +
+				" onmouseout='webFXMenuHandler.outMenuItem(this)'") :
+				(
+					" onfocus='webFXMenuHandler.overMenuItem(this)'" +
+					(this.subMenu ?
+						" onblur='webFXMenuHandler.blurMenu(this)'" :
+						""
+					)
+				)) +
+			">" +
+			(this.subMenu ? "<img class='arrow' src='" + webfxMenuImagePath + "arrow.right.png'>" : "") +				
+			this.text + 
+			"</a>";
+};
+
+
+
+
+
+/* Position functions */
+
+
+function getInnerLeft(el) {
+
+	if (el == null) return 0;
+
+	if (ieBox && el == document.body || !ieBox && el == document.documentElement) return 0;
+
+	return parseInt( getLeft(el) + parseInt(getBorderLeft(el)) );
+
+}
+
+
+
+function getLeft(el, debug) {
+
+	if (el == null) return 0;
+
+        //if ( debug )
+	//  alert ( el.offsetLeft + ' - ' + getInnerLeft(el.offsetParent) );
+
+	return parseInt( el.offsetLeft + parseInt(getInnerLeft(el.offsetParent)) );
+
+}
+
+
+
+function getInnerTop(el) {
+
+	if (el == null) return 0;
+
+	if (ieBox && el == document.body || !ieBox && el == document.documentElement) return 0;
+
+	return parseInt( getTop(el) + parseInt(getBorderTop(el)) );
+
+}
+
+
+
+function getTop(el) {
+
+	if (el == null) return 0;
+
+	return parseInt( el.offsetTop + parseInt(getInnerTop(el.offsetParent)) );
+
+}
+
+
+
+function getBorderLeft(el) {
+
+	return ie ?
+
+		el.clientLeft :
+
+		( khtml 
+		    ? parseInt(document.defaultView.getComputedStyle(el, null).getPropertyValue("border-left-width"))
+		    : parseInt(window.getComputedStyle(el, null).getPropertyValue("border-left-width")) 
+		);
+
+}
+
+
+
+function getBorderTop(el) {
+
+	return ie ?
+
+		el.clientTop :
+
+		( khtml 
+		    ? parseInt(document.defaultView.getComputedStyle(el, null).getPropertyValue("border-left-width"))
+		    : parseInt(window.getComputedStyle(el, null).getPropertyValue("border-top-width"))
+		);
+
+}
+
+
+
+function opera_getLeft(el) {
+
+	if (el == null) return 0;
+
+	return el.offsetLeft + opera_getLeft(el.offsetParent);
+
+}
+
+
+
+function opera_getTop(el) {
+
+	if (el == null) return 0;
+
+	return el.offsetTop + opera_getTop(el.offsetParent);
+
+}
+
+
+
+function getOuterRect(el, debug) {
+
+	return {
+
+		left:	(opera ? opera_getLeft(el) : getLeft(el, debug)),
+
+		top:	(opera ? opera_getTop(el) : getTop(el)),
+
+		width:	el.offsetWidth,
+
+		height:	el.offsetHeight
+
+	};
+
+}
+
+
+
+// mozilla bug! scrollbars not included in innerWidth/height
+
+function getDocumentRect(el) {
+
+	return {
+
+		left:	0,
+
+		top:	0,
+
+		width:	(ie ?
+
+					(ieBox ? document.body.clientWidth : document.documentElement.clientWidth) :
+
+					window.innerWidth
+
+				),
+
+		height:	(ie ?
+
+					(ieBox ? document.body.clientHeight : document.documentElement.clientHeight) :
+
+					window.innerHeight
+
+				)
+
+	};
+
+}
+
+
+
+function getScrollPos(el) {
+
+	return {
+
+		left:	(ie ?
+
+					(ieBox ? document.body.scrollLeft : document.documentElement.scrollLeft) :
+
+					window.pageXOffset
+
+				),
+
+		top:	(ie ?
+
+					(ieBox ? document.body.scrollTop : document.documentElement.scrollTop) :
+
+					window.pageYOffset
+
+				)
+
+	};
+
+}
+
+
+/* end position functions */
+
+WebFXMenu.prototype.position = function (relEl, sDir) {
+	var dir = sDir;
+	// find parent item rectangle, piRect
+	var piRect;
+	if (!relEl) {
+		var pi = this.parentMenuItem;
+		if (!this.parentMenuItem)
+			return;
+		
+		relEl = document.getElementById(pi.id);
+		if (dir == null)
+			dir = pi instanceof WebFXMenuButton ? "vertical" : "horizontal";
+		//alert('created RelEl from parent: ' + pi.id);
+		piRect = getOuterRect(relEl, 1);
+	}
+	else if (relEl.left != null && relEl.top != null && relEl.width != null && relEl.height != null) {	// got a rect
+		//alert('passed a Rect as RelEl: ' + typeof(relEl));
+
+		piRect = relEl;
+	}
+	else {
+		//alert('passed an element as RelEl: ' + typeof(relEl));
+		piRect = getOuterRect(relEl);
+	}
+
+	var menuEl = document.getElementById(this.id);
+	var menuRect = getOuterRect(menuEl);
+	var docRect = getDocumentRect();
+	var scrollPos = getScrollPos();
+	var pMenu = this.parentMenu;
+	
+	if (dir == "vertical") {
+		if (piRect.left + menuRect.width - scrollPos.left <= docRect.width) {
+			//alert('piRect.left: ' + piRect.left);
+			this.left = piRect.left;
+			if ( ! ie )
+			  this.left = this.left + 138;
+		} else if (docRect.width >= menuRect.width) {
+			//konq (not safari though) winds up here by accident and positions the menus all weird
+			//alert('docRect.width + scrollPos.left - menuRect.width');
+
+			this.left = docRect.width + scrollPos.left - menuRect.width;
+		} else {
+			//alert('scrollPos.left: ' + scrollPos.left);
+			this.left = scrollPos.left;
+		}
+			
+		if (piRect.top + piRect.height + menuRect.height <= docRect.height + scrollPos.top)
+
+			this.top = piRect.top + piRect.height;
+
+		else if (piRect.top - menuRect.height >= scrollPos.top)
+
+			this.top = piRect.top - menuRect.height;
+
+		else if (docRect.height >= menuRect.height)
+
+			this.top = docRect.height + scrollPos.top - menuRect.height;
+
+		else
+
+			this.top = scrollPos.top;
+	}
+	else {
+		if (piRect.top + menuRect.height - this.borderTop - this.paddingTop <= docRect.height + scrollPos.top)
+
+			this.top = piRect.top - this.borderTop - this.paddingTop;
+
+		else if (piRect.top + piRect.height - menuRect.height + this.borderTop + this.paddingTop >= 0)
+
+			this.top = piRect.top + piRect.height - menuRect.height + this.borderBottom + this.paddingBottom + this.shadowBottom;
+
+		else if (docRect.height >= menuRect.height)
+
+			this.top = docRect.height + scrollPos.top - menuRect.height;
+
+		else
+
+			this.top = scrollPos.top;
+
+
+
+		var pMenuPaddingLeft = pMenu ? pMenu.paddingLeft : 0;
+
+		var pMenuBorderLeft = pMenu ? pMenu.borderLeft : 0;
+
+		var pMenuPaddingRight = pMenu ? pMenu.paddingRight : 0;
+
+		var pMenuBorderRight = pMenu ? pMenu.borderRight : 0;
+
+		
+
+		if (piRect.left + piRect.width + menuRect.width + pMenuPaddingRight +
+
+			pMenuBorderRight - this.borderLeft + this.shadowRight <= docRect.width + scrollPos.left)
+
+			this.left = piRect.left + piRect.width + pMenuPaddingRight + pMenuBorderRight - this.borderLeft;
+
+		else if (piRect.left - menuRect.width - pMenuPaddingLeft - pMenuBorderLeft + this.borderRight + this.shadowRight >= 0)
+
+			this.left = piRect.left - menuRect.width - pMenuPaddingLeft - pMenuBorderLeft + this.borderRight + this.shadowRight;
+
+		else if (docRect.width >= menuRect.width)
+
+			this.left = docRect.width  + scrollPos.left - menuRect.width;
+
+		else
+
+			this.left = scrollPos.left;
+	}
+};
diff --git a/httemplate/index.html b/httemplate/index.html
index c8a46d08f..33083f6e5 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -168,7 +168,7 @@
     <TR><TD>
       <BR>
       <!-- <BR>View active NAS ports: 
-        <A HREF="browse/nas.cgi">session server</A>
+        <A HREF="browse/nas.cgi">session server</A> -->
         <!-- or <A HREF="browse/nas-sqlradius.cgi">RADIUS</A>
       <BR> -->
       <A HREF="search/queue.html">View pending job queue</A>
@@ -177,7 +177,15 @@
       <BR><A HREF="misc/dump.cgi">Download database dump</A>
       <BR><BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
-      <BR><BR><A NAME="admin">Provisioning, services and packages</a>
+      <BR><BR>
+      <A NAME="employees">Employees</A>
+        <UL>
+          <LI><A HREF="browse/access_user.html">View/Edit employees</A>
+            - Setup internal users
+          <LI><A HREF="browse/access_group.html">View/Edit employee groups</A>
+            - Employee groups allow you to control access to the backend
+        </UL>
+      <A NAME="admin">Provisioning, services and packages</a>
         <ul>
           <LI><A HREF="browse/part_export.cgi">View/Edit exports</A>
             - Provisioning services to external machines, databases and APIs.
diff --git a/httemplate/misc/batch-cust_pay.html b/httemplate/misc/batch-cust_pay.html
index b40869476..41537ee7e 100644
--- a/httemplate/misc/batch-cust_pay.html
+++ b/httemplate/misc/batch-cust_pay.html
@@ -1,8 +1,6 @@
 <%= include("/elements/header.html", 'Quick payment entry',
             menubar(
                      'Main Menu' => $p, #popurl(1),
-                     'Old-style quick payment entry' =>
-                       $p. 'search/cust_main-quickpay.html',
                    ),
             ( $cgi->param('error') ? '' : 'onload="addRow()"' ),
           )
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index d4fb4a2be..ec50c03f1 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -35,28 +35,18 @@
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
 <INPUT TYPE="hidden" NAME="payby" VALUE="<%= $payby %>">
 <INPUT TYPE="hidden" NAME="paybatch" VALUE="<%= $paybatch %>">
-<SCRIPT>
-var mywindow = -1;
-function myopen(filename,windowname,properties) {
-  myclose();
-  mywindow = window.open(filename,windowname,properties);
-}
-function myclose() {
-  if ( mywindow != -1 )
-    mywindow.close();
-  mywindow = -1;
-}
-var achwindow = -1;
-function achopen(filename,windowname,properties) {
-  achclose();
-  achwindow = window.open(filename,windowname,properties);
-}
-function achclose() {
-  if ( achwindow != -1 )
-    achwindow.close();
-  achwindow = -1;
+
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript">
+function OLiframeContent(src, width, height, name) {
+  return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
+   +(name?' name="'+name+'" id="'+name+'"':'')+' scrolling="auto">'
+   +'<div>[iframe not supported]</div></iframe>');
 }
 </SCRIPT>
+
 <% #include( '/elements/table.html', '#cccccc' ) %>
 <%= ntable('#cccccc') %>
   <TR>
@@ -112,7 +102,7 @@ function achclose() {
   <TR>
     <TD ALIGN="right">CVV2</TD>
     <TD><INPUT TYPE="text" NAME="paycvv" VALUE="<%= $paycvv %>" SIZE=4 MAXLENGTH=4>
-        (<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)
+        (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 480, 352, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)
     </TD>
   </TR>
   <TR>
@@ -173,7 +163,7 @@ function achclose() {
     <TD ALIGN="right">ABA/Routing&nbsp;number</TD>
     <TD>
       <INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="<%=$payinfo2%>">
-      (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)
+      (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)
     </TD>
   </TR>
   <TR>
@@ -205,5 +195,5 @@ function achclose() {
 <BR>
 <INPUT TYPE="submit" NAME="process" VALUE="Process payment">
 </FORM>
-</BODY>
-</HTML>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
deleted file mode 100755
index 5b0538ca3..000000000
--- a/httemplate/search/cust_bill.cgi
+++ /dev/null
@@ -1,165 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-my $maxrecords = $conf->config('maxsearchrecordsperpage');
-
-my $orderby = ''; #removeme
-
-my $limit = '';
-$limit .= "LIMIT $maxrecords" if $maxrecords;
-
-my $offset = $cgi->param('offset') || 0;
-$limit .= " OFFSET $offset" if $offset;
-
-my($total, $tot_amount, $tot_balance);
-
-my(@cust_bill);
-if ( $cgi->keywords ) {
-  my($query) = $cgi->keywords;
-  my $owed = "charged - ( select coalesce(sum(amount),0) from cust_bill_pay
-                          where cust_bill_pay.invnum = cust_bill.invnum )
-                      - ( select coalesce(sum(amount),0) from cust_credit_bill
-                          where cust_credit_bill.invnum = cust_bill.invnum )";
-  my @where;
-  if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
-    my($open, $days, $field) = ($1, $2, $3);
-    $field = "_date" if $field eq 'date';
-    $orderby = "ORDER BY cust_bill.$field";
-    push @where, "0 != $owed" if $open;
-    push @where, "cust_bill._date < ". (time-86400*$days) if $days;
-  } else {
-    die "unknown query string $query";
-  }
-
-  my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
-
-  my $statement = "SELECT COUNT(*), sum(charged), sum($owed)
-                   FROM cust_bill $extra_sql";
-  my $sth = dbh->prepare($statement) or die dbh->errstr. " doing $statement";
-  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
-
-  ( $total, $tot_amount, $tot_balance ) = @{$sth->fetchrow_arrayref};
-
-  @cust_bill = qsearch(
-    'cust_bill',
-    {},
-    "cust_bill.*, $owed as owed",
-    "$extra_sql $orderby $limit"
-  );
-} else {
-  $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
-  my $invnum = $2;
-  @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
-  $total = scalar(@cust_bill);
-}
-
-#if ( scalar(@cust_bill) == 1 ) {
-if ( $total == 1 ) {
-  my $invnum = $cust_bill[0]->invnum;
-  print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
-} elsif ( scalar(@cust_bill) == 0 ) {
-%>
-<!-- mason kludge -->
-<%
-  eidiot("Invoice not found.");
-} else {
-%>
-<!-- mason kludge -->
-<%
-
-  #begin pager
-  my $pager = '';
-  if ( $total != scalar(@cust_bill) && $maxrecords ) {
-    unless ( $offset == 0 ) {
-      $cgi->param('offset', $offset - $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
-    }
-    my $poff;
-    my $page;
-    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
-      $page++;
-      if ( $offset == $poff ) {
-        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
-      } else {
-        $cgi->param('offset', $poff);
-        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
-      }
-    }
-    unless ( $offset + $maxrecords > $total ) {
-      $cgi->param('offset', $offset + $maxrecords);
-      $pager .= '<A HREF="'. $cgi->self_url.
-                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
-    }
-  }
-  #end pager
-
-  print header("Invoice Search Results", menubar(
-          'Main Menu', popurl(2)
-        )).
-        "$total matching invoices found<BR>".
-        "\$$tot_balance total balance<BR>".
-        "\$$tot_amount total amount<BR>".
-        "<BR>$pager". table(). <<END;
-      <TR>
-        <TH></TH>
-        <TH>Balance</TH>
-        <TH>Amount</TH>
-        <TH>Date</TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
-      </TR>
-END
-
-  foreach my $cust_bill ( @cust_bill ) {
-    my($invnum, $owed, $charged, $date ) = (
-      $cust_bill->invnum,
-      sprintf("%.2f", $cust_bill->getfield('owed')),
-      sprintf("%.2f", $cust_bill->charged),
-      $cust_bill->_date,
-    );
-    my $pdate = time2str("%b %d %Y", $date);
-
-    my $rowspan = 1;
-
-    my $view = popurl(2). "view/cust_bill.cgi?$invnum";
-    print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$view">$invnum</A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view">\$$owed</A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view">\$$charged</A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view">$pdate</A></TD>
-END
-    my $custnum = $cust_bill->custnum;
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-    if ( $cust_main ) {
-      my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
-      my ( $name, $company ) = (
-        $cust_main->last. ', '. $cust_main->first,
-        $cust_main->company,
-      );
-      print <<END;
-        <TD ROWSPAN=$rowspan><A HREF="$cview">$name</A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$cview">$company</A></TD>
-END
-    } else {
-      print <<END
-        <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_bill.invnum $invnum)</TD>
-END
-    }
-
-    print "</TR>";
-  }
-  $tot_balance = sprintf("%.2f", $tot_balance);
-  $tot_amount = sprintf("%.2f", $tot_amount);
-  print "</TABLE>$pager<BR>". table(). <<END;
-      <TR><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TH>Total<BR>Balance</TH><TH>Total<BR>Amount</TH></TR>
-      <TR><TD></TD><TD ALIGN="right">\$$tot_balance</TD><TD ALIGN="right">\$$tot_amount</TD></TD></TR>
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-}
-
-%>
diff --git a/httemplate/search/cust_main-otaker.cgi b/httemplate/search/cust_main-otaker.cgi
index 03c2619af..6ac0bde18 100755
--- a/httemplate/search/cust_main-otaker.cgi
+++ b/httemplate/search/cust_main-otaker.cgi
@@ -1,28 +1,23 @@
-<HTML>
-  <HEAD>
-    <TITLE>Customer Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Customer Search
-    </FONT>
-    <BR>
-    <FORM ACTION="cust_main.cgi" METHOD="GET">
-      Search for <B>Order taker</B>: 
-      <INPUT TYPE="hidden" NAME="otaker_on" VALUE="TRUE">
-      <% my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
-           or die dbh->errstr;
-         $sth->execute() or die $sth->errstr;
-#         my @otakers = map { $_->[0] } @{$sth->selectall_arrayref};
-      %>
-      <SELECT NAME="otaker">
-      <% my $otaker; while ( $otaker = $sth->fetchrow_arrayref ) { %>
-        <OPTION><%= $otaker->[0] %></OTAKER>
-      <% } %>
-      </SELECT>
-      <P><INPUT TYPE="submit" VALUE="Search">
+<%= include('/elements/header.html', 'Customer Search' ) %>
 
-    </FORM>
-  </BODY>
-</HTML>
+<FORM ACTION="cust_main.cgi" METHOD="GET">
 
+Search for <B>Order taker</B>: 
+  <INPUT TYPE="hidden" NAME="otaker_on" VALUE="TRUE">
+
+<% my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
+     or die dbh->errstr;
+   $sth->execute() or die $sth->errstr;
+   #my @otakers = map { $_->[0] } @{$sth->fetchall_arrayref};
+%>
+<SELECT NAME="otaker">
+<% my $otaker; while ( $otaker = $sth->fetchrow_arrayref ) { %>
+  <OPTION><%= $otaker->[0] %>
+<% } %>
+</SELECT>
+
+<P><INPUT TYPE="submit" VALUE="Search">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/search/cust_main-payinfo.html b/httemplate/search/cust_main-payinfo.html
deleted file mode 100755
index b82b610d8..000000000
--- a/httemplate/search/cust_main-payinfo.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Customer Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Customer Search
-    </FONT>
-    <BR>
-    <FORM ACTION="cust_main.cgi" METHOD="GET">
-      Search for <B>Credit card #</B>: 
-      <INPUT TYPE="hidden" NAME="card_on" VALUE="TRUE">
-      <INPUT TYPE="text" NAME="card">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_main-quickpay.html b/httemplate/search/cust_main-quickpay.html
deleted file mode 100755
index 154a64199..000000000
--- a/httemplate/search/cust_main-quickpay.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Quick payment entry</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Quick payment entry
-    </FONT>
-    <BR><BR>
-    <A HREF="../">Main Menu</A><BR><BR>
-    <FORM ACTION="cust_main.cgi" METHOD="GET">
-      <INPUT TYPE="hidden" NAME="quickpay" VALUE="yes">
-      <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
-      <INPUT TYPE="text" NAME="last_text">
-      using search method: <SELECT NAME="last_type">
-        <OPTION SELECTED>All
-        <OPTION>Fuzzy
-        <OPTION>Substring
-        <OPTION>Exact
-      </SELECT>
-
-      <P><INPUT TYPE="checkbox" NAME="company_on" CHECKED> Search for <B>company</B>: 
-      <INPUT TYPE="text" NAME="company_text">
-      using search method: <SELECT NAME="company_type">
-        <OPTION SELECTED>All
-        <OPTION>Fuzzy
-        <OPTION>Substring
-        <OPTION>Exact
-      </SELECT>
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-
-  <HR>Explanation of search methods:
-  <UL>
-    <LI><B>All</B> - Try all search methods.
-    <LI><B>Fuzzy</B> - Searches for matches that are close to your text.
-    <LI><B>Substring</B> - Searches for matches that contain your text.
-    <LI><B>Exact</B> - Finds exact matches only, but much faster than the other search methods.
-  </UL>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 36ad39da8..8b70ff490 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -220,14 +220,13 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
   eidiot "No matching customers found!\n";
 } else { 
 %>
-<!-- mason kludge -->
-<%
+<%= include('/elements/header.html', "Customer Search Results", '' ) %>
 
-  $total ||= scalar(@cust_main);
-  print header("Customer Search Results",menubar(
-    'Main Menu', popurl(2)
-  )), "$total matching customers found ";
+  <% $total ||= scalar(@cust_main); %>
 
+  <%= $total %> matching customers found
+
+  <%
   #begin pager
   my $pager = '';
   if ( $total != scalar(@cust_main) && $maxrecords ) {
@@ -368,12 +367,14 @@ END
     my $pcompany = $company
       ? qq!<A HREF="$view"><FONT SIZE=-1>$company</FONT></A>!
       : '<FONT SIZE=-1>&nbsp;</FONT>';
-    print <<END;
+    %>
+
     <TR>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$last, $first</FONT></A></TD>
-      <TD ROWSPAN=$rowspan>$pcompany</TD>
-END
+      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= $custnum %></FONT></A></TD>
+      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$last, $first" %></FONT></A></TD>
+      <TD ROWSPAN=<%= $rowspan || 1 %>><%= $pcompany %></TD>
+
+    <%
     if ( defined dbdef->table('cust_main')->column('ship_last') ) {
       my($ship_last,$ship_first,$ship_company)=(
         $cust_main->ship_last || $cust_main->getfield('last'),
@@ -383,15 +384,18 @@ END
       my $pship_company = $ship_company
         ? qq!<A HREF="$view"><FONT SIZE=-1>$ship_company</FONT></A>!
         : '<FONT SIZE=-1>&nbsp;</FONT>';
-      print <<END;
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$ship_last, $ship_first</FONT></A></TD>
-      <TD ROWSPAN=$rowspan>$pship_company</A></TD>
-END
-    }
+      %>
 
-    foreach my $addl_col ( @addl_cols ) {
-      print "<TD ROWSPAN=$rowspan ALIGN=right><FONT SIZE=-1>";
-      if ( $addl_col eq 'tickets' ) {
+      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$ship_last, $ship_first" %></FONT></A></TD>
+      <TD ROWSPAN=<%= $rowspan || 1 %>><%= $pship_company %></A></TD>
+
+    <% }
+
+    foreach my $addl_col ( @addl_cols ) { %>
+
+      <TD ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
+
+      <% if ( $addl_col eq 'tickets' ) {
         if ( @custom_priorities ) {
           print &itable('', 0);
           foreach my $priority ( @custom_priorities, '' ) {
@@ -461,10 +465,14 @@ END
     }
     print "</TR>";
   }
+
+  %>
  
-  print "</TABLE>$pager</BODY></HTML>";
+  </TABLE><%= $pager %>
 
-}
+  <%= include('/elements/footer.html') %>
+
+<% }
 
 #undef $cache; #does this help?
 
diff --git a/httemplate/search/cust_pay.html b/httemplate/search/cust_pay.html
deleted file mode 100755
index 6414cf771..000000000
--- a/httemplate/search/cust_pay.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Check # Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Check # Search
-    </FONT>
-    <BR><BR>
-    <FORM ACTION="cust_pay.cgi" METHOD="GET">
-      Search for <B>check #</B>:
-      <INPUT TYPE="text" NAME="payinfo">
-      <INPUT TYPE="hidden" NAME="payby" VALUE="BILL">
-      <BR><BR><INPUT TYPE="submit" VALUE="Search">
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/cust_pkg_report.cgi b/httemplate/search/cust_pkg_report.cgi
index 412c3f79d..d9aada5f4 100755
--- a/httemplate/search/cust_pkg_report.cgi
+++ b/httemplate/search/cust_pkg_report.cgi
@@ -1,23 +1,22 @@
-<HTML>
-  <HEAD>
-    <TITLE>Packages</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Packages</H1>
-    <FORM ACTION="cust_pkg.cgi" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
-      Return packages with next bill date:<BR><BR>
-      <TABLE>
-        <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-        <%= include( '/elements/tr-select-agent.html',
-                       $cgi->param('agentnum'),
-                   )
-        %>
-      </TABLE>
-      <BR><INPUT TYPE="submit" VALUE="Get Report">
+<%= include('/elements/header.html', 'Packages' ) %>
 
-    </FORM>
+<FORM ACTION="cust_pkg.cgi" METHOD="GET">
+<INPUT TYPE="hidden" NAME="magic" VALUE="bill">
 
-  </BODY>
-</HTML>
+Return packages with next bill date:
+<BR><BR>
 
+  <TABLE>
+    <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+    <%= include( '/elements/tr-select-agent.html',
+                   $cgi->param('agentnum'),
+               )
+    %>
+  </TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html
index a7be76689..f1b7bfa14 100644
--- a/httemplate/search/report_cust_bill.html
+++ b/httemplate/search/report_cust_bill.html
@@ -1,28 +1,28 @@
-  <HEAD>
-    <TITLE>Invoice report criteria</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Invoice report criteria</H1>
-    <FORM ACTION="cust_bill.html" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
-    <TABLE>
-      <%= include( '/elements/tr-select-agent.html',
-                     $cgi->param('agentnum'),
-                     'label' => 'Invoices for agent: ',
-                 )
-      %>
-      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-      <TR>
-        <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
-        <TD>Show only open invoices</TD>
-      </TR>
-      <TR>
-        <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD>
-        <TD>Show only the single most recent invoice per-customer</TD>
-      </TR>
-    </TABLE>
-    <BR><INPUT TYPE="submit" VALUE="Get Report">
-    </FORM>
-  </BODY>
-</HTML>
+<%= include('/elements/header.html', 'Invoice report criteria' ) %>
 
+<FORM ACTION="cust_bill.html" METHOD="GET">
+<INPUT TYPE="hidden" NAME="magic" VALUE="_date">
+
+<TABLE>
+  <%= include( '/elements/tr-select-agent.html',
+                 $cgi->param('agentnum'),
+                 'label' => 'Invoices for agent: ',
+             )
+  %>
+  <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+  <TR>
+    <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
+    <TD>Show only open invoices</TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD>
+    <TD>Show only the single most recent invoice per-customer</TD>
+  </TR>
+</TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index 56bbd0ac0..8ca52dc9a 100644
--- a/httemplate/search/report_cust_credit.html
+++ b/httemplate/search/report_cust_credit.html
@@ -1,36 +1,38 @@
-<HTML>
-  <HEAD>
-    <TITLE>Credit report criteria</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Credit report criteria</H1>
-    <FORM ACTION="cust_credit.html" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
-    <TABLE>
-      <TR>
-        <TD ALIGN="right">Credits by employee: </TD>
+<%= include('/elements/header.html', 'Credit report' ) %>
+
+<FORM ACTION="cust_credit.html" METHOD="GET">
+<INPUT TYPE="hidden" NAME="magic" VALUE="_date">
+
+<TABLE>
+  <TR>
+    <TD ALIGN="right">Credits by employee: </TD>
+
 <%
   my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_credit")
     or die dbh->errstr;
   $sth->execute or die $sth->errstr;
   my @otakers = map { $_->[0] } @{$sth->fetchall_arrayref};
 %>
-        <TD><SELECT NAME="otaker">
-              <OPTION VALUE="">all</OPTION>
-              <% foreach my $otaker ( @otakers ) { %>
-                <OPTION VALUE="<%= $otaker %>"><%= $otaker %></OPTION>
-              <% } %>
-            </SELECT>
-        </TD>
-      </TR>
-      <%= include( '/elements/tr-select-agent.html',
-                     $cgi->param('agentnum'),
-                     'label' => 'for agent: ',
-                 )
-      %>
-      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-    </TABLE>
-    <BR><INPUT TYPE="submit" VALUE="Get Report">
-    </FORM>
-  </BODY>
-</HTML>
+
+    <TD><SELECT NAME="otaker">
+          <OPTION VALUE="">all</OPTION>
+          <% foreach my $otaker ( @otakers ) { %>
+            <OPTION VALUE="<%= $otaker %>"><%= $otaker %></OPTION>
+          <% } %>
+        </SELECT>
+    </TD>
+  </TR>
+  <%= include( '/elements/tr-select-agent.html',
+                 $cgi->param('agentnum'),
+                 'label' => 'for agent: ',
+             )
+  %>
+  <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+</TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html
index 5d8b74e77..8adf7dc13 100644
--- a/httemplate/search/report_cust_pay.html
+++ b/httemplate/search/report_cust_pay.html
@@ -1,38 +1,43 @@
-<HTML>
-  <HEAD>
-    <TITLE>Payment report criteria</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Payment report criteria</H1>
-    <FORM ACTION="cust_pay.cgi" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
-    <TABLE>
-      <TR>
-        <TD ALIGN="right">Payments of type: </TD>
-        <TD><SELECT NAME="payby">
-              <OPTION VALUE="">all</OPTION>
-              <OPTION VALUE="CARD">credit card (all)</OPTION>
-              <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
-              <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
-              <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
-              <OPTION VALUE="CARD-Maestro">credit card (Maestro/Switch/Solo)</OPTION>
-              <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
-              <OPTION VALUE="BILL">check</OPTION>
-              <OPTION VALUE="PREP">prepaid card</OPTION>
-              <OPTION VALUE="CASH">cash</OPTION>
-              <OPTION VALUE="WEST">Western Union</OPTION>
-              <OPTION VALUE="MCRD">manual credit card</OPTION>
-            </SELECT>
-        </TD>
-      </TR>
-      <%= include( '/elements/tr-select-agent.html',
-                     $cgi->param('agentnum'),
-                     'label' => 'for agent: ',
-                 )
-      %>
-      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-    </TABLE>
-    <BR><INPUT TYPE="submit" VALUE="Get Report">
-    </FORM>
-  </BODY>
-</HTML>
+<%= include('/elements/header.html', 'Payment report' ) %>
+
+<FORM ACTION="cust_pay.cgi" METHOD="GET">
+<INPUT TYPE="hidden" NAME="magic" VALUE="_date">
+
+<TABLE>
+
+  <TR>
+    <TD ALIGN="right">Payments of type: </TD>
+    <TD>
+      <SELECT NAME="payby">
+        <OPTION VALUE="">all</OPTION>
+        <OPTION VALUE="CARD">credit card (all)</OPTION>
+        <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
+        <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
+        <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
+        <OPTION VALUE="CARD-Maestro">credit card (Maestro/Switch/Solo)</OPTION>
+        <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
+        <OPTION VALUE="BILL">check</OPTION>
+        <OPTION VALUE="PREP">prepaid card</OPTION>
+        <OPTION VALUE="CASH">cash</OPTION>
+        <OPTION VALUE="WEST">Western Union</OPTION>
+        <OPTION VALUE="MCRD">manual credit card</OPTION>
+      </SELECT>
+    </TD>
+  </TR>
+
+  <%= include( '/elements/tr-select-agent.html',
+                 $cgi->param('agentnum'),
+                 'label' => 'for agent: ',
+             )
+  %>
+
+  <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+
+</TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/search/report_prepaid_income.html b/httemplate/search/report_prepaid_income.html
index 57c318eba..4359918f9 100644
--- a/httemplate/search/report_prepaid_income.html
+++ b/httemplate/search/report_prepaid_income.html
@@ -1,13 +1,13 @@
-<HTML>
-  <HEAD>
-    <TITLE>Prepaid Income (Unearned Revenue) Report</TITLE>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Prepaid Income (Unearned Revenue) Report</H1>
+<%= include('/elements/header.html', 'Prepaid Income (Unearned Revenue) Report',
+  '',
+  '',
+  '<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+  <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+  <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+  <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+  '
+) %>
+
     <FORM ACTION="report_prepaid_income.cgi" METHOD="GET">
     <TABLE>
       <TR>
@@ -32,8 +32,6 @@
   });
 </SCRIPT>
 
-    <INPUT TYPE="submit" VALUE="Generate report">
-  </BODY>
-</HTML>
-    <TABLE>
+<INPUT TYPE="submit" VALUE="Generate report">
 
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/search/report_tax.html b/httemplate/search/report_tax.html
index 7a8ecd4f0..bdeb8e237 100755
--- a/httemplate/search/report_tax.html
+++ b/httemplate/search/report_tax.html
@@ -1,40 +1,35 @@
-<HTML>
-  <HEAD>
-    <TITLE>Tax Report Criteria</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Tax Report Criteria</H1>
-    <FORM ACTION="report_tax.cgi" METHOD="GET">
-
-    <TABLE>
-
-     <%= include( '/elements/tr-select-agent.html' ) %>
-
-     <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-
-     <% my $conf = new FS::Conf;
-        if ( $conf->exists('enable_taxclasses') ) {
-     %>
-       <TR>
-         <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_taxclasses" VALUE="1"></TD>
-         <TD>Show tax classes</TD>
-       </TR>
-     <% } %>
-
-     <% my @pkg_class = qsearch('pkg_class', {});
-        if ( @pkg_class ) {
-     %>
-       <TR>
-         <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_pkgclasses" VALUE="1"></TD>
-         <TD>Show package classes</TD>
-       </TR>
-     <% } %>
-
-    </TABLE>
-
-    <BR><INPUT TYPE="submit" VALUE="Get Report">
-    </FORM>
-
-  </BODY>
-</HTML>
+<%= include('/elements/header.html', 'Tax Report' ) %>
 
+<FORM ACTION="report_tax.cgi" METHOD="GET">
+
+<TABLE>
+
+ <%= include( '/elements/tr-select-agent.html' ) %>
+
+ <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+
+ <% my $conf = new FS::Conf;
+    if ( $conf->exists('enable_taxclasses') ) {
+ %>
+   <TR>
+     <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_taxclasses" VALUE="1"></TD>
+     <TD>Show tax classes</TD>
+   </TR>
+ <% } %>
+
+ <% my @pkg_class = qsearch('pkg_class', {});
+    if ( @pkg_class ) {
+ %>
+   <TR>
+     <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_pkgclasses" VALUE="1"></TD>
+     <TD>Show package classes</TD>
+   </TR>
+ <% } %>
+
+</TABLE>
+
+<BR><INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/search/sqlradius.html b/httemplate/search/sqlradius.html
index 8f4878dbc..645505101 100644
--- a/httemplate/search/sqlradius.html
+++ b/httemplate/search/sqlradius.html
@@ -1,9 +1,5 @@
-<%= include( '/elements/header.html', 'Search RADIUS sessions', '', '', '
-<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
-') %>
+<%= include( '/elements/header.html', 'Search RADIUS sessions' ) %>
+
 <FORM NAME="OneTrueForm" ACTION="sqlradius.cgi" METHOD="GET">
 <% #include( '/elements/table.html' ) %>
 <%= ntable('#cccccc') %>
@@ -47,48 +43,10 @@
   </TR>
 <% } %>
 
-<TR>
-  <TD ALIGN="right">From: </TD>
-  <TD>
-    <INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date">
-  </TD>
-  <SCRIPT TYPE="text/javascript">
-    Calendar.setup({
-      inputField: "beginning_text",
-      ifFormat:   "%m/%d/%Y",
-      button:     "beginning_button",
-      align:      "BR"
-    });
-  </SCRIPT>
-</TR>
-<TR>
-  <TD></TD>
-  <TD><i>m/d/y</i></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">To: </TD>
-  <TD>
-    <INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor:pointer" TITLE="Select date">
-  </TD>
-  <SCRIPT TYPE="text/javascript">
-    Calendar.setup({
-      inputField: "ending_text",
-      ifFormat:   "%m/%d/%Y",
-      button:     "ending_button",
-      align:      "BR"
-    });
-  </SCRIPT>
-</TR>
-<TR>
-  <TD></TD>
-  <TD><i>m/d/y</i>
-  <BR><FONT SIZE="-1">(leave one or both dates blank for an open-ended search)</FONT>
-  </TD>
-</TR>
+<%= include( '/elements/tr-input-beginning_ending.html' ) %>
+
 </TABLE>
 <BR><INPUT TYPE="submit" VALUE="View sessions">
 </FORM>
-</BODY>
-</HTML>
-
 
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/search/svc_acct.html b/httemplate/search/svc_acct.html
deleted file mode 100755
index c504c2f34..000000000
--- a/httemplate/search/svc_acct.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Account Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Account Search
-    </FONT>
-    <BR><BR>
-    <FORM ACTION="svc_acct.cgi" METHOD="GET">
-      Search for <B>username</B>: 
-      <INPUT TYPE="text" NAME="username">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index f261ea9f3..b02eea8bd 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -61,7 +61,7 @@ my $link_cust = sub {
   $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
 };
 
-%><%= include ('elements/search.html',
+%><%= include( 'elements/search.html',
                  'title'             => "Domain Search Results",
                  'name'              => 'domains',
                  'query'             => $sql_query,
diff --git a/httemplate/search/svc_domain.html b/httemplate/search/svc_domain.html
deleted file mode 100755
index b759102f4..000000000
--- a/httemplate/search/svc_domain.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>Domain Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Domain Search
-    </FONT>
-    <BR><BR>
-    <FORM ACTION="svc_domain.cgi" METHOD="GET">
-      Search for <B>domain</B>: 
-      <INPUT TYPE="text" NAME="domain">
-
-      <P><INPUT TYPE="submit" VALUE="Search">
-
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/svc_external.cgi b/httemplate/search/svc_external.cgi
index 8dbb949c8..7968f3c43 100755
--- a/httemplate/search/svc_external.cgi
+++ b/httemplate/search/svc_external.cgi
@@ -38,17 +38,18 @@ if ( $query eq 'svcnum' ) {
 }
 
 if ( scalar(@svc_external) == 1 ) {
-  print $cgi->redirect(popurl(2). "view/svc_external.cgi?". $svc_external[0]->svcnum);
-  #exit;
+
+  %><%= $cgi->redirect(popurl(2). "view/svc_external.cgi?". $svc_external[0]->svcnum) %><%
+
 } elsif ( scalar(@svc_external) == 0 ) {
-%>
-<!-- mason kludge -->
-<%
-  eidiot "No matching external services found!\n";
-} else {
-%>
-<!-- mason kludge -->
-<%= include("/elements/header.html","External Search Results",'') %>
+
+  %><%= include('/elements/header.html', 'External Search Results' ) %>
+
+  No matching external services found
+
+<% } else {
+
+  %><%= include('/elements/header.html', 'External Search Results', '') %>
 
     <%= scalar(@svc_external) %> matching external services found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index ece1b62bb..32e0ee1fc 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -67,7 +67,7 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 
 <!--pkgnum: <%=$pkg->{pkgnum}%>-->
 <TR>
-  <TD ROWSPAN=<%=$rowspan%>>
+  <TD ROWSPAN=<%= $rowspan || 1 %>>
     <A NAME="cust_pkg<%=$pkg->{pkgnum}%>"><%=$pkg->{pkgnum}%></A>:
     <%=$pkg->{pkg}%> - <%=$pkg->{comment}%><BR>
 <% unless ($pkg->{cancel}) { %>
@@ -75,7 +75,7 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
     (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;|&nbsp;<%=pkg_customize_link($pkg,$cust_main->custnum)%>&nbsp;)
 <% } %>
   </TD>
-  <TD ROWSPAN=<%=$rowspan%>>
+  <TD ROWSPAN=<%= $rowspan || 1 %>>
     <TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
 
 <%
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index a0bec3906..f0cd993ff 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -58,7 +58,10 @@
 
 <% } %>
 
-<BR><A HREF="<%= $p %>edit/cust_credit.cgi?<%= $custnum %>">Post credit</A>
+<BR>
+
+<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">Post credit</A>
+
 <BR>
 
 <%
@@ -115,8 +118,10 @@ foreach my $cust_pay ($cust_main->cust_pay) {
     #completely unapplied
     $pre = '<B><FONT COLOR="#FF0000">Unapplied ';
     $post = '</FONT></B>';
-    $apply = qq! (<A HREF="${p}edit/cust_bill_pay.cgi?!.
-             $cust_pay->paynum. '">apply</A>)';
+    $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
+             $cust_pay->paynum.
+             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!;
+
   } elsif (    scalar(@cust_bill_pay)   == 1
             && scalar(@cust_pay_refund) == 0
             && $cust_pay->unapplied == 0     ) {
@@ -151,8 +156,9 @@ foreach my $cust_pay ($cust_main->cust_pay) {
       $desc .= '&nbsp;&nbsp;'.
                '<B><FONT COLOR="#FF0000">$'.
                $cust_pay->unapplied. ' unapplied</FONT></B>'.
-               qq! (<A HREF="${p}edit/cust_bill_pay.cgi?!.
-               $cust_pay->paynum. '">apply</A>)'.
+               qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
+               $cust_pay->paynum. 
+               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!.
                '<BR>';
     }
   }
@@ -264,8 +270,9 @@ foreach my $cust_credit ($cust_main->cust_credit) {
     #completely unapplied
     $pre = '<B><FONT COLOR="#FF0000">Unapplied ';
     $post = '</FONT></B>';
-    $apply = qq! (<A HREF="${p}edit/cust_credit_bill.cgi?!.
-             $cust_credit->crednum. '">apply</A>)';
+    $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
+             $cust_credit->crednum.
+             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!;
   } elsif (    scalar(@cust_credit_bill)   == 1
             && scalar(@cust_credit_refund) == 0
             && $cust_credit->credited == 0      ) {
@@ -299,8 +306,9 @@ foreach my $cust_credit ($cust_main->cust_credit) {
     if ( $cust_credit->credited > 0 ) {
       $desc .= '&nbsp;&nbsp;<B><FONT COLOR="#FF0000">$'.
                $cust_credit->credited. ' unapplied</FONT></B>'.
-               qq! (<A HREF="${p}edit/cust_credit_bill.cgi?!.
-               $cust_credit->crednum. '">apply</A>)'.
+               qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
+               $cust_credit->crednum.
+               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!.
                '<BR>';
     }
   }
-- 
cgit v1.2.1


From 6d777ed1fafabab8c308c9ffa24f1dd48f33a9a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 May 2006 11:05:04 +0000
Subject: more ACL and re-skinning work, now with RT!

---
 httemplate/elements/freeside.css |  15 ++++++
 httemplate/elements/header.html  |  21 +++++---
 httemplate/elements/xmenu.css    |  16 ++++--
 httemplate/search/cust_main.cgi  |   9 +++-
 rt/FREESIDE_MODIFIED             |   3 ++
 rt/html/Elements/FreesideNewCust |   3 ++
 rt/html/Elements/FreesideSearch  |  10 ++++
 rt/html/Elements/Header          |  10 ++--
 rt/html/Elements/PageLayout      |  25 ++++++---
 rt/html/Elements/SimpleSearch    |  10 +++-
 rt/html/Elements/Tabs            |   8 ++-
 rt/html/Elements/TitleBoxStart   |   2 +-
 rt/html/NoAuth/webrt.css         | 114 ++++++++++++++++++++++++++++-----------
 rt/html/Search/Bulk.html         |   2 +-
 14 files changed, 188 insertions(+), 60 deletions(-)
 create mode 100644 httemplate/elements/freeside.css
 create mode 100644 rt/html/Elements/FreesideNewCust
 create mode 100644 rt/html/Elements/FreesideSearch

diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css
new file mode 100644
index 000000000..5908e6aab
--- /dev/null
+++ b/httemplate/elements/freeside.css
@@ -0,0 +1,15 @@
+* {
+  font-family: Arial, Verdana, Helvetica, sans-serif;
+}
+
+A:link IMG, A:visited { border-style: none }
+A:focus {text-decoration: underline }
+
+a:link, a:visited {
+  /* text-decoration: none; */
+  color: #000000;
+} 
+/* a:hover {  text-decoration: underline } */
+
+/* a:focus { background-color: #ccccee } */
+
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 49814577e..0eb5695ce 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -16,6 +16,7 @@
     <script type="text/javascript" src="<%=$fsurl%>elements/cssexpr.js"></script>
     <script type="text/javascript" src="<%=$fsurl%>elements/xmenu.js"></script>
     <link href="<%=$fsurl%>elements/xmenu.css" type="text/css" rel="stylesheet">
+    <link href="<%=$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
     <%
 
       tie my %report_menu, 'Tie::IxHash',
@@ -183,10 +184,16 @@
     </SCRIPT>
 
     <SCRIPT TYPE="text/javascript">
-      function clearhint_search_cust () {
-        alert(this);
-        if ( this.value='(cust #, name or company)' )
-          this.value = '';
+      function clearhint_search_cust (what) {
+        if ( what.value = '(cust #, name or company)' )
+          what.value = '';
+      }
+    </SCRIPT>
+
+    <SCRIPT TYPE="text/javascript">
+      function clearhint_search_ticket (what) {
+        if ( what.value = '(ticket # or subject string)' )
+          what.value = '';
       }
     </SCRIPT>
 
@@ -200,7 +207,7 @@
           <IMG BORDER=0 ALT="freeside" SRC="<%=$fsurl%>images/small-logo.png">
         </td>
         <td align=left rowspan=2 BGCOLOR="#ffffff"> <!-- valign="top" -->
-          <font size=6><%= $conf->config('company_name') %> Billing</font>
+          <font size=6><%= $conf->config('company_name') || 'ExampleCo' %></font>
         </td>
         <td align=right valign=top BGCOLOR="#ffffff">Logged in as <b><%= getotaker %>&nbsp</b><br><FONT SIZE="-2"><a href="<%=$fsurl%>pref/XXXwritethis">Preferences</a>&nbsp;<BR><BR></FONT>
         </td>
@@ -248,13 +255,13 @@
         </TD>
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name or company)" SIZE="23" onFocus="clearhint_search_cust" onClick="clearhint_search_cust">
+            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name or company)" SIZE="23" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="text-align:right">
             <INPUT TYPE="submit" VALUE="Search customers">
           </FORM>
         </TD>
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>rt/index.html" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="q" TYPE="text" VALUE="" onFocus="clearhint_search_ticket" onClick="clearhint_search_ticket">
+            <INPUT NAME="q" TYPE="text" VALUE="(ticket # or subject string)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="text-align:right">
             <INPUT TYPE="submit" VALUE="Search tickets">
           </FORM>
         </TD>
diff --git a/httemplate/elements/xmenu.css b/httemplate/elements/xmenu.css
index 5bb8a0deb..60881b813 100644
--- a/httemplate/elements/xmenu.css
+++ b/httemplate/elements/xmenu.css
@@ -55,9 +55,14 @@
 	border:			1px solid white;
 }	
 
-.webfx-menu a:visited,
-.webfx-menu a:visited:hover {
+.webfx-menu a:visited {
 	color:			black;
+	border:			1px solid white;
+}
+
+.webfx-menu a:hover {
+	color:			black;
+	border:			1px solid #7e0079;
 }
 
 .webfx-menu a:hover {
@@ -98,11 +103,12 @@
 	/* border:			1px solid #7E0079; */
 	/* border:			1px solid #000000; */
 	/* border: none */
+	color:				white;
 
 	padding:		2px;
 	
 	font-family:	Verdana, Helvetica, Sans-Serif;
-	font-size:		11px;
+	/* font-size:		11px; */
 	
 	/* IE5.0 has the wierdest box model for inline elements */
 	padding:		expression(constExpression(ie50 ? "0px" : "2px"));
@@ -132,6 +138,10 @@
 	height:		expression(constExpression(ie50 ? "17px" : "auto"));
 }
 
+.webfx-menu-bar a:link {
+	color: white;
+}
+
 .webfx-menu-bar a:hover {
 	/* color:			black; */
 	color:			white;
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 8b70ff490..733e5dc15 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -186,6 +186,13 @@ if ( $cgi->param('browse')
     push @cust_main, @{&companysearch};
   }
 
+  if ( $cgi->param('search_cust') ) {
+    $sortby = \*company_sort;
+    $orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )";
+    warn "smart searching for: ". $cgi->param('search_cust');
+    push @cust_main, smart_search( 'search' => $cgi->param('search_cust') );
+  }
+
   @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
     if ! $cgi->param('cancelled')
        && (
@@ -313,7 +320,7 @@ END
       $conf->config('ticket_system-custom_priority_field-values');
   }
 
-  print "<BR><BR>". $pager. &table(). <<END;
+  print "<BR><BR>". $pager. include('/elements/table-grid.html'). <<END;
       <TR>
         <TH></TH>
         <TH>(bill) name</TH>
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index a013b832c..82f0ff2e6 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -21,3 +21,6 @@ html/Ticket/Elements/ShowCustomers
 html/Ticket/ModifyCustomers.html
 html/NoAuth/images/small-logo.png
  html/NoAuth/webrt.css
+
+html/Elements/TitleBoxStart
+html/Search/Bulk.html
diff --git a/rt/html/Elements/FreesideNewCust b/rt/html/Elements/FreesideNewCust
new file mode 100644
index 000000000..851c66425
--- /dev/null
+++ b/rt/html/Elements/FreesideNewCust
@@ -0,0 +1,3 @@
+<form action="<% $RT::URI::freeside::URL %>/edit/cust_main.cgi" STYLE="margin:0">
+<INPUT TYPE="submit" VALUE="<&|/l&>New customer</&>"&nbsp;
+</FORM>
diff --git a/rt/html/Elements/FreesideSearch b/rt/html/Elements/FreesideSearch
new file mode 100644
index 000000000..f0efb60d4
--- /dev/null
+++ b/rt/html/Elements/FreesideSearch
@@ -0,0 +1,10 @@
+<form action="<% $RT::URI::freeside::URL %>/search/cust_main.cgi" STYLE="margin:0">
+    <SCRIPT TYPE="text/javascript">
+      function clearhint_search_cust (what) {
+        if ( what.value = '(cust #, name or company)' )
+          what.value = '';
+      }
+    </SCRIPT>
+<input name="search_cust" accesskey="0" VALUE="(cust #, name or company)" SIZE="23" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="text-align:right">
+<input type="submit" value="<&|/l&>Search customers</&>">&nbsp;
+</form>
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index a2563fee3..bad8b58eb 100644
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -67,7 +67,7 @@ function hideshow(num) {
 </script>
 <& /Elements/Callback, _CallbackName => 'Head', %ARGS &>
 </HEAD>
-<BODY BGCOLOR="<%$BgColor%>"
+<BODY BACKGROUND="<%$fsurl%>images/background-cheat.png" STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0" 
 % if ($Focus) {
 ONLOAD="
     var tmp = (document.getElementsByName('<% $Focus %>'));
@@ -75,13 +75,15 @@ ONLOAD="
 "
 % }
 >
-<table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" STYLE="padding-left:0; padding-right:4">
   <tr> 
     <td colspan=2 rowspan=2><img border=0 alt="freeside" src="<%$RT::WebImagesURL%>/small-logo.png" width="92" height="62"></td>
-    <td align="left" rowspan=2><font size=6><% &RT::URI::freeside::FreesideGetConfig('company_name') %> Ticketing</font></td>
+    <td align="left" rowspan=2><font size=6><% &RT::URI::freeside::FreesideGetConfig('company_name') || 'ExampleCo' %></font></td>
     <td align="right" valign="top">
 % if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) {
 <SPAN STYLE="display: none"><A HREF="#skipnav"><&|/l&>Skip Menu</&></A> |</SPAN>
+<&|/l, "<b>".$session{'CurrentUser'}->Name."</b>" &>Logged in as [_1]</&>
+<BR>
 %if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) {
 <A  HREF="<%$RT::WebPath%><% $Prefs %>" ><&|/l&>Preferences</&></A>
 % }
@@ -89,8 +91,6 @@ ONLOAD="
 % unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
 | <A  HREF="<%$RT::WebPath%>/NoAuth/Logout.html<%$URL ? "?URL=".$URL : ''%>"><&|/l&>Logout</&></a>
 % }
-<BR>
-<&|/l, "<b>".$session{'CurrentUser'}->Name."</b>" &>Logged in as [_1]</&>
 % } else {
 <&|/l&>Not logged in.</&>
 % }
diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout
index 94bdbe194..5289f78f3 100644
--- a/rt/html/Elements/PageLayout
+++ b/rt/html/Elements/PageLayout
@@ -43,32 +43,43 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<table class="lightgray" border=0 cellspacing=0 cellpadding=0 width="100%">
-  <th class="lightgray" align="left" width=42%><span class="rtname"><%$AppName%></span>
+<table class="black" border=0 cellspacing=0 cellpadding=0 width="100%">
+<tr>
+  <TD colspan=4 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
+</tr>
+<tr>
+  <th class="black" align="left" width=15%><span class="rtname"><%$AppName%></span>
   </th>
       <span class="topactions">
 % foreach my $action (sort keys %{$topactions}) {
-        <td class="lightgrayright">
+        <td class="blackright">
         <%$topactions->{"$action"}->{'html'} |n %>
         </td>
 % }
       </span>
+</tr>
 </table>
 <table border=0 cellspacing=0 cellpadding=0 width="100%" height="100%">
+<TR>
+  <TD BGCOLOR="#000000" STYLE="padding:0" WIDTH="154"></TD>
+  <TD STYLE="padding:0" WIDTH="13"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gray-corner.png"></TD>
+  <TD STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gray-top.png" HEIGHT="13" WIDTH="100%"></TD>
+</TR>
 %# Vertical menu
 <TR height="100%">
-<TD valign="top" width="140" class="lightgray">
+<TD valign="top" width="140" class="black">
           <& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &>
 </TD>
+<TD STYLE="padding:0" HEIGHT="100%" WIDTH=13 VALIGN="top"><IMG WIDTH="13" HEIGHT="100%" BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gray-side.png"></TD>
 <td valign="top">
 <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
-  <td class="mediumgray" valign="top">
+  <td class="<% $actions ? 'darkmediumgray' : 'bggray' %>" valign="top">
     <span class="title"><%$title%></span>
 </td>
 </tr>
 <tr>
-<td class="mediumgrayright" valign="top">
+<td class="<% $actions ? 'darkmediumgrayright' : 'bggrayright' %>" valign="top">
     <span class="nav"> 
 % if ($actions) {
 % my @actions;
@@ -80,7 +91,7 @@
 % }
 %  }
 %#<% join(" | ", @actions) | n %>
-<% '['. join("] [", @actions). ']' | n %>
+<% '['. join("] [", @actions). ']&nbsp;' | n %>
 % if ($subactions) {
 % my @actions;
 % foreach my $action (sort keys %{$subactions}) {
diff --git a/rt/html/Elements/SimpleSearch b/rt/html/Elements/SimpleSearch
index e76f801df..55d65fc89 100644
--- a/rt/html/Elements/SimpleSearch
+++ b/rt/html/Elements/SimpleSearch
@@ -43,7 +43,13 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<form action="<% $RT::WebPath %>/index.html">
-<input size="12" name="q" autocomplete="off" accesskey="0">
+<form action="<% $RT::WebPath %>/index.html" STYLE="margin:0">
+<SCRIPT TYPE="text/javascript">
+  function clearhint_search_ticket (what) {
+    if ( what.value = '(ticket # or subject string)' )
+      what.value = '';
+  }
+</SCRIPT>
+<input name="q" accesskey="0" VALUE="(ticket # or subject string)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="text-align:right">
 <input type="submit" value="<&|/l&>Search tickets</&>">&nbsp;
 </form>
diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs
index f5839a9e5..22720072c 100644
--- a/rt/html/Elements/Tabs
+++ b/rt/html/Elements/Tabs
@@ -57,9 +57,13 @@
 <%INIT>
 my $action;
 my $basetopactions = {
-	A => { html => $m->scomp('/Elements/CreateTicket')	
+#	A => { html => $m->scomp('/Elements/CreateTicket')	
+#		},
+	A => { html => $m->scomp('/Elements/FreesideNewCust')	
 		},
-	B => { html => $m->scomp('/Elements/SimpleSearch') 
+	B => { html => $m->scomp('/Elements/FreesideSearch')	
+		},
+	C => { html => $m->scomp('/Elements/SimpleSearch') 
 		}
 	};
 my $basetabs = {
diff --git a/rt/html/Elements/TitleBoxStart b/rt/html/Elements/TitleBoxStart
index 804e5cfaa..d98fe2744 100644
--- a/rt/html/Elements/TitleBoxStart
+++ b/rt/html/Elements/TitleBoxStart
@@ -78,7 +78,7 @@ $title_class => ''
 
 $titleright_href => undef
 $titleright => undef
-$contentbg => "#dddddd"
+$contentbg => "#d4d4d4"
 $color => "#336699"
 </%ARGS>
 <%init>
diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index bc688ac1d..4748694e5 100644
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -43,7 +43,13 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+
+/* * {
+  font-family: Arial, Verdana, Helvetica, sans-serif;
+  font-size: 1.2em;
+} */
+
+SPAN.nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 12px;
 %#	 color: #FFFFFF;
 	 color: #000000;
@@ -51,7 +57,7 @@ SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 white-space: nowrap}
 .nav2 {	 font-size: 10px;
 	 white-space: nowrap}
-.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+.nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 13px;
 %#	 font-weight: normal;
 	 font-weight: bold;
@@ -59,17 +65,17 @@ SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 color: #000000;
 	 text-decoration: none;
 	 white-space: nowrap}
-.currentnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+.currentnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 13px;
          font-weight: bold;
 	 color: #FFFF66;
 	 text-decoration: none;
 	 white-space: nowrap}
-.topnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+.topnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 16px;
 	 font-weight: normal;
-%#	 color: #FFFFFF;
-	 color: #000000;
+	 color: #FFFFFF;
+%#	 color: #000000;
 	 text-decoration: none;
 	 white-space: nowrap}
 
@@ -81,37 +87,43 @@ SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 a.topnav-0 {  font-family: Verdana, sans-serif;
 	 font-size: 16px;
 	 font-weight: normal;
-	 color: #000000;
+%#	 color: #000000;
+	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-1 {  font-family: Verdana, sans-serif;
 	 font-size: 14px;
 	 font-weight: normal;
-	 color: #000000;
+%#	 color: #000000;
+	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-2 {  font-family: Verdana, sans-serif;
 	 font-size: 12px;
 	 font-weight: normal;
-	 color: #000000;
+%#	 color: #000000;
+	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-3 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
 	 font-weight: normal;
-	 color: #000000;
+%#	 color: #000000;
+	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-4 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
 	 font-weight: normal;
-	 color: #000000;
+%#	 color: #000000;
+	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-5 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
 	 font-weight: normal;
-	 color: #000000;
+%#	 color: #000000;
+	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 li.topnav-0-minor {
@@ -175,7 +187,7 @@ li.topnav-5-major {
 	 padding-bottom: .5em;
 }
 
-.currenttopnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+.currenttopnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 16px;
          font-weight: bold;
 %#	 color: #FFFF66;
@@ -191,37 +203,37 @@ li.topnav-5-major {
 a.currenttopnav-0 {  font-family: Verdana, sans-serif;
 	 font-size: 16px;
          font-weight: bold;
-	 color: #000000; background-color: #cccccc;
+	 color: #ffffff; background-color: #7e0079;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.currenttopnav-1 {  font-family: Verdana, sans-serif;
 	 font-size: 14px;
          font-weight: bold;
-	 color: #000000; background-color: #cccccc;
+	 color: #ffffff; background-color: #7e0079;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.currenttopnav-2 {  font-family: Verdana, sans-serif;
 	 font-size: 12px;
          font-weight: normal;
-	 color: #000000; background-color: #cccccc;
+	 color: #ffffff; background-color: #7e0079;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.currenttopnav-3 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
          font-weight: normal;
-	 color: #000000; background-color: #cccccc;
+	 color: #ffffff; background-color: #7e0079;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.currenttopnav-4 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
          font-weight: normal;
-	 color: #000000; background-color: #cccccc;
+	 color: #ffffff; background-color: #7e0079;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.currenttopnav-5 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
          font-weight: normal;
-	 color: #000000; background-color: #cccccc;
+	 color: #ffffff; background-color: #7e0079;
 	 text-decoration: none;
 	 white-space: nowrap}
 li.currenttopnav-0-minor {
@@ -285,18 +297,18 @@ li.currenttopnav-5-major {
 	 padding-bottom: .5em;
 }
 
-.topactions {  font-family: Verdana, Arial, Helvetica, sans-serif;
+.topactions {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 10px;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
-.subnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+.subnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 11px;
 	 font-weight: normal;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
-.currentsubnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+.currentsubnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 11px;
          font-weight: bold;
 	 color: #FFFF66;
@@ -355,6 +367,20 @@ li.currenttopnav-5-major {
 	 vertical-align: top;
 	 text-align: right;
          }
+.black {
+	 background-color: #000000;
+	 color: #ffffff;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: left;
+         }
+.blackright { 
+	 background-color: #000000;
+	 color: #ffffff;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: right;
+         }
 .mediumgray {
 	 background-color: #cccccc;
 	 background-position: left top;
@@ -367,6 +393,30 @@ li.currenttopnav-5-major {
 	 vertical-align: top;
 	 text-align: right;
          }
+.darkmediumgray {
+	 background-color: #aaaaaa;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: left;
+         }
+.darkmediumgrayright { 
+	 background-color: #aaaaaa;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: right;
+         }
+.bggray {
+	 background-color: #e8e8e8;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: left;
+         }
+.bggrayright { 
+	 background-color: #e8e8e8;
+	 background-position: left top;
+	 vertical-align: top;
+	 text-align: right;
+         }
 .white {
 	 background-color: #ffffff;
 	 background-position: left top;
@@ -396,26 +446,26 @@ div.downloadattachment {
 }
 
 
-td {  font-family: Verdana, Arial, Helvetica, sans-serif;
+td {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 11px;
 	 background-position: left top;
          }
 .black { background-color: #000000;
 	 background-position: left top;
          }
-span.rtname {  font-family: Verdana, Arial, Helvetica, sans-serif;
+span.rtname {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 18px;
 	 font-weight: normal;
 	 color: #ffffff}
-span.title {  font-family: Verdana, Arial, Helvetica, sans-serif;
+span.title {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 20px;
 	 font-weight: bold;
 	 color: #ffffff}
-.header {  font-family: Verdana, Arial, Helvetica, sans-serif;
+.header {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 12px;
 	 font-weight: bold;
 	 color: #0066CC}
-.subheader { font-family: Verdana, Arial, Helvetica, sans-serif;
+.subheader { font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 11px;
 	 font-weight: bold;
 	 color: #0066CC }
@@ -426,7 +476,7 @@ span.title {  font-family: Verdana, Arial, Helvetica, sans-serif;
 .labeltop {       font-weight: normal;
 	       text-align: right;
 	       vertical-align: top }
-.productnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
+.productnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 11px;
 	 color: #000000;
 	 text-align: center;
@@ -450,6 +500,7 @@ TD.mainbody {
         padding-right: 1em;
         margin-left: 1em;
         margin-right: 1em;
+        background-color: #e8e8e8;
 }
 
 td.boxcontainer + td.boxcontainer {
@@ -492,7 +543,7 @@ TD.titlebox {
 
 SPAN.message {
 	font-size: 100%;
-        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-family: Arial, Verdana, Helvetica, sans-serif;
 }
 
 
@@ -549,8 +600,9 @@ A:link IMG, A:visited IMG { border-style: none }
 a:focus {text-decoration: underline }
 A IMG { color: white } /* The only way to hide the border in NS 4.x */
 
-a:link {  text-decoration: none}
-a:visited {  text-decoration: none}  
+/* a:link {  text-decoration: none} */
+/* a:visited {  text-decoration: none}   */
+
 a:hover {  text-decoration: underline}
 /* a:focus { background-color: #ccccee } */
 
diff --git a/rt/html/Search/Bulk.html b/rt/html/Search/Bulk.html
index f9eef26b6..b7c64e3f8 100644
--- a/rt/html/Search/Bulk.html
+++ b/rt/html/Search/Bulk.html
@@ -68,7 +68,7 @@ $Tickets->RedoSearch();
 while (my $Ticket = $Tickets->Next) {
  $i++;
  if ($i % 2) {
-     $bgcolor = "#dddddd";
+     $bgcolor = "#d4d4d4";
  }
  else {
      $bgcolor = "#ffffff";
-- 
cgit v1.2.1


From 64dc1bb0f70ccc0b828cc1d758cd82f040e0ec33 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 May 2006 13:57:15 +0000
Subject: move most of the crap on the "main menu" to the sidebar

---
 httemplate/elements/freeside.css |   2 +-
 httemplate/elements/header.html  | 169 +---------------------
 httemplate/elements/menu.html    | 298 +++++++++++++++++++++++++++++++++++++++
 httemplate/index.html            | 204 +--------------------------
 4 files changed, 304 insertions(+), 369 deletions(-)
 create mode 100644 httemplate/elements/menu.html

diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css
index 5908e6aab..6f7cadb2e 100644
--- a/httemplate/elements/freeside.css
+++ b/httemplate/elements/freeside.css
@@ -3,7 +3,7 @@
 }
 
 A:link IMG, A:visited { border-style: none }
-A:focus {text-decoration: underline }
+/* A:focus {text-decoration: underline } */
 
 a:link, a:visited {
   /* text-decoration: none; */
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 0eb5695ce..2be2c7938 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -13,175 +13,8 @@
     <META HTTP-Equiv="Cache-Control" Content="no-cache">
     <META HTTP-Equiv="Pragma" Content="no-cache">
     <META HTTP-Equiv="Expires" Content="0"> 
-    <script type="text/javascript" src="<%=$fsurl%>elements/cssexpr.js"></script>
-    <script type="text/javascript" src="<%=$fsurl%>elements/xmenu.js"></script>
-    <link href="<%=$fsurl%>elements/xmenu.css" type="text/css" rel="stylesheet">
-    <link href="<%=$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
-    <%
 
-      tie my %report_menu, 'Tie::IxHash',
-        'Report one' => [ 'there', 'theretip' ],
-        'Report too' => [ 'here',  'heretip'  ],
-      ;
-
-      tie my %config_employees, 'Tie::IxHash',
-        'View/Edit employees' => [ $fsurl.'browse/access_user.html', 'Setup internal users' ],
-        'View/Edit employee groups' => [ $fsurl.'browse/access_group.html', 'Employee groups allow you to control access to the backend' ],
-      ;
-
-      tie my %config_export_svc_pkg, 'Tie::IxHash',
-        'View/Edit exports'             => [ $fsurl.'browse/part_export.cgi', 'Provisioning services to external machines, databases and APIs' ],
-        'View/Edit service definitions' => [ $fsurl.'browse/part_svc.cgi', 'Services are items you offer to your customers' ],
-        'View/Edit package definitions' => [ $fsurl.'browse/part_pkg.cgi', 'One or more services are grouped together into a package and given pricing information. Customers purchase packages, not services' ],
-        'View/Edit package classes'     => [ $fsurl.'browse/pkg_class.html', 'Package classes define groups of packages, for reporting and convenience purposes.' ],
-      ;
-
-      tie my %config_agent, 'Tie::IxHash',
-        'View/Edit agent types' => [ $fsurl.'browse/agent_type.cgi', 'Agent types define groups of package definitions that you can then assign to particular agents' ],
-        'View/Edit agents'      => [ $fsurl.'browse/agent.cgi', 'Agents are resellers of your service. Agents may be limited to a subset of your full offerings (via their type)' ],
-      ;
-
-      tie my %config_billing, 'Tie::IxHash',
-        'View/Edit payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ],
-        'View/Edit invoice events'           => [ $fsurl.'browse/part_bill_event.cgi', 'Actions for overdue invoices' ],
-        'View/Edit prepaid cards'            => [ $fsurl.'browse/prepay_credit.html', 'View outstanding cards, generate new cards' ],
-        'View/Edit call rates and regions'   => [ $fsurl.'browse/rate.cgi', 'Manage rate plans, regions and prefixes for VoIP and call billing' ],
-        'View/Edit locales and tax rates'    => [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ],
-      ;
-
-      tie my %config_dialup, 'Tie::IxHash',
-        'View/Edit access numbers' => [ $fsurl.'browse/svc_acct_pop.cgi', 'Points of Presence' ],
-      ;
-
-      tie my %config_broadband, 'Tie::IxHash',
-        'View/Edit routers'        => [ $fsurl.'browse/router.cgi', 'Broadband access routers' ],
-        'View/Edit address blocks' => [ $fsurl.'browse/addr_block.cgi', 'Manage address blocks and block assignments to broadband routers' ],
-      ;
-
-      tie my %config_misc, 'Tie::IxHash',
-        'View/Edit advertising sources' => [ $fsurl.'browse/part_referral.cgi', 'Where a customer heard about your service.  Tracked for informational purposes' ],
-        'View/Edit virtual fields' => [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ],
-        'View/Edit message catalog' => [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ],
-        'View/Edit inventory classes and inventory' => [ $fsurl.'browse/inventory_class.html', 'Setup inventory classes and stock inventory' ],
-      ;
-
-      tie my %config_menu, 'Tie::IxHash',
-        'Settings'      => [ $fsurl.'config/config-view.cgi', 'XXXconfigittip' ],
-        'separator'     => '', #its a separator!
-        'Employees'     => [ \%config_employees, 'XXXtooltip' ],
-        'Provisioning, services and packages'
-                        => [ \%config_export_svc_pkg, 'XXXtootip'    ],
-        'Resellers'     => [ \%config_agent, 'XXXtootip'    ],
-        'Billing'       => [ \%config_billing, 'XXXtootip'    ],
-        'Dialup'        => [ \%config_dialup, 'XXXtootip'    ],
-        'Fixed (username-less) broadband'
-                        => [ \%config_broadband, 'XXXtootip'    ],
-        'Miscellaneous' => [ \%config_misc, 'XXXtootip'    ],
-      ;
-
-      tie my %menu, 'Tie::IxHash',
-        'Home'          => [ $fsurl, 'hometip', ],
-        'Top item one'  => [ 'nowhere_yet', 'nowheretip', ],
-        'Top item too'  => [ 'nowhere_yet_either', 'eithertip', ],
-        'Reports'       => [ \%report_menu, 'reportmenutip' ],
-        'Configuration' => [ \%config_menu, 'configmenutip' ],
-      ;
-
-      use vars qw($gmenunum);
-      $gmenunum = 0;
-
-      sub submenu {
-        my($submenu, $title) = @_;
-        my $menunum = $gmenunum++;
-
-        #return two args: html, menuname
-
-        "var myMenu$menunum = new WebFXMenu;\n".
-        #"myMenu$menunum.useAutoPosition = true;\n".
-        "myMenu$menunum.emptyText = '$title';\n".
-
-        (
-          join("\n", map {
-  
-            if ( !ref( $submenu->{$_} ) ) {
-  
-              "myMenu$menunum.add(new WebFXMenuSeparator());";
-  
-            } else {
-  
-              my($url_or_submenu, $tooltip ) = @{ $submenu->{$_} };
-              if ( ref($url_or_submenu) ) {
-  
-                my($subhtml, $submenuname ) = submenu($url_or_submenu, $_); #mmm, recursion
-  
-                "$subhtml\n".
-                "myMenu$menunum.add(new WebFXMenuItem(\"$_\", null, \"$tooltip\", $submenuname ));";
-  
-              } else {
-  
-                "myMenu$menunum.add(new WebFXMenuItem(\"$_\", \"$url_or_submenu\", \"$tooltip\" ));";
-  
-              }
-  
-            }
-  
-          } keys %$submenu )
-        ). "\n".
-        "myMenu$menunum.width = 224\n",
-
-        "myMenu$menunum";
-
-      }
-
-    %>
-    <SCRIPT TYPE="text/javascript">
-
-      webfxMenuImagePath      = "<%=$fsurl%>images/";
-      webfxMenuUseHover       = 1;
-      webfxMenuShowTime       = 300;
-      webfxMenuHideTime       = 500;
-
-      var myBar = new WebFXMenuBar;
-
-      <% foreach my $item ( keys %menu ) {
-
-           my( $url_or_submenu, $tooltip ) = @{ $menu{$item} };
-
-           if ( ref($url_or_submenu) ) {
-
-             warn $item;
-
-             my( $subhtml, $submenuname ) = submenu($url_or_submenu, $item);
-
-      %>
-
-             <%= $subhtml %>
-             myBar.add(new WebFXMenuButton("<%= $item %>", null, "<%= $tooltip %>", <%= $submenuname %> ));
-
-      <%   } else { %>
-        
-             myBar.add(new WebFXMenuButton("<%= $item %>", "<%= $url_or_submenu %>", "<%= $tooltip %>" ));
-
-      <%   }
-
-        }
-      %>
-
-      myBar.show( null, 'vertical' );
-      //myBar.show( null, 'horizontal' );
-
-      //var myMenu = new WebFXMenu;
-      //myMenu.add(new WebFXMenuItem("Menu Item 1", "http://www.domain.com", "Tool tip to show"));
-      //myMenu.add(new WebFXMenuSeparator());
-      //myMenu.add(new WebFXMenuItem("Menu Item 2", "http://www.domain.com", "Tool tip to show"));
-      
-      //var mySubMenu = new WebFXMenu;
-      //mySubMenu.add(new WebFXMenuItem("Menu Item 3", "http://www.domain.com", "Tool tip to show"));
-      //myMenu.add(new WebFXMenuItem("Menu Item 4 with sub menu", null, "Tool tip to show", mySubMenu));
-
-      myBar.width = 154;
-
-    </SCRIPT>
+    <%= include('menu.html', 'freeside_baseurl' => $fsurl ) %>
 
     <SCRIPT TYPE="text/javascript">
       function clearhint_search_cust (what) {
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
new file mode 100644
index 000000000..8502c0746
--- /dev/null
+++ b/httemplate/elements/menu.html
@@ -0,0 +1,298 @@
+<%
+  my( %opt ) = @_;
+  my $conf = new FS::Conf;
+  my $fsurl = $opt{'freeside_baseurl'};
+
+  #Active tickets not assigned to a customer
+
+  tie my %report_customers_lists, 'Tie::IxHash',
+    'by customer number' => [ $fsurl. 'search/cust_main.cgi?browse=custnum', '' ],
+    'by last name' => [ $fsurl. 'search/cust_main.cgi?browse=last', '' ],
+    'by company name' => [ $fsurl. 'search/cust_main.cgi?browse=company', '' ],
+    'by active trouble tickets' => [ $fsurl. 'search/cust_main.cgi?browse=tickets', '' ],
+  ;
+
+  tie my %report_customers_search, 'Tie::IxHash',
+    'by ordering employee' => [ $fsurl. 'search/cust_main-otaker.cgi' ],
+  ;
+
+  tie my %report_customers, 'Tie::IxHash',
+    'List customers' => [ \%report_customers_lists, 'List customers' ],
+    'Search customers' => [ \%report_customers_search, 'Search customers' ],
+    'Zip code distribution' => [ $fsurl.'search/report_cust_main-zip.html', 'Zip codes by number of customers' ],
+  ;
+
+  tie my %report_invoices_open, 'Tie::IxHash',
+    'All open invoices' => [ $fsurl.'search/cust_bill.html?OPEN_date', 'All invoices with an unpaid balance' ],
+    '15 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN15_date', 'Invoices 15 days or older with an unpaid balance' ],
+    '30 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN30_date', 'Invoices 30 days or older with an unpaid balance' ],
+    '60 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN60_date', 'Invoices 60 days or older with an unpaid balance' ],
+    '90 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN90_date', 'Invoices 90 days or older with an unpaid balance' ],
+    '120 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN120_date', 'Invoices 120 days or older with an unpaid balance' ],
+  ;
+
+  tie my %report_invoices, 'Tie::IxHash',
+    'Open invoices' => [ \%report_invoices_open, 'Open invoices' ],
+    'All invoices'  => [ $fsurl. 'search/cust_bill.html?date', 'List all invoices' ],
+    'Advanced invoice reports' => [ $fsurl.'search/report_cust_bill.html', 'by agent, date range, etc.' ],
+  ;
+
+  tie my %report_services_acct, 'Tie::IxHash',
+    'All accounts by username' => [ $fsurl.'search/svc_acct.cgi?username', '' ],
+    'All accounts by UID'      => [ $fsurl.'search/svc_acct.cgi?uid', '' ],
+    'Unlinked accounts'        => [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside accounts without a customer record' ],
+  ;
+
+  tie my %report_services_domain, 'Tie::IxHash',
+    'All domains'      => [ $fsurl.'search/svc_domain.cgi?domain', '' ],
+    'Unlinked domains' => [ $fsurl.'search/svc_domain.cgi?UN_domain', 'Pre-Freeside domains without a customer record' ],
+  ;
+
+  tie my %report_services_forward, 'Tie::IxHash',
+    'All mail forwards'      => [ $fsurl.'search/svc_forward.cgi?svcnum', '' ],
+    'Unlinked mail forwards' => [ $fsurl.'search/svc_forward.cgi?UN_svcnum', 'Pre-Freeside mail forwards without a customer record' ],
+  ;
+
+  tie my %report_services_www, 'Tie::IxHash',
+    'All virtual hosts'     => [ $fsurl.'search/svc_www.cgi?svcnum', '' ],
+    'Unlinked virtual hosts' => [ $fsurl.'search/svc_www.cgi?UN_svcnum', 'Pre-Freeside virtual hosts without a customer record' ],
+  ;
+
+  tie my %report_services_broadband, 'Tie::IxHash',
+    'All broadband services' => [ $fsurl.'search/svc_broadband.cgi?svcnum', '' ],
+    #'Unlinked domain' => [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside domains without a customer record' ],
+  ;
+
+  tie my %report_services_external, 'Tie::IxHash',
+    'All external services' => [ $fsurl.'search/svc_external.cgi?id', '' ],
+    'Unlinked external services' => [ $fsurl.'search/svc_external.cgi?UN_id', 'Pre-Freeside domains without a customer record' ],
+  ;
+
+  tie my %report_services, 'Tie::IxHash',
+    'Service definitions' => [ $fsurl.'browse/part_svc.cgi?orderby=active', 'Service definitions by number of active packages' ],
+    'separator' => '',
+    'Accounts'            => [ \%report_services_acct, 'Access accounts and mailboxes' ],
+    'Domains'             => [ \%report_services_domain, 'Domains', ],
+    'Mail forwards'       => [ \%report_services_forward, 'Mail forwards', ],
+    'Virtual hosts'       => [ \%report_services_www, 'Virtual hosting', ],
+    'Broadband services'  => [ \%report_services_broadband, 'Fixed (username-less) broadband services', ],
+    'External services'   => [ \%report_services_external, 'External services', ],
+  ;
+
+  tie my %report_packages, 'Tie::IxHash',
+    'Package definitions' => [ $fsurl.'browse/part_pkg.cgi?active=1', 'Package definitions by number of active packages' ],
+    'separator' => '',
+    'All customer packages' => [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ],
+    'Suspended customer packages' => [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ],
+    'Customer packages with unconfigured services' => [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ],
+    'By next bill date' => [ $fsurl.'search/cust_pkg_report.cgi', 'Search packages by next bill date' ],
+  ;
+
+  tie my %report_financial, 'Tie::IxHash', 
+    'Sales, Credits and Receipts' => [ $fsurl.'graph/report_money_time.html', 'Sales, credits and receipts summary graph' ],
+    'Sales Report' => [ $fsurl.'graph/report_cust_bill_pkg.html', 'Sales report and graph (by agent, package class and/or date range)' ],
+    'Credit Report' => [ $fsurl.'search/report_cust_credit.html', 'Credit report (by employee and/or date range)' ],
+    'Payment Report' => [ $fsurl.'search/report_cust_pay.html', 'Credit report (by type and/or date range)' ],
+    'A/R Aging' => [ $fsurl.'search/report_receivables.html', 'Accounts Receivable Aging report' ],
+    'Prepaid Income' => [ $fsurl.'search/report_prepaid_income.html', 'Prepaid income (unearned revenue)  report' ],
+    'Sales Tax Liability' => [ $fsurl.'search/report_tax.html', 'Sales tax liability report' ],
+  ;
+
+  tie my %report_menu, 'Tie::IxHash',
+    'Customers' => [ \%report_customers,  'Customer reports'  ],
+    'Invoices'  => [ \%report_invoices,   'Invoice reports'   ],
+    'Packages'  => [ \%report_packages,   'Package reports'   ],
+    'Services'  => [ \%report_services,   'Services reports'   ],
+    'Financial' => [ \%report_financial,  'Financial reports' ],
+  ;
+
+  tie my %tools_importing, 'Tie::IxHash',
+    'Import customers from CSV file' => [ $fsurl.'misc/cust_main-import.cgi', '' ],
+    'Import one-time charges from CSV file' => [ $fsurl.'misc/cust_main-import_charges.cgi', '' ],
+  ;
+
+  tie my %tools_exporting, 'Tie::IxHash',
+    'Download database dump' => [ $fsurl. 'misc/dump.cgi', '' ],
+  ;
+  
+  #    <!-- <BR>View active NAS ports: 
+  #      <A HREF="browse/nas.cgi">session server</A> -->
+  #      <!-- or <A HREF="browse/nas-sqlradius.cgi">RADIUS</A>
+  #    <BR> -->
+
+  tie my %tools_menu, 'Tie::IxHash',
+    'Job Queue' => [ $fsurl.'search/queue.html', 'View pending job queue' ],
+    'Importing' => [ \%tools_importing, 'Import tools' ],
+    'Exporting' => [ \%tools_exporting, 'Export tools' ],
+  ;
+
+  tie my %config_employees, 'Tie::IxHash',
+    'View/Edit employees' => [ $fsurl.'browse/access_user.html', 'Setup internal users' ],
+    'View/Edit employee groups' => [ $fsurl.'browse/access_group.html', 'Employee groups allow you to control access to the backend' ],
+  ;
+
+  tie my %config_export_svc_pkg, 'Tie::IxHash',
+    'View/Edit exports'             => [ $fsurl.'browse/part_export.cgi', 'Provisioning services to external machines, databases and APIs' ],
+    'View/Edit service definitions' => [ $fsurl.'browse/part_svc.cgi', 'Services are items you offer to your customers' ],
+    'View/Edit package definitions' => [ $fsurl.'browse/part_pkg.cgi', 'One or more services are grouped together into a package and given pricing information. Customers purchase packages, not services' ],
+    'View/Edit package classes'     => [ $fsurl.'browse/pkg_class.html', 'Package classes define groups of packages, for reporting and convenience purposes.' ],
+  ;
+
+  tie my %config_agent, 'Tie::IxHash',
+    'View/Edit agent types' => [ $fsurl.'browse/agent_type.cgi', 'Agent types define groups of package definitions that you can then assign to particular agents' ],
+    'View/Edit agents'      => [ $fsurl.'browse/agent.cgi', 'Agents are resellers of your service. Agents may be limited to a subset of your full offerings (via their type)' ],
+  ;
+
+  tie my %config_billing, 'Tie::IxHash',
+    'View/Edit payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ],
+    'View/Edit invoice events'           => [ $fsurl.'browse/part_bill_event.cgi', 'Actions for overdue invoices' ],
+    'View/Edit prepaid cards'            => [ $fsurl.'browse/prepay_credit.html', 'View outstanding cards, generate new cards' ],
+    'View/Edit call rates and regions'   => [ $fsurl.'browse/rate.cgi', 'Manage rate plans, regions and prefixes for VoIP and call billing' ],
+    'View/Edit locales and tax rates'    => [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ],
+  ;
+
+  tie my %config_dialup, 'Tie::IxHash',
+    'View/Edit access numbers' => [ $fsurl.'browse/svc_acct_pop.cgi', 'Points of Presence' ],
+  ;
+
+  tie my %config_broadband, 'Tie::IxHash',
+    'View/Edit routers'        => [ $fsurl.'browse/router.cgi', 'Broadband access routers' ],
+    'View/Edit address blocks' => [ $fsurl.'browse/addr_block.cgi', 'Manage address blocks and block assignments to broadband routers' ],
+  ;
+
+  tie my %config_misc, 'Tie::IxHash',
+    'View/Edit advertising sources' => [ $fsurl.'browse/part_referral.cgi', 'Where a customer heard about your service.  Tracked for informational purposes' ],
+    'View/Edit virtual fields' => [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ],
+    'View/Edit message catalog' => [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ],
+    'View/Edit inventory classes and inventory' => [ $fsurl.'browse/inventory_class.html', 'Setup inventory classes and stock inventory' ],
+  ;
+
+  tie my %config_menu, 'Tie::IxHash',
+    'Settings'      => [ $fsurl.'config/config-view.cgi', 'XXXconfigittip' ],
+    'separator'     => '', #its a separator!
+    'Employees'     => [ \%config_employees, 'XXXtooltip' ],
+    'Provisioning, services and packages'
+                    => [ \%config_export_svc_pkg, 'XXXtootip'    ],
+    'Resellers'     => [ \%config_agent, 'XXXtootip'    ],
+    'Billing'       => [ \%config_billing, 'XXXtootip'    ],
+    'Dialup'        => [ \%config_dialup, 'XXXtootip'    ],
+    'Fixed (username-less) broadband'
+                    => [ \%config_broadband, 'XXXtootip'    ],
+    'Miscellaneous' => [ \%config_misc, 'XXXtootip'    ],
+  ;
+
+  tie my %menu, 'Tie::IxHash',
+    'Billing Main'   => [ $fsurl, 'Billing start page', ],
+    'Ticketing Main' => [ 
+                          ( $conf->config('ticket_system') eq 'RT_External'
+                            ? FS::TicketSystem->baseurl()
+                            : $fsurl.'rt/'
+                          ),
+                          'Ticketing start page',
+                        ],
+    'Reports'        => [ \%report_menu, 'Lists, reporting and graphing' ],
+    'Tools'          => [ \%tools_menu, 'Tools' ],
+    'Configuration'  => [ \%config_menu, 'Configuraiton and setup' ],
+  ;
+
+  use vars qw($gmenunum);
+  $gmenunum = 0;
+
+  sub submenu {
+    my($submenu, $title) = @_;
+    my $menunum = $gmenunum++;
+
+    #return two args: html, menuname
+
+    "var myMenu$menunum = new WebFXMenu;\n".
+    #"myMenu$menunum.useAutoPosition = true;\n".
+    "myMenu$menunum.emptyText = '$title';\n".
+
+    (
+      join("\n", map {
+
+        if ( !ref( $submenu->{$_} ) ) {
+
+          "myMenu$menunum.add(new WebFXMenuSeparator());";
+
+        } else {
+
+          my($url_or_submenu, $tooltip ) = @{ $submenu->{$_} };
+          if ( ref($url_or_submenu) ) {
+
+            my($subhtml, $submenuname ) = submenu($url_or_submenu, $_); #mmm, recursion
+
+            "$subhtml\n".
+            "myMenu$menunum.add(new WebFXMenuItem(\"$_\", null, \"$tooltip\", $submenuname ));";
+
+          } else {
+
+            "myMenu$menunum.add(new WebFXMenuItem(\"$_\", \"$url_or_submenu\", \"$tooltip\" ));";
+
+          }
+
+        }
+
+      } keys %$submenu )
+    ). "\n".
+    "myMenu$menunum.width = 224\n",
+
+    "myMenu$menunum";
+
+  }
+
+%>
+
+<script type="text/javascript" src="<%=$fsurl%>elements/cssexpr.js"></script>
+<script type="text/javascript" src="<%=$fsurl%>elements/xmenu.js"></script>
+<link href="<%=$fsurl%>elements/xmenu.css" type="text/css" rel="stylesheet">
+<link href="<%=$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
+
+<SCRIPT TYPE="text/javascript">
+
+  webfxMenuImagePath      = "<%=$fsurl%>images/";
+  webfxMenuUseHover       = 1;
+  webfxMenuShowTime       = 300;
+  webfxMenuHideTime       = 500;
+
+  var myBar = new WebFXMenuBar;
+
+  <% foreach my $item ( keys %menu ) {
+
+       my( $url_or_submenu, $tooltip ) = @{ $menu{$item} };
+
+       if ( ref($url_or_submenu) ) {
+
+         warn $item;
+
+         my( $subhtml, $submenuname ) = submenu($url_or_submenu, $item);
+
+  %>
+
+         <%= $subhtml %>
+         myBar.add(new WebFXMenuButton("<%= $item %>", null, "<%= $tooltip %>", <%= $submenuname %> ));
+
+  <%   } else { %>
+    
+         myBar.add(new WebFXMenuButton("<%= $item %>", "<%= $url_or_submenu %>", "<%= $tooltip %>" ));
+
+  <%   }
+
+    }
+  %>
+
+  myBar.show( null, 'vertical' );
+  //myBar.show( null, 'horizontal' );
+
+  //var myMenu = new WebFXMenu;
+  //myMenu.add(new WebFXMenuItem("Menu Item 1", "http://www.domain.com", "Tool tip to show"));
+  //myMenu.add(new WebFXMenuSeparator());
+  //myMenu.add(new WebFXMenuItem("Menu Item 2", "http://www.domain.com", "Tool tip to show"));
+  
+  //var mySubMenu = new WebFXMenu;
+  //mySubMenu.add(new WebFXMenuItem("Menu Item 3", "http://www.domain.com", "Tool tip to show"));
+  //myMenu.add(new WebFXMenuItem("Menu Item 4 with sub menu", null, "Tool tip to show", mySubMenu));
+
+  myBar.width = 154;
+
+</SCRIPT>
diff --git a/httemplate/index.html b/httemplate/index.html
index 33083f6e5..95d4580bd 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -4,72 +4,24 @@
   <BR>
 
 [<A NAME="customer_service" style="background-color: #cccccc">&nbsp;Sales&nbsp;/&nbsp;Customer&nbsp;service&nbsp;</A>]
-<% if ( $conf->config('ticket_system') ) { %>
-  [&nbsp;<A HREF="#ticketing">Support&nbsp;/&nbsp;Ticketing</A>&nbsp;]
-<% } %>
 [&nbsp;<A HREF="#bookkeeping">Bookkeeping&nbsp;/&nbsp;Collections</A>&nbsp;]
 [&nbsp;<A HREF="#reports">Reports</A>&nbsp;]
-[&nbsp;<A HREF="#sysadmin">Sysadmin</A>&nbsp;]
     <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0" WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
     <TR><TH BGCOLOR="#cccccc">Sales / Customer service</TH></TR>
     <TR><TD>
-        <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
-        <BR>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="GET"><INPUT TYPE="hidden" NAME="custnum_on" VALUE="1">Customer # <INPUT TYPE="text" NAME="custnum_text"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=custnum">all customers by customer number</A></FORM>
-        <FORM ACTION="search/cust_main.cgi" METHOD="GET"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
-        <FORM ACTION="search/cust_main.cgi" METHOD="GET"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="company_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
-<% if ( $conf->exists('address2-search') ) { %>
-        <FORM ACTION="search/cust_main.cgi" METHOD="GET"><INPUT TYPE="hidden" NAME="address2_on" VALUE="1">Unit <INPUT TYPE="text" NAME="address2_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
-<% } %>
-        <FORM ACTION="search/cust_main.cgi" METHOD="GET"><INPUT TYPE="hidden" NAME="phone_on" VALUE="1">Phone # <INPUT TYPE="text" NAME="phone_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
-        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="GET">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A> or <A HREF="search/svc_acct.cgi?uid">uid</A></FORM>
-        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="GET">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
-	<BR><FORM ACTION="search/svc_broadband.cgi" METHOD="GET">IP Address <INPUT TYPE="text" NAME="ip_addr"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_broadband.cgi?svcnum">all services by svcnum</A> or <A HREF="search/svc_broadband.cgi?blocknum">address block</A></FORM>
-        <BR><A HREF="search/svc_forward.cgi?svcnum">all mail forwards by svcnum</A><BR>
-        <BR><A HREF="search/svc_www.cgi?svcnum">all virtual hosts by svcnum</A><BR>
-        <BR><A HREF="search/svc_external.cgi?svcnum">all external services by svcnum</A><BR>
+        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="GET">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"></FORM>
+        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="GET">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"></FORM>
+	<BR><FORM ACTION="search/svc_broadband.cgi" METHOD="GET">IP Address <INPUT TYPE="text" NAME="ip_addr"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <BR>
     </TD></TR>
     </TABLE>
 
     <BR><BR><BR>
 
-<% if ( $conf->config('ticket_system') ) { %>
 
 [&nbsp;<A HREF="#customer_service">Sales&nbsp;/&nbsp;Customer&nbsp;service</A>&nbsp;]
-[<A NAME="ticketing" style="background-color: #cccccc">&nbsp;Support&nbsp;/&nbsp;Ticketing&nbsp;</A>]
-[&nbsp;<A HREF="#bookkeeping">Bookkeeping&nbsp;/&nbsp;Collections</A>&nbsp;]
-[&nbsp;<A HREF="#reports">Reports</A>&nbsp;]
-[&nbsp;<A HREF="#sysadmin">Sysadmin</A>&nbsp;]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0" WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
-    <TR><TH BGCOLOR="#cccccc">Support/Ticketing</TH></TR>
-    <TR><TD>
-	<% if ( $conf->config('ticket_system') eq 'RT_Internal' ) { %>
-        <BR><FONT SIZE="+1"><A HREF="rt/">Ticketing Main</A></FONT>
-        <BR><BR>
-        Reports
-        <UL>
-          <LI><A HREF="search/cust_main.cgi?browse=tickets">Customers sorted by active tickets</A>
-	  <!-- <LI><A HREF="">Active tickets not assigned to a customer</A> -->
-	<% } else { %>
-	<BR><FONT SIZE="+1"><A HREF="<%=FS::TicketSystem->baseurl()%>">Ticketing Main</A></FONT>
-        <BR><BR>
-        <% } %>
-    </TD></TR>
-    </TABLE>
-
-    <BR><BR><BR>
-
-<% } %>
-
-
-[&nbsp;<A HREF="#customer_service">Sales&nbsp;/&nbsp;Customer&nbsp;service</A>&nbsp;]
-<% if ( $conf->config('ticket_system') ) { %>
-  [&nbsp;<A HREF="#ticketing">Support&nbsp;/&nbsp;Ticketing</A>&nbsp;]
-<% } %>
 [<A NAME="bookkeeping" style="background-color: #cccccc">&nbsp;Bookkeeping&nbsp;/&nbsp;Collections&nbsp;</A>]
 [&nbsp;<A HREF="#reports">Reports</A>&nbsp;]
-[&nbsp;<A HREF="#sysadmin">Sysadmin</A>&nbsp;]
     <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
     <TR><TH BGCOLOR="#cccccc">Bookkeeping / Collections</TH></TR>
     <TR><TD>
@@ -78,30 +30,12 @@
       <BR><FORM ACTION="search/cust_main.cgi" METHOD="GET">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <FORM ACTION="search/cust_bill.html" METHOD="GET">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <FORM ACTION="search/cust_pay.cgi" METHOD="GET">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>      <BR><BR><A HREF="search/cust_pkg_report.cgi">Packages (by next bill date range)</A>
-      <BR><BR>Invoice reports
-            <UL>
-              <LI>open invoices (<A HREF="search/cust_bill.html?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN_custnum">by customer number</A>)
-              <LI>15 day open invoices (<A HREF="search/cust_bill.html?OPEN15_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN15_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN15_custnum">by customer number</A>)
-              <LI>30 day open invoices (<A HREF="search/cust_bill.html?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN30_custnum">by customer number</A>)
-              <LI>60 day open invoices (<A HREF="search/cust_bill.html?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN60_custnum">by customer number</A>)
-              <LI>90 day open invoices (<A HREF="search/cust_bill.html?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN90_custnum">by customer number</A>)
-              <LI>120 day open invoices (<A HREF="search/cust_bill.html?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN120_custnum">by customer number</A>)
-              <LI>all invoices (<A HREF="search/cust_bill.html?invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?date">by date</A>) (<A HREF="search/cust_bill.html?custnum">by customer number</A>)
-            </UL>
-      <A HREF="search/report_cust_bill.html">Advanced invoice reports</A><BR><BR>
+      <BR>
       Invoice event reports
             <UL>
               <LI><a href="search/cust_bill_event.html">All invoice events for a date range</a>
               <LI><a href="search/cust_bill_event.html?failed=1">Invoice event errors for a date range (failed credit cards, processor or printer problems, etc.)</a>
             </UL>
-      <A HREF="graph/report_money_time.html">Sales, Credits and Receipts Summary</A>
-      <BR><BR><A HREF="graph/report_cust_bill_pkg.html">Sales report (by agent, package class and/or date range)</A>
-      <BR><BR><A HREF="search/report_cust_credit.html">Credit report (by employee and/or date range)</A>
-      <BR><BR><A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
-      <BR><BR><A HREF="search/report_receivables.html">Accounts Receivable Aging Summary</A>
-      <BR><BR><A HREF="search/report_prepaid_income.html">Prepaid Income (Unearned Revenue) Report</A>
-      <BR><BR><A HREF="search/report_tax.html">Sales Tax Liability Report</A>
       <BR><BR>
     </TD></TR>
     </TABLE>
@@ -113,150 +47,20 @@
 
 
 [&nbsp;<A HREF="#customer_service">Sales&nbsp;/&nbsp;Customer&nbsp;service</A>&nbsp;]
-<% if ( $conf->config('ticket_system') ) { %>
-  [&nbsp;<A HREF="#ticketing">Support&nbsp;/&nbsp;Ticketing</A>&nbsp;]
-<% } %>
 [&nbsp;<A HREF="#bookkeeping">Bookkeeping&nbsp;/&nbsp;Collections</A>&nbsp;]
 [<A NAME="reports" style="background-color: #cccccc">&nbsp;Reports&nbsp;</A>]
-[&nbsp;<A HREF="#sysadmin">Sysadmin</A>&nbsp;]
     <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
     <TR><TH BGCOLOR="#cccccc">Reports</TH></TR>
     <TR><TD>
       <BR>
       <A HREF="search/sqlradius.html">RADIUS sessions</A><BR><BR>
-      Auditing pre-Freeside services with no customer record
-      <UL>
-        <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
-        <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>)
-        <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
-        <LI>unlinked externals (<A HREF="search/svc_external.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_external.cgi?UN_id">by id</A>)
-      </UL>
-      Packages
-      <UL>
-        <LI><A HREF="search/cust_pkg.cgi?pkgnum">all packages (by package number)</A>
-        <LI><A HREF="search/cust_pkg.cgi?magic=suspended">suspended packages (by package number)</A>
-        <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
-        <LI><A HREF="search/cust_pkg_report.cgi">packages (by next bill date range)</A>
-      </UL>
-      <A HREF="browse/part_pkg.cgi?active=1">Package definitions (by number of active packages)</A><BR><BR>
-      <A HREF="browse/part_svc.cgi?orderby=active">Service definitions (by number of active services)</A><BR><BR>
-    Customers
-      <UL>
-        <LI><A HREF="search/cust_main-otaker.cgi">Search customers by ordering employee</A>
-      </UL>
-    <A HREF="search/report_cust_main-zip.html">Zip code distribution</A><BR><BR>
     <FORM ACTION="search/sql.html" METHOD="GET">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
 
     <BR>
     </TD></TR>
     </TABLE>
 
-
-
     <BR><BR><BR>
 
-
-[&nbsp;<A HREF="#customer_service">Sales&nbsp;/&nbsp;Customer&nbsp;service</A>&nbsp;]
-<% if ( $conf->config('ticket_system') ) { %>
-  [&nbsp;<A HREF="#ticketing">Support&nbsp;/&nbsp;Ticketing</A>&nbsp;]
-<% } %>
-[&nbsp;<A HREF="#bookkeeping">Bookkeeping&nbsp;/&nbsp;Collections</A>&nbsp;]
-[&nbsp;<A HREF="#reports">Reports</A>&nbsp;]
-[<A NAME="sysadmin" style="background-color: #cccccc">&nbsp;Sysadmin&nbsp;</A>]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
-    <TR><TH BGCOLOR="#cccccc">Sysadmin</TH></TR>
-    <TR><TD>
-      <BR>
-      <!-- <BR>View active NAS ports: 
-        <A HREF="browse/nas.cgi">session server</A> -->
-        <!-- or <A HREF="browse/nas-sqlradius.cgi">RADIUS</A>
-      <BR> -->
-      <A HREF="search/queue.html">View pending job queue</A>
-      <BR><A HREF="misc/cust_main-import.cgi">Batch import customers from CSV file</A>
-      <BR><A HREF="misc/cust_main-import_charges.cgi">Batch import charges from CSV file</A>
-      <BR><A HREF="misc/dump.cgi">Download database dump</A>
-      <BR><BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
-      <A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
-      <BR><BR>
-      <A NAME="employees">Employees</A>
-        <UL>
-          <LI><A HREF="browse/access_user.html">View/Edit employees</A>
-            - Setup internal users
-          <LI><A HREF="browse/access_group.html">View/Edit employee groups</A>
-            - Employee groups allow you to control access to the backend
-        </UL>
-      <A NAME="admin">Provisioning, services and packages</a>
-        <ul>
-          <LI><A HREF="browse/part_export.cgi">View/Edit exports</A>
-            - Provisioning services to external machines, databases and APIs.
-          <LI><A HREF="browse/part_svc.cgi">View/Edit service definitions</A>
-            - Services are items you offer to your customers.
-          <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
-            - One or more services are grouped together into a package and
-              given pricing information.  Customers purchase packages, not
-              services.
-          <LI><A HREF="browse/pkg_class.html">View/Edit package classes</A>
-            - Package classes define groups of packages, for reporting and
-              convenience purposes.
-        </ul>
-      <A NAME="admin_agent">Resellers</a>
-        <ul>
-          <LI><A HREF="browse/agent_type.cgi">View/Edit agent types</A>
-            - Agent types define groups of package definitions that you can
-              then assign to particular agents.
-          <LI><A HREF="browse/agent.cgi">View/Edit agents</A>
-            - Agents are resellers of your service.  Agents may be limited
-              to a subset of your full offerings (via their type).
-        </ul>
-      <A NAME="admin_billing">Billing</a>
-        <ul>
-          <LI><A HREF="browse/payment_gateway.html">View/Edit payment gateways</A>
-            - Credit card and electronic check processors
-          <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A>
-            - Actions for overdue invoices
-          <LI><A HREF="search/prepay_credit.html">View/Edit prepaid cards</A>
-            - View outstanding cards, generate new cards
-	  <LI><A HREF="browse/rate.cgi">View/Edit call rates and regions</A>
-	    - Manage rate plans, regions and prefixes for VoIP and call billing.
-          <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
-            - Change tax rates, or break down a country into states, or a state
-              into counties and assign different tax rates to each.
-        </ul>
-      <A NAME="admin_svc_acct">Dialup</a>
-        <ul>
-          <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit access numbers</A>
-            - Points of Presence 
-        </ul>
-      <A NAME="admin_svc_broadband">Fixed (username-less) broadband</a>
-        <ul>
-	  <LI><A HREF="browse/router.cgi">View/Edit routers</A>
-	  - Broadband access routers
-	  <LI><A HREF="browse/addr_block.cgi">View/Edit address blocks</A>
-	  - Manage address blocks and block assignments to broadband routers.
-	</ul>
-      <A NAME="admin_misc">Miscellaneous</a>
-        <ul>
-          <LI><A HREF="browse/part_referral.cgi">View/Edit advertising sources</A>
-            - Where a customer heard about your service.  Tracked for
-              informational purposes.
-          <LI><A HREF="browse/part_virtual_field.cgi">View/Edit virtual fields</A>
-	  - Locally defined fields
-	  <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A>
-	  - Change error messages and other customizable labels.
-	  <LI><A HREF="browse/inventory_class.html">View/Edit inventory classes and inventory</A>
-	  - Setup inventory classes and stock inventory.
-	</ul>
-        <BR>
-      </TD></TR>
-      </TABLE>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-
 <%= include('/elements/footer.html') %>
 
-- 
cgit v1.2.1


From 50f25b285b2caf77d267ed66f03e56924ad7229f Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sat, 20 May 2006 20:06:30 +0000
Subject: first stab at BoM download

---
 FS/FS.pm                             |   4 +-
 FS/FS/Schema.pm                      |  15 ++++-
 FS/FS/cust_bill.pm                   |  20 +++++-
 FS/FS/cust_pay_batch.pm              |  40 +++++++++---
 FS/FS/pay_batch.pm                   | 121 +++++++++++++++++++++++++++++++++++
 FS/MANIFEST                          |   6 ++
 FS/t/pay_batch.t                     |   5 ++
 README.1.5.7.lastbit                 |   5 ++
 README.1.5.8                         |   9 +++
 htetc/handler.pl                     |   1 +
 httemplate/browse/cust_pay_batch.cgi |   6 +-
 httemplate/docs/schema.html          |  10 ++-
 httemplate/docs/upgrade10.html       |   8 +++
 httemplate/misc/download-batch.cgi   |  69 +++++++++++++++++++-
 14 files changed, 298 insertions(+), 21 deletions(-)
 create mode 100644 FS/FS/pay_batch.pm
 create mode 100644 FS/t/pay_batch.t

diff --git a/FS/FS.pm b/FS/FS.pm
index f41245e22..d8999ca5e 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -142,7 +142,9 @@ L<FS::cust_credit_bill> - Credit application to invoice class
 
 L<FS::cust_pay_refund> - Refund application to payment class
 
-L<FS::cust_pay_batch> - Credit card transaction queue class
+L<FS::pay_batch> - Credit card transaction queue class
+
+L<FS::cust_pay_batch> - Credit card transaction member queue class
 
 L<FS::prepay_credit> - Prepaid "calling card" credit class.
 
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e81185666..17d541e8c 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -538,10 +538,21 @@ sub tables_hashref {
       'index' => [ [ 'paynum' ], [ 'invnum' ] ],
     },
 
+    'pay_batch' => { #batches of payments to an external processor
+      'columns' => [
+        'batchnum',   'serial',    '',   '', '', '', 
+        'status',  'char', 'NULL',     1, '', '', 
+      ],
+      'primary_key' => 'batchnum',
+      'unique' => [],
+      'index' => [],
+    },
+
     'cust_pay_batch' => { #what's this used for again?  list of customers
                           #in current CARD batch? (necessarily CARD?)
       'columns' => [
         'paybatchnum',   'serial',    '',   '', '', '', 
+        'batchnum',   'int',    '',   '', '', '', 
         'invnum',   'int',    '',   '', '', '', 
         'custnum',   'int',    '',   '', '', '', 
         'last',     'varchar', '',     $char_d, '', '', 
@@ -553,7 +564,7 @@ sub tables_hashref {
         'zip',      'varchar', 'NULL', 10, '', '', 
         'country',  'char', '',     2, '', '', 
         #        'trancode', 'int', '', '', '', ''
-        'cardnum',  'varchar', '',     16, '', '', 
+        'payinfo',  'varchar', '',     512, '', '', 
         #'exp',      @date_type, '', ''
         'exp',      'varchar', '',     11, '', '', 
         'payname',  'varchar', 'NULL', $char_d, '', '', 
@@ -561,7 +572,7 @@ sub tables_hashref {
       ],
       'primary_key' => 'paybatchnum',
       'unique' => [],
-      'index' => [ ['invnum'], ['custnum'] ],
+      'index' => [ ['batchnum'], ['invnum'], ['custnum'] ],
     },
 
     'cust_pkg' => {
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index bcae4d646..c2a39afda 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -13,7 +13,7 @@ use HTML::Entities;
 use Locale::Country;
 use FS::UID qw( datasrc );
 use FS::Misc qw( send_email send_fax );
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::cust_main_Mixin;
 use FS::cust_main;
 use FS::cust_bill_pkg;
@@ -1282,8 +1282,22 @@ L<FS::cust_pay_batch>).
 sub batch_card {
   my $self = shift;
   my $cust_main = $self->cust_main;
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $pay_batch = qsearchs('pay_batch'=> '');
+
+  unless ($pay_batch) {
+    $pay_batch = new FS::pay_batch;
+    my $error = $pay_batch->insert;
+    if ( $error ) {
+      die "error creating new batch: $error\n";
+    }
+  }
 
   my $cust_pay_batch = new FS::cust_pay_batch ( {
+    'batchnum' => $pay_batch->getfield('batchnum'),
     'invnum'   => $self->getfield('invnum'),
     'custnum'  => $cust_main->getfield('custnum'),
     'last'     => $cust_main->getfield('last'),
@@ -1294,7 +1308,7 @@ sub batch_card {
     'state'    => $cust_main->getfield('state'),
     'zip'      => $cust_main->getfield('zip'),
     'country'  => $cust_main->getfield('country'),
-    'cardnum'  => $cust_main->payinfo,
+    'payinfo'  => $cust_main->payinfo,
     'exp'      => $cust_main->getfield('paydate'),
     'payname'  => $cust_main->getfield('payname'),
     'amount'   => $self->owed,
@@ -1302,6 +1316,8 @@ sub batch_card {
   my $error = $cust_pay_batch->insert;
   die $error if $error;
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   '';
 }
 
diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 25b796ba9..117d72561 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -37,7 +37,7 @@ following fields are currently supported:
 
 =item paybatchnum - primary key (automatically assigned)
 
-=item cardnum
+=item payinfo
 
 =item exp - card expiration 
 
@@ -119,7 +119,7 @@ sub check {
   my $error = 
       $self->ut_numbern('paybatchnum')
     || $self->ut_numbern('trancode') #depriciated
-    || $self->ut_number('cardnum') 
+    || $self->ut_number('payinfo') 
     || $self->ut_money('amount')
     || $self->ut_number('invnum')
     || $self->ut_number('custnum')
@@ -137,14 +137,19 @@ sub check {
   $self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
   $self->first($1);
 
-  my $cardnum = $self->cardnum;
-  $cardnum =~ s/\D//g;
-  $cardnum =~ /^(\d{13,16})$/
-    or return "Illegal credit card number";
-  $cardnum = $1;
-  $self->cardnum($cardnum);
-  validate($cardnum) or return "Illegal credit card number";
-  return "Unknown card type" if cardtype($cardnum) eq "Unknown";
+  # FIXME
+  # there is no point in false laziness here
+  # we will effectively set "check_payinfo to 0"
+  # we can change that when we finish the refactor
+  
+  #my $cardnum = $self->cardnum;
+  #$cardnum =~ s/\D//g;
+  #$cardnum =~ /^(\d{13,16})$/
+  #  or return "Illegal credit card number";
+  #$cardnum = $1;
+  #$self->cardnum($cardnum);
+  #validate($cardnum) or return "Illegal credit card number";
+  #return "Unknown card type" if cardtype($cardnum) eq "Unknown";
 
   if ( $self->exp eq '' ) {
     return "Expiration date required"; #unless 
@@ -305,6 +310,21 @@ sub import_results {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  my $pay_batch = qsearchs('pay_batch',{'batchnum'=> $paybatch});
+  unless ($pay_batch && $pay_batch->status eq 'I') {
+    $dbh->rollback if $oldAutoCommit;
+    return "batch $paybatch is not in transit";
+  };
+
+  my %batchhash = $pay_batch->hash;
+  $batchhash{'status'} = 'R';   # Resolved
+  my $newbatch = new FS::pay_batch ( \%batchhash );
+  my $error = $newbatch->replace($paybatch);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error
+  }
+
   my $total = 0;
   my $line;
   while ( defined($line=<$fh>) ) {
diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
new file mode 100644
index 000000000..192c5df83
--- /dev/null
+++ b/FS/FS/pay_batch.pm
@@ -0,0 +1,121 @@
+package FS::pay_batch;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::pay_batch - Object methods for pay_batch records
+
+=head1 SYNOPSIS
+
+  use FS::pay_batch;
+
+  $record = new FS::pay_batch \%hash;
+  $record = new FS::pay_batch { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::pay_batch object represents an example.  FS::pay_batch inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item batchnum - primary key
+
+=item status - 
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new example.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'pay_batch'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('batchnum')
+    || $self->ut_enum('status', [ '', 'I', 'R' ])
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+The author forgot to customize this manpage.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index bd810a8db..4e71e720b 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -340,3 +340,9 @@ t/access_groupagent.t
 FS/access_right.pm
 t/access_right.t
 FS/m2m_Common.pm
+FS/pay_batch.pm
+t/pay_batch.t
+FS/pay_batch.pm
+t/pay_batch.t
+FS/pay_batch.pm
+t/pay_batch.t
diff --git a/FS/t/pay_batch.t b/FS/t/pay_batch.t
new file mode 100644
index 000000000..c43133dc2
--- /dev/null
+++ b/FS/t/pay_batch.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::pay_batch;
+$loaded=1;
+print "ok 1\n";
diff --git a/README.1.5.7.lastbit b/README.1.5.7.lastbit
index ad29e4c02..872d30ac3 100644
--- a/README.1.5.7.lastbit
+++ b/README.1.5.7.lastbit
@@ -62,3 +62,8 @@ ALTER TABLE virtual_field ALTER vfieldnum SET NOT NULL;
 ALTER TABLE virtual_field ADD PRIMARY KEY (vfieldnum);
 -- ALTER TABLE h_virtual_field ADD vfieldnum int;
 
+ALTER TABLE cust_pay_batch RENAME COLUMN cardnum TO payinfo;
+ALTER TABLE cust_pay_batch ALTER COLUMN payinfo varchar(512) NULL;
+ALTER TABLE h_cust_pay_batch RENAME COLUMN cardnum TO payinfo;
+ALTER TABLE h_cust_pay_batch ALTER COLUMN payinfo varchar(512) NULL;
+
diff --git a/README.1.5.8 b/README.1.5.8
index 6ad19b063..4335a5677 100644
--- a/README.1.5.8
+++ b/README.1.5.8
@@ -8,6 +8,15 @@ install DBIx::DBSchema 0.27 (or later)
 install HTML::Widgets:SelectLayers 0.05 (or later)
 install Business::CreditCard 0.28 (or later)
 
+ALTER TABLE cust_pay_batch ADD COLUMN batchnum int;
+ALTER TABLE cust_pay_batch ALTER COLUMN batchnum SET NOT NULL;
+ALTER TABLE cust_pay_batch ADD COLUMN payinfo varchar(512);
+UPDATE cust_pay_batch SET payinfo = cardnum;
+ALTER TABLE cust_pay_batch DROP COLUMN cardnum;
+ALTER TABLE h_cust_pay_batch ADD COLUMN payinfo varchar(512);
+UPDATE h_cust_pay_batch SET payinfo = cardnum;
+ALTER TABLE h_cust_pay_batch DROP COLUMN cardnum;
+
 make install-perl-modules
 run "freeside-upgrade username" to uprade your database schema
 
diff --git a/htetc/handler.pl b/htetc/handler.pl
index cbe2dd35d..d400a55ea 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -149,6 +149,7 @@ sub handler
       use FS::part_svc;
       use FS::part_svc_router;
       use FS::part_virtual_field;
+      use FS::pay_batch;
       use FS::pkg_svc;
       use FS::port;
       use FS::queue qw(joblisting);
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 0f05ecb25..6ee983ab4 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -3,7 +3,9 @@
 
 <FORM ACTION="<%=$p%>misc/download-batch.cgi" METHOD="POST">
 Download batch in format <SELECT NAME="format">
+<OPTION VALUE="">Default batch mode</OPTION>
 <OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV file for TD Canada Trust Merchant PC Batch</OPTION>
+<OPTION VALUE="BoM">Bank of Montreal ECA results</OPTION>
 </SELECT><INPUT TYPE="submit" VALUE="Download"></FORM>
 <BR><BR>
 
@@ -11,7 +13,9 @@ Download batch in format <SELECT NAME="format">
 Upload results<BR>
 Filename <INPUT TYPE="file" NAME="batch_results"><BR>
 Format <SELECT NAME="format">
+<OPTION VALUE="">Default batch mode</OPTION>
 <OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV results from TD Canada Trust Merchant PC Batch</OPTION>
+<OPTION VALUE="BoM">Bank of Montreal ECA results</OPTION>
 </SELECT><BR>
 <INPUT TYPE="submit" VALUE="Upload"></FORM>
 <BR>
@@ -47,7 +51,7 @@ $<%= sprintf("%.2f", $total) %> total in pending batch<BR>
 foreach my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
                              qsearch('cust_pay_batch', {} )
 ) {
-  my $cardnum = $cust_pay_batch->cardnum;
+  my $cardnum = $cust_pay_batch->payinfo;
   #$cardnum =~ s/.{4}$/xxxx/;
   $cardnum = 'x'x(length($cardnum)-4). substr($cardnum,(length($cardnum)-4));
 
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index cdb59a2e9..d9e35efc7 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -199,10 +199,16 @@
         <li>amount
         <li>_date
       </ul>
-    <li><a name="cust_pay_batch" href="man/FS/cust_pay_batch.html">cust_pay_batch</a> - Pending batch
+    <li><a name="pay_batch" href="man/FS/pay_batch.html">pay_batch</a> - Pending batch
+      <ul>
+        <li>batchnum
+        <li>status
+      </ul>
+    <li><a name="cust_pay_batch" href="man/FS/cust_pay_batch.html">cust_pay_batch</a> - Pending batch members
       <ul>
         <li>paybatchnum
-        <li>cardnum
+        <li>batchnum
+        <li>payinfo - account number
         <li>exp - card expiration
         <li>amount
         <li>invnum - <a href="#cust_bill">invoice</a>
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 7cd1d8e50..2a4b0d975 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -46,6 +46,14 @@ DROP INDEX cust_bill_pkg1;
 <pre>
 ALTER TABLE cust_main ALTER COLUMN payinfo varchar(512) NULL;
 ALTER TABLE h_cust_main ALTER COLUMN payinfo varchar(512) NULL;
+ALTER TABLE cust_pay_batch ADD COLUMN batchnum int NOT NULL;
+ALTER TABLE cust_pay_batch ALTER COLUMN batchnum SET NOT NULL;
+ALTER TABLE cust_pay_batch ADD COLUMN payinfo varchar(512) NULL;
+UPDATE cust_pay_batch SET payinfo = cardnum;
+ALTER TABLE cust_pay_batch DROP COLUMN cardnum;
+ALTER TABLE h_cust_pay_batch ADD COLUMN payinfo varchar(512) NULL;
+UPDATE h_cust_pay_batch SET payinfo = cardnum;
+ALTER TABLE h_cust_pay_batch DROP COLUMN cardnum;
 </pre>
 On older Pg versions that don't support altering columns directly, you will need to dump the database, edit the schema definitions in the dump file, and reload.
 
diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 306ef5d63..5a98f1d51 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -1,16 +1,79 @@
 <%
 
+my $conf=new FS::Conf;
+
 #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
 http_header('Content-Type' => 'text/plain' );
 
+#need default
+my $formatconfig = "batchconfig".$cgi->param('format');
+
+die "No batch configuration exists.\n$formatconfig\n" unless $conf->exists($formatconfig);
+my $format = $conf->config($formatconfig);
+
+my $oldAutoCommit = $FS::UID::AutoCommit;
+local $FS::UID::AutoCommit = 0;
+my $dbh = dbh;
+
+my $pay_batch = qsearchs('pay_batch', {'status'=>''} );
+die "No pending batch. \n" unless $pay_batch;
+
+my %batchhash = $pay_batch->hash;
+$batchhash{'status'} = 'I';
+my $new = new FS::pay_batch \%batchhash;
+my $error = $new->replace($pay_batch);
+die "error updating batch status: $error\n" if $error;
+
+my $batchtotal=0;
+my $batchcount=0;
+
+my (@date)=localtime();
+my $jdate = sprintf("%03d", $date[5] % 100).sprintf("%03d", $date[7]);
+
+if ($format eq "BoM") {
+  my($reformat,$origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) = $conf->config('batchconfig');
+  printf "A%10s%04u%06u%05u%54s\n",$origid,$pay_batch->batchnum,$jdate,$datacenter,"";
+  printf "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct;
+}elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
+  1;
+}else{
+  die "Unknown format for batch in batchconfig. \n";
+}
+
+
 for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
-                              qsearch('cust_pay_batch', {} )
+                           qsearch('cust_pay_batch',
+			      {'batchnum'=>$pay_batch->batchnum} )
 ) {
 
 $cust_pay_batch->exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
 my( $mon, $y ) = ( $2, $1 );
 $mon = "0$mon" if $mon < 10;
 my $exp = "$mon$y";
+$batchcount++;
+$batchtotal += $cust_pay_batch->amount;
+
+if ($format eq "BoM") {
+  my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
+  printf "D%010u%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->invnum;
+}elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
+%>,,,,<%= $cust_pay_batch->payinfo %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %>
+<% }else{
+   die "I'm already dead, but you did not know that.\n";
+}
+
+}
+
+if ($format eq "BoM") {
+  printf "YD%08u%014u%56s\n",$batchcount,$batchtotal*100,"";
+  printf "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","";
+}elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
+  1;
+} else{
+  die "I'm already dead (again), but you did not know that.\n";
+}
+
+$dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+%>
 
-%>,,,,<%= $cust_pay_batch->cardnum %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %>
-<% } %>
-- 
cgit v1.2.1


From 2594960a919709a148ff56c1176e9df6f7176753 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 21 May 2006 18:40:09 +0000
Subject: tyop

---
 FS/FS/part_export/communigate_pro_singledomain.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/communigate_pro_singledomain.pm b/FS/FS/part_export/communigate_pro_singledomain.pm
index 6a1bf60eb..e25043fbb 100644
--- a/FS/FS/part_export/communigate_pro_singledomain.pm
+++ b/FS/FS/part_export/communigate_pro_singledomain.pm
@@ -20,7 +20,7 @@ tie my %options, 'Tie::IxHash', %FS::part_export::communigate_pro::options,
 Real time export to a
 <a href="http://www.stalker.com/CommuniGatePro/">CommuniGate Pro</a>
 mail server.  This is an unusual export to CommuniGate Pro that forces all
-accounts into a single domain.  As CommuniGate Pro supports multipledomains,
+accounts into a single domain.  As CommuniGate Pro supports multiple domains,
 unless you have a specific reason for using this export, you probably want to
 use the communigate_pro export instead.  The
 <a href="http://www.stalker.com/CGPerl/">CommuniGate Pro Perl Interface</a>
-- 
cgit v1.2.1


From e631aea6e8c9dbc41192948468314afd7b806613 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 May 2006 00:45:37 +0000
Subject: 1.7.0?  why not!

---
 httemplate/elements/menu.html |  19 +++----
 httemplate/index.html         | 117 ++++++++++++++++++++----------------------
 2 files changed, 65 insertions(+), 71 deletions(-)

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 8502c0746..29ef53575 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -121,6 +121,7 @@
   #    <BR> -->
 
   tie my %tools_menu, 'Tie::IxHash',
+    'Quick payment entry' => [ $fsurl.'misc/batch-cust_pay.html', 'Enter multiple payments in a batch' ],
     'Job Queue' => [ $fsurl.'search/queue.html', 'View pending job queue' ],
     'Importing' => [ \%tools_importing, 'Import tools' ],
     'Exporting' => [ \%tools_exporting, 'Export tools' ],
@@ -168,17 +169,17 @@
   ;
 
   tie my %config_menu, 'Tie::IxHash',
-    'Settings'      => [ $fsurl.'config/config-view.cgi', 'XXXconfigittip' ],
+    'Settings'      => [ $fsurl.'config/config-view.cgi', '' ],
     'separator'     => '', #its a separator!
-    'Employees'     => [ \%config_employees, 'XXXtooltip' ],
+    'Employees'     => [ \%config_employees, '' ],
     'Provisioning, services and packages'
-                    => [ \%config_export_svc_pkg, 'XXXtootip'    ],
-    'Resellers'     => [ \%config_agent, 'XXXtootip'    ],
-    'Billing'       => [ \%config_billing, 'XXXtootip'    ],
-    'Dialup'        => [ \%config_dialup, 'XXXtootip'    ],
+                    => [ \%config_export_svc_pkg, ''    ],
+    'Resellers'     => [ \%config_agent, ''    ],
+    'Billing'       => [ \%config_billing, ''    ],
+    'Dialup'        => [ \%config_dialup, ''    ],
     'Fixed (username-less) broadband'
-                    => [ \%config_broadband, 'XXXtootip'    ],
-    'Miscellaneous' => [ \%config_misc, 'XXXtootip'    ],
+                    => [ \%config_broadband, ''    ],
+    'Miscellaneous' => [ \%config_misc, ''    ],
   ;
 
   tie my %menu, 'Tie::IxHash',
@@ -253,7 +254,7 @@
   webfxMenuImagePath      = "<%=$fsurl%>images/";
   webfxMenuUseHover       = 1;
   webfxMenuShowTime       = 300;
-  webfxMenuHideTime       = 500;
+  webfxMenuHideTime       = 300;
 
   var myBar = new WebFXMenuBar;
 
diff --git a/httemplate/index.html b/httemplate/index.html
index 95d4580bd..1a92b45f6 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -1,66 +1,59 @@
 <% my $conf = new FS::Conf; %>
-<%= include('/elements/header.html', 'Freeside Main Menu' ) %>
-
-  <BR>
-
-[<A NAME="customer_service" style="background-color: #cccccc">&nbsp;Sales&nbsp;/&nbsp;Customer&nbsp;service&nbsp;</A>]
-[&nbsp;<A HREF="#bookkeeping">Bookkeeping&nbsp;/&nbsp;Collections</A>&nbsp;]
-[&nbsp;<A HREF="#reports">Reports</A>&nbsp;]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0" WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
-    <TR><TH BGCOLOR="#cccccc">Sales / Customer service</TH></TR>
-    <TR><TD>
-        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="GET">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"></FORM>
-        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="GET">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"></FORM>
-	<BR><FORM ACTION="search/svc_broadband.cgi" METHOD="GET">IP Address <INPUT TYPE="text" NAME="ip_addr"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <BR>
-    </TD></TR>
-    </TABLE>
-
-    <BR><BR><BR>
-
-
-[&nbsp;<A HREF="#customer_service">Sales&nbsp;/&nbsp;Customer&nbsp;service</A>&nbsp;]
-[<A NAME="bookkeeping" style="background-color: #cccccc">&nbsp;Bookkeeping&nbsp;/&nbsp;Collections&nbsp;</A>]
-[&nbsp;<A HREF="#reports">Reports</A>&nbsp;]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
-    <TR><TH BGCOLOR="#cccccc">Bookkeeping / Collections</TH></TR>
-    <TR><TD>
-      <BR><A HREF="misc/batch-cust_pay.html">Quick payment entry</A>
-      <BR>
-      <BR><FORM ACTION="search/cust_main.cgi" METHOD="GET">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <FORM ACTION="search/cust_bill.html" METHOD="GET">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <FORM ACTION="search/cust_pay.cgi" METHOD="GET">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <BR>
-      Invoice event reports
-            <UL>
-              <LI><a href="search/cust_bill_event.html">All invoice events for a date range</a>
-              <LI><a href="search/cust_bill_event.html?failed=1">Invoice event errors for a date range (failed credit cards, processor or printer problems, etc.)</a>
-            </UL>
-      <BR><BR>
-    </TD></TR>
-    </TABLE>
-
-
-
-    <BR><BR><BR>
-
-
-
-[&nbsp;<A HREF="#customer_service">Sales&nbsp;/&nbsp;Customer&nbsp;service</A>&nbsp;]
-[&nbsp;<A HREF="#bookkeeping">Bookkeeping&nbsp;/&nbsp;Collections</A>&nbsp;]
-[<A NAME="reports" style="background-color: #cccccc">&nbsp;Reports&nbsp;</A>]
-    <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee" STYLE="border: 1px solid black">
-    <TR><TH BGCOLOR="#cccccc">Reports</TH></TR>
-    <TR><TD>
-      <BR>
-      <A HREF="search/sqlradius.html">RADIUS sessions</A><BR><BR>
-    <FORM ACTION="search/sql.html" METHOD="GET">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
-
-    <BR>
-    </TD></TR>
-    </TABLE>
-
-    <BR><BR><BR>
+<%= include('/elements/header.html', 'Billing Main' ) %>
+
+<%
+
+  my $sth = dbh->prepare(
+    #"SELECT DISTINCT custnum FROM h_cust_main JOIN cust_main USING ( custnum )
+    "SELECT custnum FROM h_cust_main JOIN cust_main USING ( custnum )
+       WHERE ( history_action = 'insert' OR history_action = 'replace_new' ) 
+         AND history_user = ?
+       ORDER BY history_date desc" # LIMIT 10
+    ) or die dbh->errstr;
+
+  $sth->execute( getotaker() ) or die $sth->errstr;
+
+  my %saw = ();
+  my @custnums = grep { !$saw{$_}++ } map $_->[0], @{ $sth->fetchall_arrayref };
+
+  @custnums = splice(@custnums, 0, 10);
+
+  if ( @custnums ) {
+
+%>
+
+  <%= include('/elements/table-grid.html') %>
+
+  <% my $bgcolor1 = '#eeeeee';
+     my $bgcolor2 = '#ffffff';
+     my $bgcolor;
+  %>
+
+  <TR>
+    <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=1>Customers I recently added or modified</TH>
+  </TR>
+
+  <% foreach my $custnum ( @custnums ) { %> 
+  <% my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ); %>
+  <% next unless $cust_main; %>
+
+    <TR>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF="view/cust_main.cgi?<%= $custnum %>"><%= $custnum %>: <%= $cust_main->name %></A></TD>
+    </TR>
+
+    <%
+       if ( $bgcolor eq $bgcolor1 ) {
+          $bgcolor = $bgcolor2;
+        } else {
+          $bgcolor = $bgcolor1;
+        }
+    %>
+
+  <% } %>
+
+  </TABLE>
+
+<% } %>
 
 <%= include('/elements/footer.html') %>
 
-- 
cgit v1.2.1


From 64e9f3e7c823ef1315111d8139d50171215a2edf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 May 2006 00:50:11 +0000
Subject: 1.7.0?  why not?

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1163237b8..233b5764b 100644
--- a/Makefile
+++ b/Makefile
@@ -98,9 +98,9 @@ RT_PATH = /opt/rt3
 
 #only used for dev kludge now, not a big deal
 FREESIDE_PATH = `pwd`
-PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.7/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
 
-VERSION=1.7.0cvs
+VERSION=1.7.0
 TAG=freeside_1_7_0
 
 help:
-- 
cgit v1.2.1


From b9c46f3cf466c423bcddfa9ec32258670af5b6ae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 May 2006 02:04:13 +0000
Subject: 1.5.8!

---
 Changes.1.5.8 | 63 +++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/Changes.1.5.8 b/Changes.1.5.8
index ab3572103..14240bf87 100644
--- a/Changes.1.5.8
+++ b/Changes.1.5.8
@@ -1,28 +1,41 @@
-- move account search (httemplate/search/svc_acct.cgi) to new template
-- cust-fields configuration value to control which customer fields are shown on reports
+Major new features and updates since 1.5.7:
+- Added prepaid packages that set the RADIUS "Expiration" attribute and
+  auto-suspend on their next bill date
+- Added banned card table and option to send customer cards there on cancel
+- Bulk svcpart change
+- Integrated RT upgraded to 3.4.4
+
+UI:
+- Re-did billing section of customer edit, should be much less confusing
+- Redo quick payment entry page with ajax magic
+- Redid account view and edit pages, add ability to edit uid/gid if conf
+  options for it are turned on
+- cust-fields configuration value to control which customer fields are shown
+  on reports
+- Moved account search (httemplate/search/svc_acct.cgi), cust_pkg search
+  (httemplate/search/cust_pkg.cgi) and others to new template
 - add unlinked mail forward (svc_forward) report
-- move cust_pkg search (httemplate/search/cust_pkg.cgi) to new template
-- add active/suspended/cancelled customer packages to agent browse
-- add export to everyone.net outsource mail service
-- add native Radiator export
-- added agent/taxclass/card type-specific gateway overrides for people with
+- Moved to XMLHttpRequest instead of hidden iframe transport for progress bar
+- Also use XMLHttpRequest for retreiving states rather than send a huge page
+  for customer add/edit, much faster
+
+Resellers:
+- Added active/suspended/cancelled customer packages to agent browse
+
+Billing:
+- Added maximum "cap" options to RADIUS usage charges
+- Added support for maestro/switch/solo cards, including start date and issue
+  number
+- Added agent/taxclass/card type-specific gateway overrides for people with
   multiple payment gateways for different resellers, taxclasses and/or card
   types
-- re-did billing section of customer edit and added maestro/switch/solo support
-- add cpanel export
-- added prepaid packages that set the RADIUS "Expiration" attribute and
-  auto-suspend on their next bill date
-- added banned card table and option to send customer cards there on cancel
-- moved to XMLHttpRequest instead of hidden iframe transport for progress bar,
-  should be more efficient and improve compatibility with Konq and maybe other
-  browsers?
-- also use XMLHttpRequest for retreiving states rather than send a huge page
-  for customer add/edit, much faster
-- redo account view and edit pages, add ability to edit uid/gid if conf options
-  for it are turned on
-- redo quick payment entry page with ajax magic
-- explicit payment types for cash and (optionally) western union
-- bulk svcpart change
-- tax report updated, per-agent option and most items now clickable
-- direct radiator export
-- added maximum "cap" options to RADIUS usage charges
+- Explicit payment types for cash and (optionally) western union
+
+Reporting:
+- Tax report updated, per-agent option and most items now clickable
+
+Exports:
+- Added a Cpanel export
+- Added a native Radiator export
+- Added an export to everyone.net outsourced mail service
+
-- 
cgit v1.2.1


From cec2c86e7e14135b812d905afcca2b895236e23a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 May 2006 02:06:30 +0000
Subject: docs are going in the wiki Real Soon Now anyway

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 233b5764b..421e9e310 100644
--- a/Makefile
+++ b/Makefile
@@ -345,7 +345,8 @@ upload-docs: forcehtmlman
 	ssh 420.am rm -rf /var/www/www.sisd.com/freeside/docs
 	scp -pr httemplate/docs 420.am:/var/www/www.sisd.com/freeside/docs
 
-release: upload-docs
+#release: upload-docs
+release:
 	cd /home/ivan/freeside
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
-- 
cgit v1.2.1


From 0e81fd2a8f84105982c0f2bc8e268a73da76f2d9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 May 2006 18:05:26 +0000
Subject: justification

---
 Changes.1.5.8 | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Changes.1.5.8 b/Changes.1.5.8
index 14240bf87..6c6aeec5c 100644
--- a/Changes.1.5.8
+++ b/Changes.1.5.8
@@ -1,7 +1,8 @@
 Major new features and updates since 1.5.7:
 - Added prepaid packages that set the RADIUS "Expiration" attribute and
   auto-suspend on their next bill date
-- Added banned card table and option to send customer cards there on cancel
+- Added banned card table and option to send customer cards there on
+  cancel
 - Bulk svcpart change
 - Integrated RT upgraded to 3.4.4
 
@@ -10,25 +11,26 @@ UI:
 - Redo quick payment entry page with ajax magic
 - Redid account view and edit pages, add ability to edit uid/gid if conf
   options for it are turned on
-- cust-fields configuration value to control which customer fields are shown
-  on reports
+- cust-fields configuration value to control which customer fields are
+  shown on reports
 - Moved account search (httemplate/search/svc_acct.cgi), cust_pkg search
   (httemplate/search/cust_pkg.cgi) and others to new template
 - add unlinked mail forward (svc_forward) report
-- Moved to XMLHttpRequest instead of hidden iframe transport for progress bar
-- Also use XMLHttpRequest for retreiving states rather than send a huge page
-  for customer add/edit, much faster
+- Moved to XMLHttpRequest instead of hidden iframe transport for
+  progress bar
+- Also use XMLHttpRequest for retreiving states rather than send a huge
+  page for customer add/edit, much faster
 
 Resellers:
 - Added active/suspended/cancelled customer packages to agent browse
 
 Billing:
 - Added maximum "cap" options to RADIUS usage charges
-- Added support for maestro/switch/solo cards, including start date and issue
-  number
-- Added agent/taxclass/card type-specific gateway overrides for people with
-  multiple payment gateways for different resellers, taxclasses and/or card
-  types
+- Added support for maestro/switch/solo cards, including start date and
+  issue number
+- Added agent/taxclass/card type-specific gateway overrides for people
+  with multiple payment gateways for different resellers, taxclasses
+  and/or card types
 - Explicit payment types for cash and (optionally) western union
 
 Reporting:
-- 
cgit v1.2.1


From 1ba0e4e0b6374e8b7c55a5545d90dbb0fc7397e6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 May 2006 18:27:46 +0000
Subject: better error message for banned cards

---
 FS/FS/cust_main.pm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 65ccb343b..2763c1386 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1215,7 +1215,12 @@ sub check {
       if cardtype($self->payinfo) eq "Unknown";
 
     my $ban = qsearchs('banned_pay', $self->_banned_pay_hashref);
-    return "Banned credit card" if $ban;
+    if ( $ban ) {
+      return 'Banned credit card: banned on '.
+             time2str('%a %h %o at %r', $ban->_date).
+             ' by '. $ban->otaker.
+             ' (ban# '. $ban->bannum. ')';
+    }
 
     if ( defined $self->dbdef_table->column('paycvv') ) {
       if (length($self->paycvv) && !$self->is_encrypted($self->paycvv)) {
@@ -1272,7 +1277,12 @@ sub check {
     $self->paycvv('') if $self->dbdef_table->column('paycvv');
 
     my $ban = qsearchs('banned_pay', $self->_banned_pay_hashref);
-    return "Banned ACH account" if $ban;
+    if ( $ban ) {
+      return 'Banned ACH account: banned on '.
+             time2str('%a %h %o at %r', $ban->_date).
+             ' by '. $ban->otaker.
+             ' (ban# '. $ban->bannum. ')';
+    }
 
   } elsif ( $self->payby eq 'LECB' ) {
 
-- 
cgit v1.2.1


From 74d840d48a629908e202de13bce668ccd945843b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 May 2006 20:38:21 +0000
Subject: missing > tag on INPUT

---
 rt/html/Elements/FreesideNewCust | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rt/html/Elements/FreesideNewCust b/rt/html/Elements/FreesideNewCust
index 851c66425..af8f9f1a7 100644
--- a/rt/html/Elements/FreesideNewCust
+++ b/rt/html/Elements/FreesideNewCust
@@ -1,3 +1,3 @@
 <form action="<% $RT::URI::freeside::URL %>/edit/cust_main.cgi" STYLE="margin:0">
-<INPUT TYPE="submit" VALUE="<&|/l&>New customer</&>"&nbsp;
+<INPUT TYPE="submit" VALUE="<&|/l&>New customer</&>">&nbsp;
 </FORM>
-- 
cgit v1.2.1


From 6fc7405849aee1f88c5ee844d0e091d00df7986e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 May 2006 15:54:50 +0000
Subject: adding batch upgrade instructions to 1.7.0 instructions too

---
 README.1.7.0 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.1.7.0 b/README.1.7.0
index 992a988c8..a6e18d05d 100644
--- a/README.1.7.0
+++ b/README.1.7.0
@@ -1,6 +1,16 @@
 
 install DBIx::DBSchema 0.31 (or later)
 install Color::Scheme
+install Data::Table
+
+ALTER TABLE cust_pay_batch ADD COLUMN batchnum int;
+ALTER TABLE cust_pay_batch ALTER COLUMN batchnum SET NOT NULL;
+ALTER TABLE cust_pay_batch ADD COLUMN payinfo varchar(512);
+UPDATE cust_pay_batch SET payinfo = cardnum;
+ALTER TABLE cust_pay_batch DROP COLUMN cardnum;
+ALTER TABLE h_cust_pay_batch ADD COLUMN payinfo varchar(512);
+UPDATE h_cust_pay_batch SET payinfo = cardnum;
+ALTER TABLE h_cust_pay_batch DROP COLUMN cardnum;
 
 make install-perl-modules
 run "freeside-upgrade username" to uprade your database schema
@@ -17,6 +27,9 @@ Optional for better zip code report performance:
 CREATE INDEX cust_main16 on cust_main ( zip );
 CREATE INDEX cust_main17 on cust_main ( ship_zip );
 
+Optional to eliminate harmless but noisy warnings:
+UPDATE cust_main_county SET exempt_amount = 0 WHERE exempt_amount IS NULL;
+
 ------
 
 make install-docs
-- 
cgit v1.2.1


From 7b5aa356c7ed954bb60ce22d44d6de5f4852fafd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 May 2006 10:22:54 +0000
Subject: removing duplicate entries

---
 FS/MANIFEST | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 4e71e720b..9e3285dbb 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -342,7 +342,3 @@ t/access_right.t
 FS/m2m_Common.pm
 FS/pay_batch.pm
 t/pay_batch.t
-FS/pay_batch.pm
-t/pay_batch.t
-FS/pay_batch.pm
-t/pay_batch.t
-- 
cgit v1.2.1


From 3a820c27d5290f9d2761636b2b4fe865caeb0804 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 2 Jun 2006 13:20:24 +0000
Subject: add a service search

---
 httemplate/elements/header.html    | 19 +++++++++++++------
 httemplate/search/svc_Smart.html   | 22 ++++++++++++++++++++++
 rt/FREESIDE_MODIFIED               |  5 +++++
 rt/html/Elements/FreesideSvcSearch | 10 ++++++++++
 rt/html/Elements/PageLayout        | 10 +++++-----
 rt/html/Elements/Tabs              |  4 +++-
 6 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 httemplate/search/svc_Smart.html
 create mode 100644 rt/html/Elements/FreesideSvcSearch

diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 2be2c7938..3aa81be3b 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -21,9 +21,12 @@
         if ( what.value = '(cust #, name or company)' )
           what.value = '';
       }
-    </SCRIPT>
 
-    <SCRIPT TYPE="text/javascript">
+      function clearhint_search_svc (what) {
+        if ( what.value = '(user, user@domain or domain)' )
+          what.value = '';
+      }
+
       function clearhint_search_ticket (what) {
         if ( what.value = '(ticket # or subject string)' )
           what.value = '';
@@ -79,19 +82,23 @@
         <TD COLSPAN=4 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
       </TR>
       <TR>
-        <TD COLSPAN=1 BGCOLOR="#000000" WIDTH="154">
-        </TD>
-        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right" WIDTH="15%">
           <FORM ACTION="<%=$fsurl%>edit/cust_main.cgi" METHOD="GET" STYLE="margin:0">
             <INPUT TYPE="submit" VALUE="New customer">
           </FORM>
         </TD>
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name or company)" SIZE="23" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="text-align:right">
+            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name or company)" SIZE="22" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="text-align:right">
             <INPUT TYPE="submit" VALUE="Search customers">
           </FORM>
         </TD>
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
+          <FORM ACTION="<%=$fsurl%>search/svc_Smart.html" METHOD="GET" STYLE="margin:0">
+            <INPUT NAME="search_svc" TYPE="text" VALUE="(user, user@domain or domain)" SIZE="26" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="text-align:right">
+            <INPUT TYPE="submit" VALUE="Search services">
+          </FORM>
+        </TD>
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>rt/index.html" METHOD="GET" STYLE="margin:0">
             <INPUT NAME="q" TYPE="text" VALUE="(ticket # or subject string)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="text-align:right">
diff --git a/httemplate/search/svc_Smart.html b/httemplate/search/svc_Smart.html
new file mode 100644
index 000000000..93dbbeadd
--- /dev/null
+++ b/httemplate/search/svc_Smart.html
@@ -0,0 +1,22 @@
+<%
+
+if ( $cgi->param('search_svc') =~ /\.[a-z]{2,8}$/i ) {
+
+  # looks (enough) like a domain
+
+  %><%= $cgi->redirect('svc_domain.cgi?domain='. uri_escape( $cgi->param('search_svc') ) ) %><%
+
+} elsif ( $cgi->param('search_svc') =~ /\w/ ) {
+
+  #looks (enough) like a username
+
+  %><%= $cgi->redirect('svc_acct.cgi?username_type=Exact;username='. uri_escape( $cgi->param('search_svc') ) ) %><%
+
+} else {
+
+%><%= include('/elements/header.html', 'Unrecognized service string') %>
+  <%= include('/elements/footer.html') %><%
+
+} 
+
+%>
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index 82f0ff2e6..1b0c47c06 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -24,3 +24,8 @@ html/NoAuth/images/small-logo.png
 
 html/Elements/TitleBoxStart
 html/Search/Bulk.html
+
+html/Elements/FreesideNewCust
+html/Elements/FreesideSearch
+html/Elements/FreesideSvcSearch
+
diff --git a/rt/html/Elements/FreesideSvcSearch b/rt/html/Elements/FreesideSvcSearch
new file mode 100644
index 000000000..47c430f1a
--- /dev/null
+++ b/rt/html/Elements/FreesideSvcSearch
@@ -0,0 +1,10 @@
+<form action="<% $RT::URI::freeside::URL %>/search/svc_Smart.html" STYLE="margin:0">
+    <SCRIPT TYPE="text/javascript">
+      function clearhint_search_svc (what) {
+        if ( what.value = '(user, user@domain or domain)' )
+          what.value = '';
+      }
+    </SCRIPT>
+<input name="search_svc" accesskey="0" VALUE="(user, user@domain or domain)" SIZE="27" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="text-align:right">
+<input type="submit" value="<&|/l&>Search services</&>">&nbsp;
+</form>
diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout
index 5289f78f3..dd0fd7504 100644
--- a/rt/html/Elements/PageLayout
+++ b/rt/html/Elements/PageLayout
@@ -45,14 +45,14 @@
 %# END BPS TAGGED BLOCK }}}
 <table class="black" border=0 cellspacing=0 cellpadding=0 width="100%">
 <tr>
-  <TD colspan=4 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
+  <TD colspan=5 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
 </tr>
 <tr>
-  <th class="black" align="left" width=15%><span class="rtname"><%$AppName%></span>
-  </th>
+%#  <th class="black" align="left" width=15%><span class="rtname"><%$AppName%></span>
+%#  </th>
       <span class="topactions">
-% foreach my $action (sort keys %{$topactions}) {
-        <td class="blackright">
+% my $notfirst = 0; foreach my $action (sort keys %{$topactions}) {
+        <td class="blackright" ALIGN="right" <% $notfirst++ ? '' : 'WIDTH="15%"' %>>
         <%$topactions->{"$action"}->{'html'} |n %>
         </td>
 % }
diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs
index 22720072c..dcb652e12 100644
--- a/rt/html/Elements/Tabs
+++ b/rt/html/Elements/Tabs
@@ -63,7 +63,9 @@ my $basetopactions = {
 		},
 	B => { html => $m->scomp('/Elements/FreesideSearch')	
 		},
-	C => { html => $m->scomp('/Elements/SimpleSearch') 
+	C => { html => $m->scomp('/Elements/FreesideSvcSearch')	
+		},
+	D => { html => $m->scomp('/Elements/SimpleSearch') 
 		}
 	};
 my $basetabs = {
-- 
cgit v1.2.1


From f2dd532f7c009a653864b23d8858fe9e6c8c3985 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Jun 2006 10:30:09 +0000
Subject: fix unmatched =back somehow futzing things up with automated install.
 wtf?!

---
 FS/FS/cdr.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 70c8a0f09..5eb0cf393 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -119,8 +119,6 @@ following fields are currently supported:
 
 #Telstra =1, Optus = 2, RSL COM = 3
 
-=back
-
 =item upstream_rateid - Upstream Rate ID
 
 =item svcnum - Link to customer service (see L<FS::cust_svc>)
-- 
cgit v1.2.1


From c28ebb03fafe6a85753fc3f21e3abcc0477eccfc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Jun 2006 10:46:39 +0000
Subject: attempt to fix weird black RT navigation links

---
 rt/html/NoAuth/webrt.css | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index 4748694e5..cf4cfc00a 100644
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -75,7 +75,6 @@ SPAN.nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 16px;
 	 font-weight: normal;
 	 color: #FFFFFF;
-%#	 color: #000000;
 	 text-decoration: none;
 	 white-space: nowrap}
 
@@ -87,42 +86,36 @@ SPAN.nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 a.topnav-0 {  font-family: Verdana, sans-serif;
 	 font-size: 16px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-1 {  font-family: Verdana, sans-serif;
 	 font-size: 14px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-2 {  font-family: Verdana, sans-serif;
 	 font-size: 12px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-3 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-4 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-5 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
@@ -190,8 +183,7 @@ li.topnav-5-major {
 .currenttopnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 16px;
          font-weight: bold;
-%#	 color: #FFFF66;
-	 color: #000000; background-color: #cccccc;
+	 color: #ffffff; background-color: #7e0079;
 	 text-decoration: none;
 	 white-space: nowrap}
 
-- 
cgit v1.2.1


From 6dfc9e121e60141830169f4237a5b1e381d6ba5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Jun 2006 10:54:02 +0000
Subject: another attempt to fix weird black RT navigation links

---
 rt/html/NoAuth/webrt.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index cf4cfc00a..712360cd5 100644
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -59,10 +59,8 @@ SPAN.nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 white-space: nowrap}
 .nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 13px;
-%#	 font-weight: normal;
 	 font-weight: bold;
-%#	 color: #FFFFFF;
-	 color: #000000;
+	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 .currentnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
-- 
cgit v1.2.1


From 997c4e4178b74747b14177671069d55532d0ff10 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Jun 2006 10:57:03 +0000
Subject: yet another attempt to fix weird black RT navigation links

---
 rt/html/NoAuth/webrt.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index 712360cd5..f49d14531 100644
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -51,8 +51,7 @@
 
 SPAN.nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 12px;
-%#	 color: #FFFFFF;
-	 color: #000000;
+	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 .nav2 {	 font-size: 10px;
@@ -468,7 +467,7 @@ span.title {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	       vertical-align: top }
 .productnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 11px;
-	 color: #000000;
+	 color: #FFFFFF;
 	 text-align: center;
 	 vertical-align: middle;
 	 text-decoration: none}
@@ -576,7 +575,7 @@ DIV.endmatter { margin-left: -7% }
              }
 
 
-A { font-weight: bold; color: #000000;
+A { font-weight: bold;
             }
 
 .currenttab { color: #ffffff;}
-- 
cgit v1.2.1


From 08c01dea3d6936dafe890f5c8a6076f636f5116c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Jun 2006 11:08:55 +0000
Subject: yay this should finally fix the weird black navigation links; hide
 the Mason stuff from browsers when it doesn't get processed for some reason

---
 rt/html/NoAuth/webrt.css | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index f49d14531..f22ce4ced 100644
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -1,3 +1,4 @@
+/*
 %# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
@@ -43,6 +44,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
+*/
 
 /* * {
   font-family: Arial, Verdana, Helvetica, sans-serif;
@@ -75,10 +77,12 @@ SPAN.nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 text-decoration: none;
 	 white-space: nowrap}
 
+/*
 %# .topnav is the original RT class for the sidebar navigation tabs.
 %# Font-sizing by level depth was originally hard-coded into Elements/Menu.
 %# This modification sets a different class name for each level, allowing
 %# style sheet control over the formats.
+*/
 
 a.topnav-0 {  font-family: Verdana, sans-serif;
 	 font-size: 16px;
@@ -184,10 +188,12 @@ li.topnav-5-major {
 	 text-decoration: none;
 	 white-space: nowrap}
 
+/*
 %# .currenttopnav is the original RT class for the sidebar navigation tabs.
 %# Font-sizing by level depth was originally hard-coded into Elements/Menu.
 %# This modification sets a different class name for each level, allowing
 %# style sheet control over the formats
+*/
 
 a.currenttopnav-0 {  font-family: Verdana, sans-serif;
 	 font-size: 16px;
@@ -315,12 +321,12 @@ li.currenttopnav-5-major {
          }
 .blue {
 	 background-color: #4682B4;
-%#	 background-color: #eeeeee;
+/* %#	 background-color: #eeeeee; */
 	 background-position: left top;
 	 vertical-align: top;
 	 text-align: left;
          }
-%# Actually the "topactions" section
+/* %# Actually the "topactions" section */
 .blueright {  background-color: #4682B4;
 	 background-position: left top;
 	 vertical-align: top;
@@ -604,7 +610,7 @@ SPAN.date { font-size: 0.8em }
 
 span.title { font-size: 1.6em;
 	     vertical-align: middle;
-%#	     color: #ffffff;
+/* %#	     color: #ffffff; */
              color: #000000;
            }
 span.productname { font-size: 2em;
@@ -703,6 +709,7 @@ textarea.messagebox {
     width: 100%;
 }
 
+/*
 %# Provide a callback for adding/modifying the style sheet.
 %# http://www.w3.org/TR/REC-CSS1 - section 3.2, says:
 %#   "latter specified rule wins"
@@ -714,3 +721,4 @@ inherit => undef
 $r->content_type('text/css');
 #$r->headers_out->{'Expires'} = '+30m';
 </%init>
+*/
-- 
cgit v1.2.1


From 1f2020811b5ac14613e854fb6861cbd37d580015 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Jun 2006 11:16:36 +0000
Subject: whew, this can go back

---
 rt/html/NoAuth/webrt.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index f22ce4ced..04c959a05 100644
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -581,7 +581,7 @@ DIV.endmatter { margin-left: -7% }
              }
 
 
-A { font-weight: bold;
+A { font-weight: bold; color: #000000
             }
 
 .currenttab { color: #ffffff;}
-- 
cgit v1.2.1


From 83f6b21826ce123e5936aaedaf58086189be11f2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Jun 2006 10:32:46 +0000
Subject: fix link to prepaid card setup

---
 httemplate/elements/menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 29ef53575..c09fcee8c 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -147,7 +147,7 @@
   tie my %config_billing, 'Tie::IxHash',
     'View/Edit payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ],
     'View/Edit invoice events'           => [ $fsurl.'browse/part_bill_event.cgi', 'Actions for overdue invoices' ],
-    'View/Edit prepaid cards'            => [ $fsurl.'browse/prepay_credit.html', 'View outstanding cards, generate new cards' ],
+    'View/Edit prepaid cards'            => [ $fsurl.'search/prepay_credit.html', 'View outstanding cards, generate new cards' ],
     'View/Edit call rates and regions'   => [ $fsurl.'browse/rate.cgi', 'Manage rate plans, regions and prefixes for VoIP and call billing' ],
     'View/Edit locales and tax rates'    => [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ],
   ;
-- 
cgit v1.2.1


From 44c866ddd722374379813d774f609ef43f39dfbc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 16 Jun 2006 00:27:43 +0000
Subject: s/printf/sprintf/ and make the config a little less strange

---
 httemplate/misc/download-batch.cgi | 66 ++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 5a98f1d51..37b31c196 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -5,11 +5,12 @@ my $conf=new FS::Conf;
 #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
 http_header('Content-Type' => 'text/plain' );
 
-#need default
-my $formatconfig = "batchconfig".$cgi->param('format');
-
-die "No batch configuration exists.\n$formatconfig\n" unless $conf->exists($formatconfig);
-my $format = $conf->config($formatconfig);
+my $format;
+if ( $cgi->param('format') =~ /^([\w ]+)$/ ) {
+  $format = $1;
+} else {
+  $format = $conf->config('batch_default_format');
+}
 
 my $oldAutoCommit = $FS::UID::AutoCommit;
 local $FS::UID::AutoCommit = 0;
@@ -31,11 +32,14 @@ my (@date)=localtime();
 my $jdate = sprintf("%03d", $date[5] % 100).sprintf("%03d", $date[7]);
 
 if ($format eq "BoM") {
-  my($reformat,$origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) = $conf->config('batchconfig');
-  printf "A%10s%04u%06u%05u%54s\n",$origid,$pay_batch->batchnum,$jdate,$datacenter,"";
-  printf "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct;
+
+  my($reformat,$origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) = $conf->config("batchconfig-$format");
+  %><%= sprintf( "A%10s%04u%06u%05u%54s\n",$origid,$pay_batch->batchnum,$jdate,$datacenter,"").
+        sprintf( "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct )
+  %><%
+
 }elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
-  1;
+#  1;
 }else{
   die "Unknown format for batch in batchconfig. \n";
 }
@@ -46,30 +50,36 @@ for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
 			      {'batchnum'=>$pay_batch->batchnum} )
 ) {
 
-$cust_pay_batch->exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-my( $mon, $y ) = ( $2, $1 );
-$mon = "0$mon" if $mon < 10;
-my $exp = "$mon$y";
-$batchcount++;
-$batchtotal += $cust_pay_batch->amount;
+  $cust_pay_batch->exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+  my( $mon, $y ) = ( $2, $1 );
+  $mon = "0$mon" if $mon < 10;
+  my $exp = "$mon$y";
+  $batchcount++;
+  $batchtotal += $cust_pay_batch->amount;
+  
+  if ($format eq "BoM") {
 
-if ($format eq "BoM") {
-  my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
-  printf "D%010u%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->invnum;
-}elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
-%>,,,,<%= $cust_pay_batch->payinfo %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %>
-<% }else{
-   die "I'm already dead, but you did not know that.\n";
-}
+    my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
+    %><%= sprintf( "D%010u%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->invnum %><%
+
+  } elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch") {
+
+    %>,,,,<%= $cust_pay_batch->payinfo %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %><%
+
+  } else {
+    die "I'm already dead, but you did not know that.\n";
+  }
 
 }
 
 if ($format eq "BoM") {
-  printf "YD%08u%014u%56s\n",$batchcount,$batchtotal*100,"";
-  printf "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","";
-}elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
-  1;
-} else{
+
+  %><%= sprintf( "YD%08u%014u%56s\n",$batchcount,$batchtotal*100,"" ).
+        sprintf( "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","" ) %><%
+
+} elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
+  #1;
+} else {
   die "I'm already dead (again), but you did not know that.\n";
 }
 
-- 
cgit v1.2.1


From 2aee6063dd65e588b884181542815f98319419bf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 16 Jun 2006 00:33:31 +0000
Subject: oops i'm gonna do that too, now that the batch format file is not the
 same as the batch params files

---
 httemplate/misc/download-batch.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 37b31c196..88b10eecf 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -33,7 +33,8 @@ my $jdate = sprintf("%03d", $date[5] % 100).sprintf("%03d", $date[7]);
 
 if ($format eq "BoM") {
 
-  my($reformat,$origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) = $conf->config("batchconfig-$format");
+  my($origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) =
+    $conf->config("batchconfig-$format");
   %><%= sprintf( "A%10s%04u%06u%05u%54s\n",$origid,$pay_batch->batchnum,$jdate,$datacenter,"").
         sprintf( "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct )
   %><%
-- 
cgit v1.2.1


From 1904b218cacfe4e96f3fd3b57f7242617099c485 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 16 Jun 2006 00:47:39 +0000
Subject: and fix the  name for TD Canada Trust.  and that's it for now. 
 really.

---
 httemplate/misc/download-batch.cgi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 88b10eecf..2d6f8a286 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -6,10 +6,10 @@ my $conf=new FS::Conf;
 http_header('Content-Type' => 'text/plain' );
 
 my $format;
-if ( $cgi->param('format') =~ /^([\w ]+)$/ ) {
+if ( $cgi->param('format') =~ /^([\w\- ]+)$/ ) {
   $format = $1;
 } else {
-  $format = $conf->config('batch_default_format');
+  $format = $conf->config('batch-default_format');
 }
 
 my $oldAutoCommit = $FS::UID::AutoCommit;
@@ -39,7 +39,7 @@ if ($format eq "BoM") {
         sprintf( "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct )
   %><%
 
-}elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
+}elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
 #  1;
 }else{
   die "Unknown format for batch in batchconfig. \n";
@@ -63,7 +63,7 @@ for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
     my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
     %><%= sprintf( "D%010u%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->invnum %><%
 
-  } elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch") {
+  } elsif ($format eq "csv-td_canada_trust-merchant_pc_batch") {
 
     %>,,,,<%= $cust_pay_batch->payinfo %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %><%
 
@@ -78,7 +78,7 @@ if ($format eq "BoM") {
   %><%= sprintf( "YD%08u%014u%56s\n",$batchcount,$batchtotal*100,"" ).
         sprintf( "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","" ) %><%
 
-} elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
+} elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
   #1;
 } else {
   die "I'm already dead (again), but you did not know that.\n";
-- 
cgit v1.2.1


From aaad08cae3a0d46d012de5b78360101cda836c30 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 16 Jun 2006 01:23:41 +0000
Subject: value issues and many bits remain

---
 FS/FS/cust_bill.pm                 | 3 ++-
 FS/FS/pay_batch.pm                 | 2 +-
 httemplate/misc/download-batch.cgi | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index c2a39afda..8a05fcf31 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1286,10 +1286,11 @@ sub batch_card {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $pay_batch = qsearchs('pay_batch'=> '');
+  my $pay_batch = qsearchs('pay_batch', {'status' => 'O'});
 
   unless ($pay_batch) {
     $pay_batch = new FS::pay_batch;
+    $pay_batch->setfield('status' => 'O');
     my $error = $pay_batch->insert;
     if ( $error ) {
       die "error creating new batch: $error\n";
diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
index 192c5df83..41b312c7a 100644
--- a/FS/FS/pay_batch.pm
+++ b/FS/FS/pay_batch.pm
@@ -98,7 +98,7 @@ sub check {
 
   my $error = 
     $self->ut_numbern('batchnum')
-    || $self->ut_enum('status', [ '', 'I', 'R' ])
+    || $self->ut_enum('status', [ 'O', 'I', 'R' ])
   ;
   return $error if $error;
 
diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 2d6f8a286..6172b1335 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -16,7 +16,7 @@ my $oldAutoCommit = $FS::UID::AutoCommit;
 local $FS::UID::AutoCommit = 0;
 my $dbh = dbh;
 
-my $pay_batch = qsearchs('pay_batch', {'status'=>''} );
+my $pay_batch = qsearchs('pay_batch', {'status'=>'O'} );
 die "No pending batch. \n" unless $pay_batch;
 
 my %batchhash = $pay_batch->hash;
-- 
cgit v1.2.1


From c738a3c4923774b64960aa87fa58bd0751487edb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 18 Jun 2006 12:54:49 +0000
Subject: ACLs: finish group edit (agents + rights) & browse

---
 FS/FS/AccessRight.pm                           | 139 ++++++++++++++++---------
 FS/FS/access_group.pm                          |  57 ++++++++--
 FS/FS/access_groupagent.pm                     |  24 +++--
 FS/FS/m2name_Common.pm                         |  95 +++++++++++++++++
 FS/FS/part_pkg.pm                              |  53 ++++++----
 FS/MANIFEST                                    |   3 +
 htetc/handler.pl                               |   4 +
 httemplate/browse/access_group.html            |  45 ++++++++
 httemplate/browse/access_user.html             |   2 +-
 httemplate/edit/access_group.html              |  36 +++++++
 httemplate/edit/elements/edit.html             |  21 ++++
 httemplate/edit/part_pkg.cgi                   |   2 +-
 httemplate/edit/process/access_group.html      |  10 ++
 httemplate/edit/process/elements/process.html  |  15 ++-
 httemplate/elements/checkboxes-table-name.html |  85 +++++++++++++++
 httemplate/elements/checkboxes-table.html      |  28 +++--
 16 files changed, 520 insertions(+), 99 deletions(-)
 create mode 100644 FS/FS/m2name_Common.pm
 create mode 100644 httemplate/elements/checkboxes-table-name.html

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 01d63e35d..5229e1e65 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -1,7 +1,7 @@
 package FS::AccessRight;
 
 use strict;
-user vars qw(@rights %rights);
+use vars qw(@rights); # %rights);
 use Tie::IxHash;
 
 =head1 NAME
@@ -19,59 +19,94 @@ assigned to users and/or groups.
 
 =cut
 
+#@rights = (
+#  'Reports' => [
+#    '_desc' => 'Access to high-level reporting',
+#  ],
+#  'Configuration' => [
+#    '_desc' => 'Access to configuration',
+#
+#    'Settings' => {},
+#
+#    'agent' => [
+#      '_desc' => 'Master access to reseller configuration',
+#      'agent_type'  => {},
+#      'agent'       => {},
+#    ],
+#
+#    'export_svc_pkg' => [
+#      '_desc' => 'Access to export, service and package configuration',
+#      'part_export' => {},
+#      'part_svc'    => {},
+#      'part_pkg'    => {},
+#      'pkg_class'   => {},
+#    ],
+#
+#    'billing' => [
+#      '_desc' => 'Access to billing configuration',
+#      'payment_gateway'  => {},
+#      'part_bill_event'  => {},
+#      'prepay_credit'    => {},
+#      'rate'             => {},
+#      'cust_main_county' => {},
+#    ],
+#
+#    'dialup' => [
+#      '_desc' => 'Access to dialup configuraiton',
+#      'svc_acct_pop' => {},
+#    ],
+#
+#    'broadband' => [
+#      '_desc' => 'Access to broadband configuration',
+#      'router'     => {},
+#      'addr_block' => {},
+#    ],
+#
+#    'misc' => [
+#      'part_referral'      => {},
+#      'part_virtual_field' => {},
+#      'msgcat'             => {},
+#      'inventory_class'    => {},
+#    ],
+#
+#  },
+#
+#);
+#
+##turn it into a more hash-like structure, but ordered via IxHash
+
+#well, this is what we have for now.  could be ordered better, could be lots of
+# things better, but this ACL system does 99% of what folks need and the UI
+# isn't *that* bad
 @rights = (
-  'Reports' => [
-    '_desc' => 'Access to high-level reporting',
-  ],
-  'Configuration' => [
-    '_desc' => 'Access to configuration',
-
-    'Settings' => {},
-
-    'agent' => [
-      '_desc' => 'Master access to reseller configuration',
-      'agent_type'  => {},
-      'agent'       => {},
-    ],
-
-    'export_svc_pkg' => [
-      '_desc' => 'Access to export, service and package configuration',
-      'part_export' => {},
-      'part_svc'    => {},
-      'part_pkg'    => {},
-      'pkg_class'   => {},
-    ],
-
-    'billing' => [
-      '_desc' => 'Access to billing configuration',
-      'payment_gateway'  => {},
-      'part_bill_event'  => {},
-      'prepay_credit'    => {},
-      'rate'             => {},
-      'cust_main_county' => {},
-    ],
-
-    'dialup' => [
-      '_desc' => 'Access to dialup configuraiton',
-      'svc_acct_pop' => {},
-    ],
-
-    'broadband' => [
-      '_desc' => 'Access to broadband configuration',
-      'router'     => {},
-      'addr_block' => {},
-    ],
-
-    'misc' => [
-      'part_referral'      => {},
-      'part_virtual_field' => {},
-      'msgcat'             => {},
-      'inventory_class'    => {},
-    ],
-
-  },
+  'New customer',
+  'View customer',
+  #'View Customer | View tickets',
+  'Edit customer',
+  'Cancel customer',
+  'Delete customer',
+
+  'Order customer package',
+  'Change customer package',
+  'Edit customer package dates',
+  'Customize customer package',
+  'Suspend customer package',
+  'Unsuspend customer package',
+  'Cancel customer package immediately',
+  'Cancel customer package later',
+
+  'Provision service',
+  'Unprovision service',
+  #legacy link stuff
+
+  'Post payment',
+  'Process payment',
+  'Post credit',
+  #more financial stuff
 
 );
 
-#turn it into a more hash-like structure, but ordered via IxHash
+sub rights {
+  @rights;
+}
 
diff --git a/FS/FS/access_group.pm b/FS/FS/access_group.pm
index 9d870e57f..25190406f 100644
--- a/FS/FS/access_group.pm
+++ b/FS/FS/access_group.pm
@@ -3,8 +3,11 @@ package FS::access_group;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs );
+use FS::m2name_Common;
+use FS::access_groupagent;
+use FS::access_right;
 
-@ISA = qw(FS::Record);
+@ISA = qw(FS::m2m_Common FS::m2name_Common FS::Record);
 
 =head1 NAME
 
@@ -27,15 +30,14 @@ FS::access_group - Object methods for access_group records
 
 =head1 DESCRIPTION
 
-An FS::access_group object represents an example.  FS::access_group inherits from
+An FS::access_group object represents an access group.  FS::access_group inherits from
 FS::Record.  The following fields are currently supported:
 
 =over 4
 
 =item groupnum - primary key
 
-=item groupname - 
-
+=item groupname - Access group name
 
 =back
 
@@ -45,7 +47,7 @@ FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new access group.  To add the access group to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -84,7 +86,7 @@ returns the error, otherwise returns false.
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid access group.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
@@ -105,12 +107,51 @@ sub check {
   $self->SUPER::check;
 }
 
+=item access_groupagent
+
+Returns all associated FS::access_groupagent records.
+
+=cut
+
+sub access_groupagent {
+  my $self = shift;
+  qsearch('access_groupagent', { 'groupnum' => $self->groupnum } );
+}
+
+=item access_rights
+
+Returns all associated FS::access_right records.
+
+=cut
+
+sub access_rights {
+  my $self = shift;
+  qsearch('access_right', { 'righttype'   => 'FS::access_group',
+                            'rightobjnum' => $self->groupnum 
+                          }
+         );
+}
+
+=item access_right RIGHTNAME
+
+Returns the specified FS::access_right record.  Can be used as a boolean, to
+test if this group has the given RIGHTNAME.
+
+=cut
+
+sub access_right {
+  my( $self, $name ) = shift;
+  qsearchs('access_right', { 'righttype'   => 'FS::access_group',
+                             'rightobjnum' => $self->groupnum,
+                             'rightname'   => $name,
+                           }
+          );
+}
+
 =back
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
diff --git a/FS/FS/access_groupagent.pm b/FS/FS/access_groupagent.pm
index 6b5def1a3..3de8feeed 100644
--- a/FS/FS/access_groupagent.pm
+++ b/FS/FS/access_groupagent.pm
@@ -3,6 +3,7 @@ package FS::access_groupagent;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs );
+use FS::agent;
 
 @ISA = qw(FS::Record);
 
@@ -27,7 +28,7 @@ FS::access_groupagent - Object methods for access_groupagent records
 
 =head1 DESCRIPTION
 
-An FS::access_groupagent object represents an example.  FS::access_groupagent inherits from
+An FS::access_groupagent object represents an group reseller virtualization.  FS::access_groupagent inherits from
 FS::Record.  The following fields are currently supported:
 
 =over 4
@@ -47,7 +48,7 @@ FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new group reseller virtualization.  To add the record to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -86,7 +87,7 @@ returns the error, otherwise returns false.
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid group reseller virtualization.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
@@ -100,20 +101,29 @@ sub check {
 
   my $error = 
     $self->ut_numbern('groupagentnum')
-    || $self->ut_number('groupnum')
-    || $self->ut_number('agentnum')
+    || $self->ut_foreign_key('groupnum', 'access_group', 'groupnum')
+    || $self->ut_foreign_key('agentnum', 'agent',        'agentnum')
   ;
   return $error if $error;
 
   $self->SUPER::check;
 }
 
+=item agent
+
+Returns the associated FS::agent object.
+
+=cut
+
+sub agent {
+  my $self = shift;
+  qsearchs('agent', { 'agentnum' => $self->agentnum } );
+}
+
 =back
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
diff --git a/FS/FS/m2name_Common.pm b/FS/FS/m2name_Common.pm
new file mode 100644
index 000000000..7c9637e27
--- /dev/null
+++ b/FS/FS/m2name_Common.pm
@@ -0,0 +1,95 @@
+package FS::m2name_Common;
+
+use strict;
+use vars qw( @ISA $DEBUG );
+use FS::Schema qw( dbdef );
+use FS::Record qw( qsearch qsearchs ); #dbh );
+
+@ISA = qw( FS::Record );
+
+$DEBUG = 0;
+
+=head1 NAME
+
+FS::m2name_Common - Base class for tables with a related table listing names
+
+=head1 SYNOPSIS
+
+use FS::m2name_Common;
+
+@ISA = qw( FS::m2name_Common );
+
+=head1 DESCRIPTION
+
+FS::m2name_Common is intended as a base class for classes which have a
+related table that lists names.
+
+=head1 METHODS
+
+=over 4
+
+=item process_m2name
+
+=cut
+
+sub process_m2name {
+  my( $self, %opt ) = @_;
+
+  my $self_pkey = $self->dbdef_table->primary_key;
+  my $link_sourcekey = $opt{'num_col'} || $self_pkey;
+
+  my $link_table = $self->_load_table($opt{'link_table'});
+
+  my $link_static = $opt{'link_static'} || {};
+
+  foreach my $name ( @{ $opt{'names_list'} } ) {
+
+    my $obj = qsearchs( $link_table, {
+        $link_sourcekey  => $self->$self_pkey(),
+        $opt{'name_col'} => $name,
+        %$link_static,
+    });
+
+    if ( $obj && ! $opt{'params'}->{"$link_table.$name"} ) {
+
+      my $d_obj = $obj; #need to save $obj for below.
+      my $error = $d_obj->delete;
+      die "error deleting $d_obj for $link_table.$name: $error" if $error;
+
+    } elsif ( $opt{'params'}->{"$link_table.$name"} && ! $obj ) {
+
+      #ok to clobber it now (but bad form nonetheless?)
+      #$obj = new "FS::$link_table" ( {
+      $obj = "FS::$link_table"->new( {
+        $link_sourcekey  => $self->$self_pkey(),
+        $opt{'name_col'} => $name,
+        %$link_static,
+      });
+      my $error = $obj->insert;
+      die "error inserting $obj for $link_table.$name: $error" if $error;
+    }
+
+  }
+
+  '';
+}
+
+sub _load_table {
+  my( $self, $table ) = @_;
+  eval "use FS::$table";
+  die $@ if $@;
+  $table;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 05dc59913..de4d047de 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -1,7 +1,7 @@
 package FS::part_pkg;
 
 use strict;
-use vars qw( @ISA %freq %plans $DEBUG );
+use vars qw( @ISA %plans $DEBUG );
 use Carp qw(carp cluck confess);
 use Tie::IxHash;
 use FS::Conf;
@@ -571,6 +571,32 @@ sub is_free {
   }
 }
 
+
+sub freqs_href {
+  #method, class method or sub? #my $self = shift;
+
+  tie my %freq, 'Tie::IxHash', 
+    '0'  => '(no recurring fee)',
+    '1h' => 'hourly',
+    '1d' => 'daily',
+    '1w' => 'weekly',
+    '2w' => 'biweekly (every 2 weeks)',
+    '1'  => 'monthly',
+    '2'  => 'bimonthly (every 2 months)',
+    '3'  => 'quarterly (every 3 months)',
+    '6'  => 'semiannually (every 6 months)',
+    '12' => 'annually',
+    '24' => 'biannually (every 2 years)',
+    '36' => 'triannually (every 3 years)',
+    '48' => '(every 4 years)',
+    '60' => '(every 5 years)',
+    '120' => '(every 10 years)',
+  ;
+
+  \%freq;
+
+}
+
 =item freq_pretty
 
 Returns an english representation of the I<freq> field, such as "monthly",
@@ -578,29 +604,14 @@ Returns an english representation of the I<freq> field, such as "monthly",
 
 =cut
 
-tie %freq, 'Tie::IxHash', 
-  '0'  => '(no recurring fee)',
-  '1h' => 'hourly',
-  '1d' => 'daily',
-  '1w' => 'weekly',
-  '2w' => 'biweekly (every 2 weeks)',
-  '1'  => 'monthly',
-  '2'  => 'bimonthly (every 2 months)',
-  '3'  => 'quarterly (every 3 months)',
-  '6'  => 'semiannually (every 6 months)',
-  '12' => 'annually',
-  '24' => 'biannually (every 2 years)',
-  '36' => 'triannually (every 3 years)',
-  '48' => '(every 4 years)',
-  '60' => '(every 5 years)',
-  '120' => '(every 10 years)',
-;
-
 sub freq_pretty {
   my $self = shift;
   my $freq = $self->freq;
-  if ( exists($freq{$freq}) ) {
-    $freq{$freq};
+
+  my $freqs_href = $self->freqs_href;
+
+  if ( exists($freqs_href->{$freq}) ) {
+    $freqs_href->{$freq};
   } else {
     my $interval = 'month';
     if ( $freq =~ /^(\d+)([hdw])$/ ) {
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 9e3285dbb..098fe4a64 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -342,3 +342,6 @@ t/access_right.t
 FS/m2m_Common.pm
 FS/pay_batch.pm
 t/pay_batch.t
+FS/ConfDefaults.pm
+t/ConfDefaults.t
+FS/m2name_Common.pm
diff --git a/htetc/handler.pl b/htetc/handler.pl
index d400a55ea..1dfa1376e 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -182,6 +182,10 @@ sub handler
       use FS::pkg_class;
       use FS::access_user;
       use FS::access_group;
+      use FS::access_usergroup;
+      use FS::access_groupagent;
+      use FS::access_right;
+      use FS::AccessRight;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
diff --git a/httemplate/browse/access_group.html b/httemplate/browse/access_group.html
index 6ba89ea81..9ebb2b882 100644
--- a/httemplate/browse/access_group.html
+++ b/httemplate/browse/access_group.html
@@ -4,6 +4,45 @@ my $html_init =
   "Internal access groups control access to the back-office interface.<BR><BR>".
   qq!<A HREF="${p}edit/access_group.html"><I>Add an internal access group</I></A><BR><BR>!;
 
+#false laziness w/access_user.html & agent_type.cgi
+my $agents_sub = sub {
+  my $access_group = shift;
+
+  [ map {
+          my $access_groupagent = $_;
+          my $agent = $access_groupagent->agent;
+          [
+            {
+              'data'  => $agent->agent,
+              'align' => 'left',
+              'link'  => $p. 'edit/agent.cgi?'. $agent->agentnum,
+            },
+          ];
+        }
+    grep { $_->agent } #?
+    $access_group->access_groupagent,
+
+  ];
+  
+};
+
+my $rights_sub = sub {
+  my $access_group = shift;
+
+  [ map { my $access_right = $_;
+          [
+            { 
+              'data'  => $access_right->rightname,
+              'align' => 'left',
+            },
+          ];
+        }
+    $access_group->access_rights,
+
+  ];
+
+};
+
 my $count_query = 'SELECT COUNT(*) FROM access_group';
 
 my $link = [ $p.'edit/access_group.html?', 'groupnum' ];
@@ -22,12 +61,18 @@ my $link = [ $p.'edit/access_group.html?', 'groupnum' ];
                  'count_query' => $count_query,
                  'header'      => [ '#',
                                     'Group name',
+                                    'Agents',
+                                    'Rights',
                                   ],
                  'fields'      => [ 'groupnum',
                                     'groupname',
+                                    $agents_sub,
+                                    $rights_sub,
                                   ],
                  'links'       => [ $link,
                                     $link,
+                                    '',
+                                    '',
                                   ],
              )
 %>
diff --git a/httemplate/browse/access_user.html b/httemplate/browse/access_user.html
index 38d5430b1..be11bf82a 100644
--- a/httemplate/browse/access_user.html
+++ b/httemplate/browse/access_user.html
@@ -4,7 +4,7 @@ my $html_init =
   "Internal users have access to the back-office interface.  Typically, this is your employees and contractors, but in a VISP setup, you can also add accounts for your reseller's employees.  It is <B>highly recommended</B> to add a <B>separate account for each person</B> rather than using role accounts.<BR><BR>".
   qq!<A HREF="${p}edit/access_user.html"><I>Add an internal user</I></A><BR><BR>!;
 
-#false laziness w/agent_type.cgi
+#false laziness w/access_group.html & agent_type.cgi
 my $groups_sub = sub {
   my $access_user = shift;
 
diff --git a/httemplate/edit/access_group.html b/httemplate/edit/access_group.html
index 11b8df7bc..d7f7667f4 100644
--- a/httemplate/edit/access_group.html
+++ b/httemplate/edit/access_group.html
@@ -5,6 +5,42 @@
                                'groupnum'   => 'Group number',
                                'groupname'  => 'Group name',
                              },
+
                  'viewall_dir' => 'browse',
+
+                 'html_bottom' =>
+                   sub {
+                     my $access_group = shift;
+
+                     "<BR>Group virtualized to customers of agents:<BR>".
+                     ntable("#cccccc",2).
+                     '<TR><TD>'.
+                     include( '/elements/checkboxes-table.html',
+                                'source_obj'   => $access_group,
+                                'link_table'   => 'access_groupagent',
+                                'target_table' => 'agent',
+                                'name_col'     => 'agent',
+                                'target_link'  => $p.'edit/agent.cgi?',
+                                'disable-able' => 1,
+                            ).
+                     '</TR></TD></TABLE>'.
+
+                     "<BR>Group rights:<BR>".
+                     ntable("#cccccc",2).
+                     '<TR><TD>'.
+                     include( '/elements/checkboxes-table-name.html',
+                                'source_obj'   => $access_group,
+                                'link_table'   => 'access_right',
+                                'link_static'  => { 'righttype' =>
+                                                      'FS::access_group',
+                                                  },
+                                'num_col'      => 'rightobjnum',
+                                'name_col'     => 'rightname',
+                                'names_list'   => [ FS::AccessRight->rights() ],
+                            ).
+                     '</TR></TD></TABLE>'
+
+                     ;
+                   },
            )
 %>
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 120c03a3c..94bf6eecd 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -16,6 +16,18 @@
   #
   # 'menubar'     => '', #menubar arrayref
   #
+  # #run when re-displaying with an error
+  # 'error_callback' => sub { my $cgi, $object = @_; },
+  #
+  # #run when editing
+  # 'edit_callback' => sub { my $cgi, $object = @_; },
+  #
+  # #run when adding
+  # 'new_callback' => sub { my $cgi, $object = @_; },
+  #
+  # #broken'html_table_bottom' => '', #string or listref of additinal HTML to
+  #                            #add before </TABLE>
+  #
   # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
   #
   # 'html_bottom' => '', #string
@@ -43,16 +55,25 @@
       map { $_ => scalar($cgi->param($_)) } fields($table)
     });
 
+    &{$opt{'error_callback'}}($cgi, $object)
+      if $opt{'error_callback'};
+
   } elsif ( $cgi->keywords ) { #editing
 
     my( $query ) = $cgi->keywords;
     $query =~ /^(\d+)$/;
     $object = qsearchs( $table, { $pkey => $1 } );
 
+    &{$opt{'edit_callback'}}($cgi, $object)
+      if $opt{'edit_callback'};
+
   } else { #adding
 
     $object = $class->new( {} );
 
+    &{$opt{'new_callback'}}($cgi, $object)
+      if $opt{'new_callback'};
+
   }
 
   my $action = $object->$pkey() ? 'Edit' : 'Add';
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 462d5161f..b085d2260 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -237,7 +237,7 @@ if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
   push @form_radio, 'pkg_svc_primary';
 }
 
-tie my %freq, 'Tie::IxHash', %FS::part_pkg::freq;
+tie my %freq, 'Tie::IxHash', %{FS::part_pkg->freqs_href()};
 if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) {
   delete $freq{$_} foreach grep { ! /^\d+$/ } keys %freq;
 }
diff --git a/httemplate/edit/process/access_group.html b/httemplate/edit/process/access_group.html
index e8c6d07b1..9bb9d1dda 100644
--- a/httemplate/edit/process/access_group.html
+++ b/httemplate/edit/process/access_group.html
@@ -1,5 +1,15 @@
 <%= include( 'elements/process.html',
                'table'       => 'access_group',
                'viewall_dir' => 'browse',
+               'process_m2m' => { 'link_table'   => 'access_groupagent',
+                                  'target_table' => 'agent',
+                                },
+               'process_m2name' => {
+                     'link_table'   => 'access_right',
+                     'link_static'  => { 'righttype' => 'FS::access_group', },
+                     'num_col'      => 'rightobjnum',
+                     'name_col'     => 'rightname',
+                     'names_list'   => [ FS::AccessRight->rights() ],
+               },
            )
 %>
diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index 59ad35ee4..a6e3b50e3 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -16,7 +16,14 @@
   # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
   # 'process_m2m' => { 'link_table'   => 'link_table_name',
   #                    'target_table' => 'target_table_name',
-  #                  }.
+  #                  },
+  # 'process_m2name' => { 'link_table'   => 'link_table_name',
+  #                       'link_static' => { 'column' => 'value' },
+  #                       'num_col' => 'column', #if column name is different in
+  #                                              #link_table than source_table 
+  #                       'name_col' => 'name_column',
+  #                       'names_list' => [ 'list', 'names' ],
+  #                     },
 
   my(%opt) = @_;
 
@@ -52,6 +59,12 @@
                               );
   }
 
+  if ( !$error && $opt{'process_m2name'} ) {
+    $error = $new->process_m2name( %{ $opt{'process_m2name'} },
+                                   'params' => scalar($cgi->Vars),
+                                 );
+  }
+
   if ( $error ) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(2). "$table.html?". $cgi->query_string );
diff --git a/httemplate/elements/checkboxes-table-name.html b/httemplate/elements/checkboxes-table-name.html
new file mode 100644
index 000000000..8e9dd29d2
--- /dev/null
+++ b/httemplate/elements/checkboxes-table-name.html
@@ -0,0 +1,85 @@
+<%
+
+  ##
+  # required
+  ##
+  # 'link_table'      => 'table_name',
+  #
+  # 'name_col' => 'name_column',
+  # #or
+  # 'name_callback' => sub { },
+  #
+  # 'names_list' => [ 'value', 'other value' ],
+  #
+  ##
+  # recommended (required?)
+  ##
+  # 'source_obj'   => $obj,
+  # #or?
+  # #'source_table' => 'table_name',
+  # #'sourcenum'    => '4', #current value of primary key in source_table
+  # #                       # (none is okay, just pass it if you have it)
+  ##
+  # optional
+  ##
+  # 'num_col' => 'col_name' #if column name is different in link_table than
+  #                         #source_table
+  # 'link_static' => { 'column' => 'value' },
+
+  my( %opt ) = @_;
+
+  my( $source_pkey, $sourcenum, $source_obj );
+  if ( $opt{'source_obj'} ) {
+
+    $source_obj = $opt{'source_obj'};
+    #$source_table = $source_obj->dbdef_table->table;
+    $source_pkey = $source_obj->dbdef_table->primary_key;
+    $sourcenum = $source_obj->$source_pkey();
+
+  } else {
+
+    #$source_obj?
+    $source_pkey = $opt{'source_table'}
+                     ? dbdef->table($opt{'source_table'})->primary_key
+                     : '';
+    $sourcenum = $opt{'sourcenum'};
+  }
+
+  $source_pkey = $opt{'num_col'} || $source_pkey;
+
+  my $link_static = $opt{'link_static'} || {};
+
+%>
+
+<% foreach my $name ( @{ $opt{'names_list'} } ) {
+
+     my $checked;
+     if ( $cgi->param('error') ) {
+
+       $checked = $cgi->param($opt{'link_table'}. ".$name" )
+                    ? 'CHECKED'
+                    : '';
+
+     } else {
+
+       $checked =
+         qsearchs( $opt{'link_table'}, {
+                                         $source_pkey     => $sourcenum,
+                                         $opt{'name_col'} => $name,
+                                         %$link_static,
+                                       }                                 )
+                    ? 'CHECKED'
+                    : ''
+
+     }
+
+%>
+
+  <INPUT TYPE="checkbox" NAME="<%= $opt{'link_table'}. ".$name" %>" <%= $checked %> VALUE="ON">
+
+  <%= $name %>
+
+  <BR>
+
+<% } %>
+
diff --git a/httemplate/elements/checkboxes-table.html b/httemplate/elements/checkboxes-table.html
index d26ebef35..16376fa3d 100644
--- a/httemplate/elements/checkboxes-table.html
+++ b/httemplate/elements/checkboxes-table.html
@@ -68,16 +68,28 @@
    ) {
 
      my $targetnum = $target_obj->$target_pkey();
+
+     my $checked;
+     if ( $cgi->param('error') ) {
+
+       $checked = $cgi->param($target_pkey.$targetnum)
+                    ? 'CHECKED'
+                    : '';
+
+     } else {
+
+       $checked = qsearchs( $opt{'link_table'}, {
+                                                  $source_pkey => $sourcenum,
+                                                  $target_pkey => $targetnum,
+                                                }                             )
+                    ? 'CHECKED'
+                    : ''
+
+     }
+
 %>
 
-  <INPUT TYPE="checkbox" NAME="<%= $target_pkey. $targetnum %>" <%=
-        qsearchs( $opt{'link_table'}, {
-          $source_pkey => $sourcenum,
-          $target_pkey => $targetnum,
-        })
-          ? 'CHECKED '
-          : ''
-  %> VALUE="ON">
+  <INPUT TYPE="checkbox" NAME="<%= $target_pkey. $targetnum %>" <%= $checked %> VALUE="ON">
 
   <% if ( $opt{'target_link'} ) { %>
 
-- 
cgit v1.2.1


From bb65b62d3d68ac0788f230fe2e35ebe1913fc0f5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 18 Jun 2006 12:56:20 +0000
Subject: well, it isn't broken...

---
 httemplate/edit/elements/edit.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 94bf6eecd..6fa2b3b6e 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -25,8 +25,9 @@
   # #run when adding
   # 'new_callback' => sub { my $cgi, $object = @_; },
   #
-  # #broken'html_table_bottom' => '', #string or listref of additinal HTML to
-  #                            #add before </TABLE>
+  # #uninmplemented
+  # #'html_table_bottom' => '', #string or listref of additinal HTML to
+  # #                           #add before </TABLE>
   #
   # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
   #
-- 
cgit v1.2.1


From c0e8da2f1e89729efa1032241e4239765a296514 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jun 2006 02:33:52 +0000
Subject: agent virtualization, take one (stuff from "inactive" changeset snuck
 into cust_main.pm and the package reporting changeset in search/cust_pkg.cgi
 here too)

---
 FS/FS/CurrentUser.pm                     |  50 ++++++++
 FS/FS/Record.pm                          |  29 +++--
 FS/FS/Schema.pm                          |  13 +-
 FS/FS/UID.pm                             |  19 ++-
 FS/FS/access_user.pm                     |  51 +++++++-
 FS/FS/cust_main.pm                       | 213 ++++++++++++++++++++-----------
 FS/FS/part_pkg.pm                        |   3 +-
 FS/MANIFEST                              |   1 +
 httemplate/elements/select-agent.html    |   2 +
 httemplate/elements/select-table.html    |   7 +-
 httemplate/elements/tr-select-agent.html |  11 +-
 httemplate/search/cust_bill.html         |  19 ++-
 httemplate/search/cust_main.cgi          |  49 ++++---
 httemplate/search/cust_pkg.cgi           | 162 ++++++++++++++++-------
 httemplate/search/svc_acct.cgi           |  24 ++--
 httemplate/search/svc_domain.cgi         |  43 ++++---
 httemplate/search/svc_forward.cgi        |  24 ++--
 17 files changed, 514 insertions(+), 206 deletions(-)
 create mode 100644 FS/FS/CurrentUser.pm

diff --git a/FS/FS/CurrentUser.pm b/FS/FS/CurrentUser.pm
new file mode 100644
index 000000000..13d34167d
--- /dev/null
+++ b/FS/FS/CurrentUser.pm
@@ -0,0 +1,50 @@
+package FS::CurrentUser;
+
+use vars qw($CurrentUser);
+
+#not at compile-time, circular dependancey causes trouble
+#use FS::Record qw(qsearchs);
+#use FS::access_user;
+
+=head1 NAME
+
+FS::CurrentUser - Package representing the current user
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=cut
+
+sub load_user {
+  my( $class, $user ) = @_; #, $pass
+
+  #XXX remove me at some point
+  return "" if $user =~ /^fs_(queue|selfservice)$/;
+
+  #not the best thing in the world...
+  eval "use FS::Record qw(qsearchs);";
+  die $@ if $@;
+  eval "use FS::access_user;";
+  die $@ if $@;
+
+  $CurrentUser = qsearchs('access_user', {
+    'username' => $user,
+    #'_password' =>
+  } );
+
+  die "unknown user: $user" unless $CurrentUser; # or bad password
+
+  $CurrentUser;
+}
+
+=head1 BUGS
+
+Creepy crawlies
+
+=head1 SEE ALSO
+
+=cut
+
+1;
+
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 67de071c6..fa0d2d87e 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -29,14 +29,12 @@ $me = '[FS::Record]';
 
 $nowarn_identical = 0;
 
-my $conf;
 my $rsa_module;
 my $rsa_loaded;
 my $rsa_encrypt;
 my $rsa_decrypt;
 
 FS::UID->install_callback( sub {
-  $conf = new FS::Conf; 
   $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters.". datasrc;
 } );
 
@@ -441,6 +439,7 @@ sub qsearch {
     }
 
     # Check for encrypted fields and decrypt them.
+    my $conf = new FS::Conf; 
     if ($conf->exists('encryption') && eval 'defined(@FS::'. $table . '::encrypted_fields)') {
       foreach my $record (@return) {
         foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
@@ -711,6 +710,7 @@ sub insert {
 
   
   # Encrypt before the database
+  my $conf = new FS::Conf;
   if ($conf->exists('encryption') && defined(eval '@FS::'. $table . 'encrypted_fields')) {
     foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
       $self->{'saved'} = $self->getfield($field);
@@ -727,12 +727,18 @@ sub insert {
   my @values = map { _quote( $self->getfield($_), $table, $_) } @real_fields;
   #eslaf
 
-  my $statement = "INSERT INTO $table ( ".
-      join( ', ', @real_fields ).
-    ") VALUES (".
-      join( ', ', @values ).
-    ")"
-  ;
+  my $statement = "INSERT INTO $table ";
+  if ( @real_fields ) {
+    $statement .=
+      "( ".
+        join( ', ', @real_fields ).
+      ") VALUES (".
+        join( ', ', @values ).
+       ")"
+    ;
+  } else {
+    $statement .= 'DEFAULT VALUES';
+  }
   warn "[debug]$me $statement\n" if $DEBUG > 1;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
@@ -995,6 +1001,7 @@ sub replace {
   return $error if $error;
   
   # Encrypt for replace
+  my $conf = new FS::Conf;
   my $saved = {};
   if ($conf->exists('encryption') && defined(eval '@FS::'. $new->table . 'encrypted_fields')) {
     foreach my $field (eval '@FS::'. $new->table . '::encrypted_fields') {
@@ -1635,7 +1642,8 @@ sub virtual_fields {
                 "WHERE dbtable = '$table'";
     my $dbh = dbh;
     my $result = $dbh->selectcol_arrayref($query);
-    confess $dbh->errstr if $dbh->err;
+    confess "Error executing virtual fields query: $query: ". $dbh->errstr
+      if $dbh->err;
     $virtual_fields_cache{$table} = $result;
   }
 
@@ -1788,6 +1796,7 @@ sub encrypt {
   my ($self, $value) = @_;
   my $encrypted;
 
+  my $conf = new FS::Conf;
   if ($conf->exists('encryption')) {
     if ($self->is_encrypted($value)) {
       # Return the original value if it isn't plaintext.
@@ -1821,6 +1830,7 @@ sub is_encrypted {
 sub decrypt {
   my ($self,$value) = @_;
   my $decrypted = $value; # Will return the original value if it isn't encrypted or can't be decrypted.
+  my $conf = new FS::Conf;
   if ($conf->exists('encryption') && $self->is_encrypted($value)) {
     $self->loadRSA;
     if (ref($rsa_decrypt) =~ /::RSA/) {
@@ -1836,6 +1846,7 @@ sub loadRSA {
     #Initialize the Module
     $rsa_module = 'Crypt::OpenSSL::RSA'; # The Default
 
+    my $conf = new FS::Conf;
     if ($conf->exists('encryptionmodule') && $conf->config('encryptionmodule') ne '') {
       $rsa_module = $conf->config('encryptionmodule');
     }
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 17d541e8c..7219274e6 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -16,12 +16,13 @@ use FS::UID qw(datasrc);
 $DEBUG = 0;
 $me = '[FS::Schema]';
 
-#ask FS::UID to run this stuff for us later
-FS::UID->install_callback( sub {
-  #$conf = new FS::Conf; 
-  &reload_dbdef("/usr/local/etc/freeside/dbdef.". datasrc)
-    unless $setup_hack; #$setup_hack needed now?
-} );
+#hardcoded now...
+##ask FS::UID to run this stuff for us later
+#FS::UID->install_callback( sub {
+#  #$conf = new FS::Conf; 
+#  &reload_dbdef("/usr/local/etc/freeside/dbdef.". datasrc)
+#    unless $setup_hack; #$setup_hack needed now?
+#} );
 
 =head1 NAME
 
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 83b652b0f..21df9441b 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -13,6 +13,7 @@ use Exporter;
 use Carp qw(carp croak cluck);
 use DBI;
 use FS::Conf;
+use FS::CurrentUser;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(checkeuid checkruid cgisuidsetup adminsuidsetup forksuidsetup
@@ -87,6 +88,12 @@ sub forksuidsetup {
 
   $dbh = &myconnect;
 
+  use FS::Schema qw(reload_dbdef);
+  reload_dbdef("/usr/local/etc/freeside/dbdef.$datasrc")
+    unless $FS::Schema::setup_hack;
+
+  FS::CurrentUser->load_user($user);
+
   foreach ( keys %callback ) {
     &{$callback{$_}};
     # breaks multi-database installs # delete $callback{$_}; #run once
@@ -98,7 +105,11 @@ sub forksuidsetup {
 }
 
 sub myconnect {
-  DBI->connect( getsecrets, {'AutoCommit' => 0, 'ChopBlanks' => 1, } )
+  DBI->connect( getsecrets, { 'AutoCommit'         => 0,
+                              'ChopBlanks'         => 1,
+                              'ShowErrorStatement' => 1,
+                            }
+              )
     or die "DBI->connect error: $DBI::errstr\n";
 }
 
@@ -256,10 +267,10 @@ sub getsecrets {
   $user = $setuser if $setuser;
   die "No user!" unless $user;
   my($conf) = new FS::Conf $conf_dir;
-  my($line) = grep /^\s*$user\s/, $conf->config('mapsecrets');
+  my($line) = grep /^\s*($user|\*)\s/, $conf->config('mapsecrets');
   die "User $user not found in mapsecrets!" unless $line;
-  $line =~ /^\s*$user\s+(.*)$/;
-  $secrets = $1;
+  $line =~ /^\s*($user|\*)\s+(.*)$/;
+  $secrets = $2;
   die "Illegal mapsecrets line for user?!" unless $secrets;
   ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
     or die "Can't get secrets: $secrets: $!\n";
diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index ca311d3b8..c95d02984 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -2,7 +2,7 @@ package FS::access_user;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::m2m_Common;
 use FS::access_usergroup;
 
@@ -29,7 +29,7 @@ FS::access_user - Object methods for access_user records
 
 =head1 DESCRIPTION
 
-An FS::access_user object represents an example.  FS::access_user inherits from
+An FS::access_user object represents an internal access user.  FS::access_user inherits from
 FS::Record.  The following fields are currently supported:
 
 =over 4
@@ -52,7 +52,7 @@ FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new internal access user.  To add the user to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -91,7 +91,7 @@ returns the error, otherwise returns false.
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid internal access user.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
@@ -151,12 +151,51 @@ sub access_usergroup {
 #
 #}
 
+=item agentnums 
+
+Returns a list of agentnums this user can view (via group membership).
+
+=cut
+
+sub agentnums {
+  my $self = shift;
+  my $sth = dbh->prepare(
+    "SELECT DISTINCT agentnum FROM access_usergroup
+                              JOIN access_groupagent USING ( groupnum )
+       WHERE usernum = ?"
+  ) or die dbh->errstr;
+  $sth->execute($self->usernum) or die $sth->errstr;
+  map { $_->[0] } @{ $sth->fetchall_arrayref };
+}
+
+=item agentnums_href
+
+Returns a hashref of agentnums this user can view.
+
+=cut
+
+sub agentnums_href {
+  my $self = shift;
+  { map { $_ => 1 } $self->agentnums };
+}
+
+=item agentnums_sql
+
+Returns an sql fragement to select only agentnums this user can view.
+
+=cut
+
+sub agentnums_sql {
+  my $self = shift;
+  '( '.
+    join( ' OR ', map "agentnum = $_", $self->agentnums ).
+  ' )';
+}
+
 =back
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2763c1386..8956d5b26 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -20,6 +20,7 @@ use Date::Parse;
 #use Date::Manip;
 use String::Approx qw(amatch);
 use Business::CreditCard 0.28;
+use Locale::Country;
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearchs qsearch dbdef );
 use FS::Misc qw( send_email );
@@ -79,7 +80,7 @@ sub _cache {
   my $self = shift;
   my ( $hashref, $cache ) = @_;
   if ( exists $hashref->{'pkgnum'} ) {
-#    #@{ $self->{'_pkgnum'} } = ();
+    #@{ $self->{'_pkgnum'} } = ();
     my $subcache = $cache->subcache( 'pkgnum', 'cust_pkg', $hashref->{custnum});
     $self->{'_pkgnum'} = $subcache;
     #push @{ $self->{'_pkgnum'} },
@@ -3186,6 +3187,7 @@ This interface may change in the future.
 
 sub invoicing_list {
   my( $self, $arrayref ) = @_;
+
   if ( $arrayref ) {
     my @cust_main_invoice;
     if ( $self->custnum ) {
@@ -3220,12 +3222,14 @@ sub invoicing_list {
       warn $error if $error;
     }
   }
+  
   if ( $self->custnum ) {
     map { $_->address }
       qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
   } else {
     ();
   }
+
 }
 
 =item check_invoicing_list ARRAYREF
@@ -3303,6 +3307,18 @@ sub invoicing_list_addpost {
   $self->invoicing_list(\@invoicing_list);
 }
 
+=item invoicing_list_emailonly
+
+Returns the list of email invoice recipients (invoicing_list without non-email
+destinations such as POST and FAX).
+
+=cut
+
+sub invoicing_list_emailonly {
+  my $self = shift;
+  grep { $_ !~ /^([A-Z]+)$/ } $self->invoicing_list;
+}
+
 =item referral_cust_main [ DEPTH [ EXCLUDE_HASHREF ] ]
 
 Returns an array of customers referred by this customer (referral_custnum set
@@ -3600,6 +3616,17 @@ sub ship_contact {
     : $self->contact;
 }
 
+=item country_full
+
+Returns this customer's full country name
+
+=cut
+
+sub country_full {
+  my $self = shift;
+  code2country($self->country);
+}
+
 =item status
 
 Returns a status string for this customer, currently:
@@ -3610,6 +3637,8 @@ Returns a status string for this customer, currently:
 
 =item active - One or more recurring packages is active
 
+=item inactive - No active recurring packages, but otherwise unsuspended/uncancelled (the inactive status is new - previously inactive customers were mis-identified as cancelled)
+
 =item suspended - All non-cancelled recurring packages are suspended
 
 =item cancelled - All recurring packages are cancelled
@@ -3620,7 +3649,7 @@ Returns a status string for this customer, currently:
 
 sub status {
   my $self = shift;
-  for my $status (qw( prospect active suspended cancelled )) {
+  for my $status (qw( prospect active inactive suspended cancelled )) {
     my $method = $status.'_sql';
     my $numnum = ( my $sql = $self->$method() ) =~ s/cust_main\.custnum/?/g;
     my $sth = dbh->prepare("SELECT $sql") or die dbh->errstr;
@@ -3635,14 +3664,18 @@ Returns a hex triplet color string for this customer's status.
 
 =cut
 
-my %statuscolor = (
-  'prospect'  => '000000',
-  'active'    => '00CC00',
-  'suspended' => 'FF9900',
-  'cancelled' => 'FF0000',
-);
+
 sub statuscolor {
   my $self = shift;
+
+  my %statuscolor = (
+    'prospect'  => '7e0079', #'000000', #black?  naw, purple
+    'active'    => '00CC00', #green
+    'inactive'  => '0000CC', #blue
+    'suspended' => 'FF9900', #yellow
+    'cancelled' => 'FF0000', #red
+  );
+
   $statuscolor{$self->status};
 }
 
@@ -3659,25 +3692,40 @@ with no packages ever ordered)
 
 =cut
 
+use vars qw($select_count_pkgs);
+$select_count_pkgs =
+  "SELECT COUNT(*) FROM cust_pkg
+    WHERE cust_pkg.custnum = cust_main.custnum";
+
 sub prospect_sql { "
-  0 = ( SELECT COUNT(*) FROM cust_pkg
-          WHERE cust_pkg.custnum = cust_main.custnum
-      )
+  0 = ( $select_count_pkgs )
 "; }
 
 =item active_sql
 
-Returns an SQL expression identifying active cust_main records.
+Returns an SQL expression identifying active cust_main records (customers with
+no active recurring packages, but otherwise unsuspended/uncancelled).
 
 =cut
 
 sub active_sql { "
-  0 < ( SELECT COUNT(*) FROM cust_pkg
-          WHERE cust_pkg.custnum = cust_main.custnum
-            AND ". FS::cust_pkg->active_sql. "
+  0 < ( $select_count_pkgs AND ". FS::cust_pkg->active_sql. "
       )
 "; }
 
+=item inactive_sql
+
+Returns an SQL expression identifying inactive cust_main records (customers with
+active recurring packages).
+
+=cut
+
+sub inactive_sql { "
+  0 = ( $select_count_pkgs AND ". FS::cust_pkg->active_sql. " )
+  AND
+  0 < ( $select_count_pkgs AND ". FS::cust_pkg->inactive_sql. " )
+"; }
+
 =item susp_sql
 =item suspended_sql
 
@@ -3685,23 +3733,12 @@ Returns an SQL expression identifying suspended cust_main records.
 
 =cut
 
-#my $recurring_sql = FS::cust_pkg->recurring_sql;
-my $recurring_sql = "
-  '0' != ( select freq from part_pkg
-             where cust_pkg.pkgpart = part_pkg.pkgpart )
-";
 
 sub suspended_sql { susp_sql(@_); }
 sub susp_sql { "
-    0 < ( SELECT COUNT(*) FROM cust_pkg
-            WHERE cust_pkg.custnum = cust_main.custnum
-              AND $recurring_sql
-              AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-        )
-    AND 0 = ( SELECT COUNT(*) FROM cust_pkg
-                WHERE cust_pkg.custnum = cust_main.custnum
-                  AND ". FS::cust_pkg->active_sql. "
-            )
+    0 < ( $select_count_pkgs AND ". FS::cust_pkg->suspended_sql. " )
+    AND
+    0 = ( $select_count_pkgs AND ". FS::cust_pkg->active_sql. " )
 "; }
 
 =item cancel_sql
@@ -3712,16 +3749,21 @@ Returns an SQL expression identifying cancelled cust_main records.
 =cut
 
 sub cancelled_sql { cancel_sql(@_); }
-sub cancel_sql { "
-  0 < ( SELECT COUNT(*) FROM cust_pkg
-          WHERE cust_pkg.custnum = cust_main.custnum
-      )
-  AND 0 = ( SELECT COUNT(*) FROM cust_pkg
-              WHERE cust_pkg.custnum = cust_main.custnum
-                AND $recurring_sql
-                AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-          )
-"; }
+sub cancel_sql {
+
+  my $recurring_sql = FS::cust_pkg->recurring_sql;
+  #my $recurring_sql = "
+  #  '0' != ( select freq from part_pkg
+  #             where cust_pkg.pkgpart = part_pkg.pkgpart )
+  #";
+
+  "
+    0 < ( $select_count_pkgs )
+    AND 0 = ( $select_count_pkgs AND $recurring_sql
+                  AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
+            )
+  ";
+}
 
 =item uncancel_sql
 =item uncancelled_sql
@@ -3732,15 +3774,12 @@ Returns an SQL expression identifying un-cancelled cust_main records.
 
 sub uncancelled_sql { uncancel_sql(@_); }
 sub uncancel_sql { "
-  ( 0 < ( SELECT COUNT(*) FROM cust_pkg
-                 WHERE cust_pkg.custnum = cust_main.custnum
+  ( 0 < ( $select_count_pkgs
                    AND ( cust_pkg.cancel IS NULL
                          OR cust_pkg.cancel = 0
                        )
         )
-    OR 0 = ( SELECT COUNT(*) FROM cust_pkg
-               WHERE cust_pkg.custnum = cust_main.custnum
-           )
+    OR 0 = ( $select_count_pkgs )
   )
 "; }
 
@@ -3802,11 +3841,18 @@ Returns a (possibly empty) array of FS::cust_main objects.
 sub smart_search {
   my %options = @_;
   my $search = delete $options{'search'};
-  my @cust_main = ();
 
+  #here is the agent virtualization
+  my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+  my @cust_main = ();
   if ( $search =~ /^\s*(\d+)\s*$/ ) { # customer # search
 
-    push @cust_main, qsearch('cust_main', { 'custnum' => $1, %options } );
+    push @cust_main, qsearch( {
+      'table'     => 'cust_main',
+      'hashref'   => { 'custnum' => $1, %options },
+      'extra_sql' => " AND $agentnums_sql", #agent virtualization
+    } );
 
   } elsif ( $search =~ /^\s*(\S.*\S)\s*$/ ) { #value search
 
@@ -3820,50 +3866,65 @@ sub smart_search {
       if defined dbdef->table('cust_main')->column('ship_last');
     $sql .= ' )';
 
-    push @cust_main, qsearch( 'cust_main', \%options, '', $sql );
+    push @cust_main, qsearch( {
+      'table'     => 'cust_main',
+      'hashref'   => \%options,
+      'extra_sql' => "$sql AND $agentnums_sql", #agent virtualization
+    } );
 
     unless ( @cust_main ) {  #no exact match, trying substring/fuzzy
 
       #still some false laziness w/ search/cust_main.cgi
 
       #substring
-      push @cust_main, qsearch( 'cust_main',
-                                { 'last'     => { 'op'    => 'ILIKE',
-                                                  'value' => "%$q_value%" },
-                                  %options,
-                                }
-                              );
-      push @cust_main, qsearch( 'cust_main',
-                                { 'ship_last' => { 'op'    => 'ILIKE',
-                                                   'value' => "%$q_value%" },
-                                  %options,
-
-                                }
-                              )
+      push @cust_main, qsearch( {
+        'table'     => 'cust_main',
+        'hashref'   => { 'last'     => { 'op'    => 'ILIKE',
+                                         'value' => "%$q_value%" },
+                         %options,
+                       },
+        'extra_sql' => " AND $agentnums_sql", #agent virtualizaiton
+      } );
+      push @cust_main, qsearch( {
+        'table'     => 'cust_main',
+        'hashref'   => { 'ship_last' => { 'op'     => 'ILIKE',
+                                          'value' => "%$q_value%" },
+                         %options, 
+                       },
+        'extra_sql' => " AND $agentnums_sql", #agent virtualization
+      } )
         if defined dbdef->table('cust_main')->column('ship_last');
 
-      push @cust_main, qsearch( 'cust_main',
-                                { 'company'  => { 'op'    => 'ILIKE',
-                                                  'value' => "%$q_value%" },
-                                  %options,
-                                }
-                              );
-      push @cust_main, qsearch( 'cust_main',
-                                { 'ship_company' => { 'op' => 'ILIKE',
-                                                   'value' => "%$q_value%" },
-                                  %options,
-                                }
-                              )
+      push @cust_main, qsearch( {
+        'table'     => 'cust_main',
+        'hashref'   => { 'company'  => { 'op'    => 'ILIKE',
+                                         'value' => "%$q_value%" },
+                         %options,
+                       },
+        'extra_sql' => " AND $agentnums_sql", #agent virtualization
+      } );
+      push @cust_main, qsearch(  {
+        'table'     => 'cust_main',
+        'hashref'   => { 'ship_company' => { 'op'    => 'ILIKE',
+                                             'value' => "%$q_value%" },
+                         %options,
+                       },
+        'extra_sql' => " AND $agentnums_sql", #agent virtualization
+      } )
         if defined dbdef->table('cust_main')->column('ship_last');
 
       #fuzzy
       push @cust_main, FS::cust_main->fuzzy_search(
-        { 'last'     => $value },
-        \%options,
+        { 'last'     => $value }, #fuzzy hashref
+        \%options,                #hashref
+        '',                       #select
+        " AND $agentnums_sql",    #extra_sql  #agent virtualization
       );
       push @cust_main, FS::cust_main->fuzzy_search(
-        { 'company'  => $value },
-        \%options,
+        { 'company'  => $value }, #fuzzy hashref
+        \%options,                #hashref
+        '',                       #select
+        " AND $agentnums_sql",    #extra_sql  #agent virtualization
       );
 
     }
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index de4d047de..aa39d890b 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -608,7 +608,8 @@ sub freq_pretty {
   my $self = shift;
   my $freq = $self->freq;
 
-  my $freqs_href = $self->freqs_href;
+  #my $freqs_href = $self->freqs_href;
+  my $freqs_href = freqs_href();
 
   if ( exists($freqs_href->{$freq}) ) {
     $freqs_href->{$freq};
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 098fe4a64..6db82710c 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -345,3 +345,4 @@ t/pay_batch.t
 FS/ConfDefaults.pm
 t/ConfDefaults.t
 FS/m2name_Common.pm
+FS/CurrentUser.pm
diff --git a/httemplate/elements/select-agent.html b/httemplate/elements/select-agent.html
index aa480a54b..78ec25f82 100644
--- a/httemplate/elements/select-agent.html
+++ b/httemplate/elements/select-agent.html
@@ -11,6 +11,8 @@
                  'value'       => $agentnum,
                  'empty_label' => 'all',
                  'hashref'     => { 'disabled' => '' },
+                 'extra_sql'   => ' AND '.
+                                  $FS::CurrentUser::CurrentUser->agentnums_sql,
                  %select_opt,
              )
 %>
diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html
index 96f0177fb..6c8089b31 100644
--- a/httemplate/elements/select-table.html
+++ b/httemplate/elements/select-table.html
@@ -10,6 +10,7 @@
   ##opt
   # 'empty_label' => '', #better specify it though, the default might change
   # 'hashref'     => {},
+  # 'extra_sql'   => '',
   # 'records'     => \@records, #instead of hashref
   # 'pre_options' => [ 'value' => 'option' ], #before normal options
 
@@ -25,7 +26,11 @@
   if ( $opt{'records'} ) {
     @records = @{ $opt{'records'} };
   } else {
-    @records = qsearch( $opt{'table'}, ( $opt{'hashref'} || {} ) );
+    @records = qsearch( {
+      'table'     => $opt{'table'},
+      'hashref'   => ( $opt{'hashref'} || {} ),
+      'extra_sql' => ( $opt{'extra_sql'} || '' ),
+    });
   }
 
   my @pre_options = $opt{'pre_options'} ? @{ $opt{'pre_options'} } : ();
diff --git a/httemplate/elements/tr-select-agent.html b/httemplate/elements/tr-select-agent.html
index 2227262b6..83c8d1758 100644
--- a/httemplate/elements/tr-select-agent.html
+++ b/httemplate/elements/tr-select-agent.html
@@ -3,9 +3,16 @@
 
   my @agents;
   if ( $opt{'agents'} ) {
-    @agents = @{ $opt{'agents'} };
+    #@agents = @{ $opt{'agents'} };
+    #here is the agent virtualization
+    my $agentnums_href = $FS::CurrentUser::CurrentUser->agentnums_href;
+    @agents = grep $agentnums_href->{$_->agentnum}, @{ $opt{'agents'} };
   } else {
-    @agents = qsearch( 'agent', { disabled=>'' } );
+    @agents = qsearch( {
+      'table'     => 'agent',
+      'hashref'   => { disabled=>'' },
+      'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+    });
   }
 
 %>
diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 2108653a8..16128d5c8 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -1,4 +1,9 @@
 <%
+
+   my $join_cust_main = 'LEFT JOIN cust_main USING ( custnum )';
+   #here is the agent virtualization
+   my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
+
    my( $count_query, $sql_query );
    my( $count_addl ) = ( '' );
    my( $distinct ) = ( '' );
@@ -6,11 +11,15 @@
    my($agentnum) = ( '' );
    my($open, $days) = ( '', '' );
    if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
-     $count_query = "SELECT COUNT(*) FROM cust_bill WHERE invnum = $2";
+     $count_query =
+       "SELECT COUNT(*) FROM cust_bill $join_cust_main".
+       "  WHERE invnum = $2 AND $agentnums_sql"; #agent virtualization
      $sql_query = {
        'table'     => 'cust_bill',
+       'addl_from' => $join_cust_main,
        'hashref'   => { 'invnum' => $2 },
        #'select'    => '*',
+       'extra_sql' => " AND $agentnums_sql", #agent virtualization
      };
    } else {
    #if ( $cgi->param('begin') || $cgi->param('end')
@@ -68,10 +77,10 @@
        push @where, "cust_bill._date < ". (time-86400*$days) if $days;
      }
 
+     #here is the agent virtualization
+     push @where, $agentnums_sql;
      my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
 
-     my $addl_from = 'left join cust_main using ( custnum )';
-
      if ( $cgi->param('newest_percust') ) {
        $distinct = 'DISTINCT ON ( cust_bill.custnum )';
        $orderby = 'ORDER BY cust_bill.custnum ASC, cust_bill._date DESC';
@@ -85,11 +94,11 @@
                        '$%.2f total outstanding balance',
                      ];
      }
-     $count_query .=  " FROM cust_bill $addl_from $extra_sql";
+     $count_query .=  " FROM cust_bill $join_cust_main $extra_sql";
    
      $sql_query = {
        'table'     => 'cust_bill',
-       'addl_from' => $addl_from,
+       'addl_from' => $join_cust_main,
        'hashref'   => {},
        'select'    => "$distinct ". join(', ',
                         'cust_bill.*',
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 733e5dc15..5b7ccec1c 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -117,6 +117,10 @@ if ( $cgi->param('browse')
 
   my $addl_qual = join(' AND ', @qual);
 
+  #here is the agent virtualization
+  $addl_qual .= ( $addl_qual ? ' AND ' : '' ).
+                $FS::CurrentUser::CurrentUser->agentnums_sql;
+
   if ( $addl_qual ) {
     $qual .= ' AND ' if $qual;
     $qual .= $addl_qual;
@@ -322,32 +326,43 @@ END
 
   print "<BR><BR>". $pager. include('/elements/table-grid.html'). <<END;
       <TR>
-        <TH></TH>
-        <TH>(bill) name</TH>
-        <TH>company</TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc">(bill) name</TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc">company</TH>
 END
 
 if ( defined dbdef->table('cust_main')->column('ship_last') ) {
   print <<END;
-      <TH>(service) name</TH>
-      <TH>company</TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc">(service) name</TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc">company</TH>
 END
 }
 
 foreach my $addl_header ( @addl_headers ) {
-  print "<TH>$addl_header</TH>";
+  print '<TH CLASS="grid" BGCOLOR="#cccccc">'. "$addl_header</TH>";
 }
 
 print <<END;
-        <TH>Packages</TH>
-        <TH COLSPAN=2>Services</TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc">Packages</TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=2>Services</TH>
       </TR>
 END
 
+  my $bgcolor1 = '#eeeeee';
+  my $bgcolor2 = '#ffffff';
+  my $bgcolor;
+
   my(%saw,$cust_main);
   foreach $cust_main (
     sort $sortby grep(!$saw{$_->custnum}++, @cust_main)
   ) {
+
+    if ( $bgcolor eq $bgcolor1 ) {
+      $bgcolor = $bgcolor2;
+    } else {
+      $bgcolor = $bgcolor1;
+    }
+
     my($custnum,$last,$first,$company)=(
       $cust_main->custnum,
       $cust_main->getfield('last'),
@@ -377,9 +392,9 @@ END
     %>
 
     <TR>
-      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= $custnum %></FONT></A></TD>
-      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$last, $first" %></FONT></A></TD>
-      <TD ROWSPAN=<%= $rowspan || 1 %>><%= $pcompany %></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= $custnum %></FONT></A></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$last, $first" %></FONT></A></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %>><%= $pcompany %></TD>
 
     <%
     if ( defined dbdef->table('cust_main')->column('ship_last') ) {
@@ -393,14 +408,14 @@ END
         : '<FONT SIZE=-1>&nbsp;</FONT>';
       %>
 
-      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$ship_last, $ship_first" %></FONT></A></TD>
-      <TD ROWSPAN=<%= $rowspan || 1 %>><%= $pship_company %></A></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$ship_last, $ship_first" %></FONT></A></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %>><%= $pship_company %></A></TD>
 
     <% }
 
     foreach my $addl_col ( @addl_cols ) { %>
 
-      <TD ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
 
       <% if ( $addl_col eq 'tickets' ) {
         if ( @custom_priorities ) {
@@ -457,14 +472,14 @@ END
       #my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
       my $rowspan = scalar(@cust_svc) || 1;
 
-      print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
+      print $n1, qq!<TD CLASS="grid" BGCOLOR="$bgcolor"  ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
       my($n2)='';
       foreach my $cust_svc ( @cust_svc ) {
          my($label, $value, $svcdb) = $cust_svc->label;
          my($svcnum) = $cust_svc->svcnum;
          my($sview) = $p.'view';
-         print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-               qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+         print $n2,qq!<TD CLASS="grid" BGCOLOR="$bgcolor" ><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
+               qq!<TD CLASS="grid" BGCOLOR="$bgcolor" ><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
          $n2="</TR><TR>";
       }
       #print qq!</TR><TR>\n!;
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index a2fb89c12..e8b3f490d 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,19 +1,80 @@
 <%
 
-my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
+# my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
 
 my($query) = $cgi->keywords;
 
-my $orderby;
-my @where;
-my $cjoin = '';
+my @where = ();
+
+##
+# parse agent
+##
 
 if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
-  $cjoin = "LEFT JOIN cust_main USING ( custnum )";
   push @where,
     "agentnum = $1";
 }
 
+##
+# parse status
+##
+
+if (    $cgi->param('magic')  eq 'active'
+     || $cgi->param('status') eq 'active' ) {
+
+  push @where, FS::cust_pkg->active_sql();
+
+} elsif (    $cgi->param('magic')  eq 'suspended'
+          || $cgi->param('status') eq 'suspended'  ) {
+
+  push @where, FS::cust_pkg->suspended_sql();
+
+} elsif (    $cgi->param('magic')  =~ /^cancell?ed$/
+          || $cgi->param('status') =~ /^cancell?ed$/ ) {
+
+  push @where, FS::cust_pkg->cancelled_sql();
+
+} elsif ( $cgi->param('status') =~ /^(one-time charge|inactive)$/ ) {
+
+  push @where, FS::cust_pkg->inactive_sql();
+
+}
+
+###
+# parse package class
+###
+
+#false lazinessish w/graph/cust_bill_pkg.cgi
+my $classnum = 0;
+my @pkg_class = ();
+if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
+  $classnum = $1;
+  if ( $classnum ) { #a specific class
+    push @where, "classnum = $classnum";
+
+    #@pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) );
+    #die "classnum $classnum not found!" unless $pkg_class[0];
+    #$title .= $pkg_class[0]->classname.' ';
+
+  } elsif ( $classnum eq '' ) { #the empty class
+
+    push @where, "classnum IS NULL";
+    #$title .= 'Empty class ';
+    #@pkg_class = ( '(empty class)' );
+  } elsif ( $classnum eq '0' ) {
+    #@pkg_class = qsearch('pkg_class', {} ); # { 'disabled' => '' } );
+    #push @pkg_class, '(empty class)';
+  } else {
+    die "illegal classnum";
+  }
+}
+#eslaf
+
+###
+# parse magic, legacy, etc.
+###
+
+my $orderby;
 if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   $orderby = 'ORDER BY bill';
 
@@ -23,7 +84,8 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
     #"bill <= $ending",
     "CASE WHEN bill IS NULL THEN 0 ELSE bill END >= $beginning ",
     "CASE WHEN bill IS NULL THEN 0 ELSE bill END <= $ending",
-    '( cancel IS NULL OR cancel = 0 )';
+    #'( cancel IS NULL OR cancel = 0 )'
+  ;
 
 } else {
 
@@ -33,30 +95,6 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 
     $orderby = 'ORDER BY pkgnum';
 
-    if ( $cgi->param('magic') eq 'active' ) {
-
-      #push @where,
-      #  '( susp IS NULL OR susp = 0 )',
-      #  '( cancel IS NULL OR cancel = 0)';
-      push @where, FS::cust_pkg->active_sql();
-
-    } elsif ( $cgi->param('magic') eq 'suspended' ) {
-
-      push @where,
-        'susp IS NOT NULL',
-        'susp != 0',
-        '( cancel IS NULL OR cancel = 0)';
-
-    } elsif ( $cgi->param('magic') =~ /^cancell?ed$/ ) {
-
-      push @where,
-        'cancel IS NOT NULL',
-        'cancel != 0';
-
-    } else {
-      die "guru meditation #420";
-    }
-
     if ( $cgi->param('pkgpart') =~ /^(\d+)$/ ) {
       push @where, "pkgpart = $1";
     }
@@ -84,21 +122,35 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 
 }
 
+##
+# setup queries, links, subs, etc. for the search
+##
+
+# here is the agent virtualization
+push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
 my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';
 
-my $count_query = "SELECT COUNT(*) FROM cust_pkg $cjoin $extra_sql";
+my $addl_from = 'LEFT JOIN cust_main USING ( custnum  ) '.
+                'LEFT JOIN part_pkg  USING ( pkgpart  ) '.
+                'LEFT JOIN pkg_class USING ( classnum ) ';
+
+my $count_query = "SELECT COUNT(*) FROM cust_pkg $addl_from $extra_sql";
 
 my $sql_query = {
   'table'     => 'cust_pkg',
   'hashref'   => {},
   'select'    => join(', ',
                             'cust_pkg.*',
+                            ( map "part_pkg.$_", qw( pkg freq ) ),
+                            'pkg_class.classname',
                             'cust_main.custnum as cust_main_custnum',
-                            FS::UI::Web::cust_sql_fields(),
+                            FS::UI::Web::cust_sql_fields(
+                              $cgi->param('cust_fields')
+                            ),
                  ),
   'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => ' LEFT JOIN cust_main USING ( custnum ) ',
-                 #' LEFT JOIN part_pkg  USING ( pkgpart ) '
+  'addl_from' => $addl_from,
 };
 
 my $link = sub {
@@ -138,6 +190,10 @@ sub time_or_blank {
    };
 }
 
+###
+# and finally, include the search template
+### 
+
 %><%=  include( 'elements/search.html',
                   'title'       => 'Package Search Results', 
                   'name'        => 'packages',
@@ -146,6 +202,7 @@ sub time_or_blank {
                   #'redirect'    => $link,
                   'header'      => [ '#',
                                      'Package',
+                                     'Class',
                                      'Status',
                                      'Freq.',
                                      'Setup',
@@ -154,18 +211,25 @@ sub time_or_blank {
                                      'Susp.',
                                      'Expire',
                                      'Cancel',
-                                     FS::UI::Web::cust_header(),
+                                     FS::UI::Web::cust_header(
+                                       $cgi->param('cust_fields')
+                                     ),
                                      'Services',
                                    ],
                   'fields'      => [
                     'pkgnum',
-                    sub { my $part_pkg = $part_pkg{shift->pkgpart};
-                          $part_pkg->pkg; # ' - '. $part_pkg->comment;
+                    sub { #my $part_pkg = $part_pkg{shift->pkgpart};
+                          #$part_pkg->pkg; # ' - '. $part_pkg->comment;
+                          $_[0]->pkg; # ' - '. $_[0]->comment;
                         },
+                    'classname',
                     sub { ucfirst(shift->status); },
                     sub { #shift->part_pkg->freq_pretty;
-                          my $part_pkg = $part_pkg{shift->pkgpart};
-                          $part_pkg->freq_pretty;
+
+                          #my $part_pkg = $part_pkg{shift->pkgpart};
+                          #$part_pkg->freq_pretty;
+
+                          FS::part_pkg::freq_pretty(shift);
                         },
 
                     #sub { time2str('%b %d %Y', shift->setup); },
@@ -202,6 +266,7 @@ sub time_or_blank {
                         },
                   ],
                   'color' => [
+                    '',
                     '',
                     '',
                     sub { shift->statuscolor; },
@@ -212,12 +277,16 @@ sub time_or_blank {
                     '',
                     '',
                     '',
-                    ( map { '' } FS::UI::Web::cust_header() ),
+                    ( map { '' }
+                          FS::UI::Web::cust_header(
+                                                    $cgi->param('cust_fields')
+                                                  )
+                    ),
                     '',
                   ],
-                  'style' => [ '', '', 'b' ],
-                  'size'  => [ '', '', '-1', ],
-                  'align' => 'rlclrrrrrr',
+                  'style' => [ '', '', '', 'b' ],
+                  'size'  => [ '', '', '', '-1', ],
+                  'align' => 'rllclrrrrrr',
                   'links' => [
                     $link,
                     $link,
@@ -229,7 +298,12 @@ sub time_or_blank {
                     '',
                     '',
                     '',
-                    ( map { $clink } FS::UI::Web::cust_header() ),
+                    '',
+                    ( map { $clink }
+                          FS::UI::Web::cust_header(
+                                                    $cgi->param('cust_fields')
+                                                  )
+                    ),
                     '',
                   ],
               )
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index b14591958..ef68ba05e 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -5,11 +5,9 @@ my $orderby = 'ORDER BY svcnum';
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
 
-my $cjoin = '';
 my @extra_sql = ();
 if ( $query =~ /^UN_(.*)$/ ) {
   $query = $1;
-  $cjoin = 'LEFT JOIN cust_svc USING ( svcnum )';
   push @extra_sql, 'pkgnum IS NULL';
 }
 
@@ -24,7 +22,6 @@ if ( $query eq 'svcnum' ) {
   push @extra_sql, "popnum = $1";
   $orderby = "ORDER BY LOWER(username)";
 } elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
-  $cjoin ||= 'LEFT JOIN cust_svc USING ( svcnum )';
   push @extra_sql, "svcpart = $1";
   $orderby = "ORDER BY uid";
   #$orderby = "ORDER BY svcnum";
@@ -72,12 +69,20 @@ if ( $query eq 'svcnum' ) {
 
 }
 
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
+#here is the agent virtualization
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
 my $extra_sql = 
   scalar(@extra_sql)
     ? ' WHERE '. join(' AND ', @extra_sql )
     : '';
 
-my $count_query = "SELECT COUNT(*) FROM svc_acct $cjoin $extra_sql";
+my $count_query = "SELECT COUNT(*) FROM svc_acct $addl_from $extra_sql";
 #if ( keys %svc_acct ) {
 #  $count_query .= ' WHERE '.
 #                    join(' AND ', map "$_ = ". dbh->quote($svc_acct{$_}),
@@ -94,10 +99,7 @@ my $sql_query = {
                     FS::UI::Web::cust_sql_fields(),
                   ),
   'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                 ' LEFT JOIN part_svc  USING ( svcpart ) '.
-                 ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                 ' LEFT JOIN cust_main USING ( custnum ) ',
+  'addl_from' => $addl_from,
 };
 
 my $link      = [ "${p}view/svc_acct.cgi?",   'svcnum'  ];
@@ -117,21 +119,21 @@ my $link_cust = sub {
                  'count_query' => $count_query,
                  'redirect'    => $link,
                  'header'      => [ '#',
+                                    'Service',
                                     'Account',
                                     'UID',
-                                    'Service',
                                     FS::UI::Web::cust_header(),
                                   ],
                  'fields'      => [ 'svcnum',
+                                    'svc',
                                     'email',
                                     'uid',
-                                    'svc',
                                     \&FS::UI::Web::cust_fields,
                                   ],
                  'links'       => [ $link,
                                     $link,
                                     $link,
-                                    '',
+                                    $link,
                                     ( map { $link_cust }
                                           FS::UI::Web::cust_header()
                                     ),
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index b02eea8bd..1eda3733c 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -6,38 +6,50 @@ my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
 
 my $orderby = 'ORDER BY svcnum';
-my $join = '';
 my %svc_domain = ();
-my $extra_sql = '';
+my @extra_sql = ();
 if ( $query eq 'svcnum' ) {
   #$orderby = 'ORDER BY svcnum';
 } elsif ( $query eq 'domain' ) {
   $orderby = 'ORDER BY domain';
-} elsif ( $query eq 'UN_svcnum' ) {
+} elsif ( $query eq 'UN_svcnum' ) { #UN searches need to be acl'ed (and need to
+                                    #fix $agentnums_sql
   #$orderby = 'ORDER BY svcnum';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = ' WHERE pkgnum IS NULL';
-} elsif ( $query eq 'UN_domain' ) {
+  push @extra_sql, 'pkgnum IS NULL';
+} elsif ( $query eq 'UN_domain' ) { #UN searches need to be acl'ed (and need to
+                                    #fix $agentnums_sql
   $orderby = 'ORDER BY domain';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = ' WHERE pkgnum IS NULL';
+  push @extra_sql, 'pkgnum IS NULL';
 } elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
   #$orderby = 'ORDER BY svcnum';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = " WHERE svcpart = $1";
+  push @extra_sql, "svcpart = $1";
 } else {
   $cgi->param('domain') =~ /^([\w\-\.]+)$/; 
-  $join = '';
   $svc_domain{'domain'} = $1;
 }
 
-my $count_query = "SELECT COUNT(*) FROM svc_domain $join $extra_sql";
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
+#here is the agent virtualization
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+my $extra_sql = '';
+if ( @extra_sql ) {
+  $extra_sql = ( keys(%svc_domain) ? ' AND ' : ' WHERE ' ).
+               join(' AND ', @extra_sql );
+}
+
+my $count_query = "SELECT COUNT(*) FROM svc_domain $addl_from ";
 if ( keys %svc_domain ) {
   $count_query .= ' WHERE '.
                     join(' AND ', map "$_ = ". dbh->quote($svc_domain{$_}),
                                       keys %svc_domain
                         );
 }
+$count_query .= $extra_sql;
 
 my $sql_query = {
   'table'     => 'svc_domain',
@@ -48,9 +60,7 @@ my $sql_query = {
                     FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                 'LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                 'LEFT JOIN cust_main USING ( custnum ) ',
+  'addl_from' => $addl_from,
 };
 
 my $link = [ "${p}view/svc_domain.cgi?", 'svcnum' ];
@@ -68,14 +78,17 @@ my $link_cust = sub {
                  'count_query'       => $count_query,
                  'redirect'          => $link,
                  'header'            => [ '#',
+                                          'Service',
                                           'Domain',
                                           FS::UI::Web::cust_header(),
                                         ],
                  'fields'            => [ 'svcnum',
+                                          'svc',
                                           'domain',
                                           \&FS::UI::Web::cust_fields,
                                         ],
                  'links'             => [ $link,
+                                          $link,
                                           $link,
                                           ( map { $link_cust }
                                                 FS::UI::Web::cust_header()
diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
index a204e345f..4961967d7 100755
--- a/httemplate/search/svc_forward.cgi
+++ b/httemplate/search/svc_forward.cgi
@@ -5,14 +5,12 @@ my $conf = new FS::Conf;
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
 
-
 my $orderby;
 
-my $cjoin = '';
 my @extra_sql = ();
-if ( $query =~ /^UN_(.*)$/ ) {
+if ( $query =~ /^UN_(.*)$/ ) { #UN searches need to be acl'ed (and need to
+                                    #fix $agentnums_sql
   $query = $1;
-  $cjoin = 'LEFT JOIN cust_svc USING ( svcnum )';
   push @extra_sql, 'pkgnum IS NULL';
 }
 
@@ -22,12 +20,20 @@ if ( $query eq 'svcnum' ) {
   eidiot('unimplemented');
 }
 
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
+#here is the agent virtualization
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
 my $extra_sql = 
   scalar(@extra_sql)
     ? ' WHERE '. join(' AND ', @extra_sql )
     : '';
 
-my $count_query = "SELECT COUNT(*) FROM svc_forward $cjoin $extra_sql";
+my $count_query = "SELECT COUNT(*) FROM svc_forward $addl_from $extra_sql";
 my $sql_query = {
   'table'     => 'svc_forward',
   'hashref'   => {},
@@ -37,10 +43,7 @@ my $sql_query = {
                     FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                 ' LEFT JOIN part_svc  USING ( svcpart ) '.
-                 ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                 ' LEFT JOIN cust_main USING ( custnum ) ',
+  'addl_from' => $addl_from,
 };
 
 #        <TH>Service #<BR><FONT SIZE=-1>(click to view forward)</FONT></TH>
@@ -100,16 +103,19 @@ my $link_cust = sub {
                  'count_query'       => $count_query,
                  'redirect'          => $link,
                  'header'            => [ '#',
+                                          'Service',
                                           'Mail to',
                                           'Forwards to',
                                           FS::UI::Web::cust_header(),
                                         ],
                  'fields'            => [ 'svcnum',
+                                          'svc',
                                           $format_src,
                                           $format_dst,
                                           \&FS::UI::Web::cust_fields,
                                         ],
                  'links'             => [ $link,
+                                          $link,
                                           $link_src,
                                           $link_dst,
                                           ( map { $link_cust }
-- 
cgit v1.2.1


From a59c9cdd72fdf85d81007ba86e81479f6ec8e6e5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jun 2006 06:03:18 +0000
Subject: fix up the alternating colors on the customer search results

---
 httemplate/search/cust_main.cgi | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 5b7ccec1c..7d5941a16 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -473,6 +473,7 @@ END
       my $rowspan = scalar(@cust_svc) || 1;
 
       print $n1, qq!<TD CLASS="grid" BGCOLOR="$bgcolor"  ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
+
       my($n2)='';
       foreach my $cust_svc ( @cust_svc ) {
          my($label, $value, $svcdb) = $cust_svc->label;
@@ -482,9 +483,19 @@ END
                qq!<TD CLASS="grid" BGCOLOR="$bgcolor" ><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
          $n2="</TR><TR>";
       }
+
+      unless ( @cust_svc ) {
+        print qq!<TD CLASS="grid" BGCOLOR="$bgcolor" COLSPAN=2>&nbsp;</TD>!;
+      }
+
       #print qq!</TR><TR>\n!;
       $n1="</TR><TR>";
     }
+
+    unless ( @{$all_pkgs{$custnum}} ) {
+      print qq!<TD CLASS="grid" BGCOLOR="$bgcolor" COLSPAN=3>&nbsp;</TD>!;
+    }
+    
     print "</TR>";
   }
 
-- 
cgit v1.2.1


From 6b12c14cc10503d6b0783e8ef71fe44d9a9b37b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jun 2006 08:05:28 +0000
Subject: add ability to select specific package defs. and package status to
 package report for qis

---
 FS/FS/Conf.pm                                      |  29 +++--
 FS/FS/ConfDefaults.pm                              |  68 +++++++++++
 FS/FS/UI/Web.pm                                    | 126 ++++++++++++++-------
 FS/FS/cust_main_Mixin.pm                           |  44 +++++++
 FS/FS/cust_pkg.pm                                  |  76 ++++++++++---
 httemplate/config/config.cgi                       |  72 +++++++++---
 httemplate/elements/menu.html                      |   4 +-
 httemplate/elements/select-cust-fields.html        |  23 ++++
 httemplate/elements/select-cust_pkg-status.html    |  19 ++++
 httemplate/elements/tr-select-cust-fields.html     |  14 +++
 httemplate/elements/tr-select-cust_pkg-status.html |  13 +++
 httemplate/graph/cust_bill_pkg.cgi                 |   2 +
 httemplate/search/cust_pkg_report.cgi              |  22 ----
 httemplate/search/report_cust_pkg.html             |  47 ++++++++
 httemplate/view/cust_main/contacts.html            |   2 +-
 15 files changed, 457 insertions(+), 104 deletions(-)
 create mode 100644 FS/FS/ConfDefaults.pm
 create mode 100644 httemplate/elements/select-cust-fields.html
 create mode 100644 httemplate/elements/select-cust_pkg-status.html
 create mode 100644 httemplate/elements/tr-select-cust-fields.html
 create mode 100644 httemplate/elements/tr-select-cust_pkg-status.html
 delete mode 100755 httemplate/search/cust_pkg_report.cgi
 create mode 100755 httemplate/search/report_cust_pkg.html

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e7b9fa556..57c18e678 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4,6 +4,7 @@ use vars qw($default_dir @config_items $DEBUG );
 use IO::File;
 use File::Basename;
 use FS::ConfItem;
+use FS::ConfDefaults;
 
 $DEBUG = 0;
 
@@ -1619,18 +1620,9 @@ httemplate/docs/config.html
   {
     'key'         => 'cust-fields',
     'section'     => 'UI',
-    'description' => 'Which customer fields to display on reports',
+    'description' => 'Which customer fields to display on reports by default',
     'type'        => 'select',
-    'select_enum' => [
-      'Customer: Last, First</b> or</i> Company (Last, First)</b>',
-      'Cust# | Customer: custnum | Last, First or Company (Last, First)',
-      'Name | Company: Last, First | Company',
-      'Cust# | Name | Company: custnum | Last, First | Company',
-      '(bill) Customer | (service) Customer: Last, First or Company (Last, First) | (same for service address if present)',
-      'Cust# | (bill) Customer | (service) Customer:  custnum | Last, First or Company (Last, First) | (same for service address if present)',
-      '(bill) Name | (bill) Company | (service) Name | (service) Company: Last, First | Company | (same for service address if present)',
-      'Cust# | (bill) Name | (bill) Company | (service) Name | (service) Company: custnum | Last, First | Company | (same for service address if present)',
-    ],
+    'select_hash' => [ FS::ConfDefaults->cust_fields_avail() ],
   },
 
   {
@@ -1709,6 +1701,21 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'batch-default_format',
+    'section'     => 'billing',
+    'description' => 'Default format for batches.',
+    'type'        => 'select',
+    'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', 'BoM' ]
+  },
+
+  {
+    'key'         => 'batchconfig-BoM',
+    'section'     => 'billing',
+    'description' => 'Configuration for Bank of Montreal batching, seven lines: 1. Origin ID, 2. Datacenter, 3. Typecode, 4. Short name, 5. Long name, 6. Bank, 7. Bank account',
+    'type'        => 'textarea',
+  },
+
 );
 
 1;
diff --git a/FS/FS/ConfDefaults.pm b/FS/FS/ConfDefaults.pm
new file mode 100644
index 000000000..b9cbcfbdf
--- /dev/null
+++ b/FS/FS/ConfDefaults.pm
@@ -0,0 +1,68 @@
+package FS::ConfDefaults;
+
+=head1 NAME
+
+FS::ConfDefaults - Freeside configuration default and available values
+
+=head1 SYNOPSIS
+
+  use FS::ConfDefaults;
+
+  @avail_cust_fields = FS::ConfDefaults->cust_fields_avail();
+
+=head1 DESCRIPTION
+
+Just a small class to keep config default and available values
+
+=head1 METHODS
+
+=over 4
+
+=item cust_fields_avail
+
+Returns a list, suitable for assigning to a hash, of available values and
+labels for customer fields values.
+
+=cut
+
+# XXX should use msgcat for "Day phone" and "Night phone", but how?
+sub cust_fields_avail { (
+
+  'Customer' =>
+    'Last, First or Company (Last, First)',
+  'Cust# | Customer' =>
+    'custnum | Last, First or Company (Last, First)',
+
+  'Name | Company' =>
+    'Last, First | Company',
+  'Cust# | Name | Company' =>
+    'custnum | Last, First | Company',
+
+  '(bill) Customer | (service) Customer' =>
+    'Last, First or Company (Last, First) | (same for service contact if present)',
+  'Cust# | (bill) Customer | (service) Customer' =>
+    'custnum | Last, First or Company (Last, First) | (same for service contact if present)',
+
+  '(bill) Name | (bill) Company | (service) Name | (service) Company' =>
+    'Last, First | Company | (same for service address if present)',
+  'Cust# | (bill) Name | (bill) Company | (service) Name | (service) Company' =>
+    'custnum | Last, First | Company | (same for service address if present)',
+
+  'Cust# | Name | Company | Address 1 | Address 2 | City | State | Zip | Country | Day phone | Night phone | Invoicing email(s)' => 
+    'custnum | Last, First | Company | (all address fields ) | Day phone | Night phone | Invoicing email(s)',
+
+); }
+
+=back
+
+=head1 BUGS
+
+Not yet.
+
+=head1 SEE ALSO
+
+L<FS::Conf>
+
+=cut
+
+1;
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index 10ddbf33f..080ac6e64 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -8,6 +8,8 @@ use FS::Record qw(dbdef);
 #use FS::UI
 #@ISA = qw( FS::UI );
 
+$DEBUG = 0;
+
 use Date::Parse;
 sub parse_beginning_ending {
   my($cgi) = @_;
@@ -31,73 +33,116 @@ sub parse_beginning_ending {
 }
 
 ###
-# cust_main report methods
+# cust_main report subroutines
 ###
 
-=item cust_header
 
-Returns an array of customer information headers according to the
-B<cust-fields> configuration setting.
+=item cust_header [ CUST_FIELDS_VALUE ]
+
+Returns an array of customer information headers according to the supplied
+customer fields value, or if no value is supplied, the B<cust-fields>
+configuration value.
 
 =cut
 
 use vars qw( @cust_fields );
 
-sub cust_sql_fields {
-  my @fields = qw( last first company );
-  push @fields, map "ship_$_", @fields
-    if dbdef->table('cust_main')->column('ship_last');
-  map "cust_main.$_", @fields;
-}
-
 sub cust_header {
 
   warn "FS::svc_Common::cust_header called"
     if $DEBUG;
 
-  my $conf = new FS::Conf;
-
   my %header2method = (
-    'Customer'           => 'name',
-    'Cust#'              => 'custnum',
-    'Name'               => 'contact',
-    'Company'            => 'company',
-    '(bill) Customer'    => 'name',
-    '(service) Customer' => 'ship_name',
-    '(bill) Name'        => 'contact',
-    '(service) Name'     => 'ship_contact',
-    '(bill) Company'     => 'company',
-    '(service) Company'  => 'ship_company',
+    'Customer'                 => 'name',
+    'Cust#'                    => 'custnum',
+    'Name'                     => 'contact',
+    'Company'                  => 'company',
+    '(bill) Customer'          => 'name',
+    '(service) Customer'       => 'ship_name',
+    '(bill) Name'              => 'contact',
+    '(service) Name'           => 'ship_contact',
+    '(bill) Company'           => 'company',
+    '(service) Company'        => 'ship_company',
+    'Address 1'                => 'address1',
+    'Address 2'                => 'address2',
+    'City'                     => 'city',
+    'State'                    => 'state',
+    'Zip'                      => 'zip',
+    'Country'                  => 'country_full',
+    'Day phone'                => 'daytime', # XXX should use msgcat, but how?
+    'Night phone'              => 'night',   # XXX should use msgcat, but how?
+    'Invoicing email(s)'       => 'invoicing_list_emailonly',
   );
 
+  my $cust_fields;
   my @cust_header;
-  if (    $conf->exists('cust-fields')
-       && $conf->config('cust-fields') =~ /^([\w \|\#\(\)]+):/
-     )
-  {
-    warn "  found cust-fields configuration value"
-      if $DEBUG;
+  if ( @_ && $_[0] ) {
 
-    my $cust_fields = $1;
-     @cust_header = split(/ \| /, $cust_fields);
-     @cust_fields = map { $header2method{$_} } @cust_header;
-  } else { 
-    warn "  no cust-fields configuration value found; using default 'Customer'"
+    warn "  using supplied cust-fields override".
+          " (ignoring cust-fields config file)"
       if $DEBUG;
-    @cust_header = ( 'Customer' );
-    @cust_fields = ( 'name' );
+    $cust_fields = shift;
+
+  } else {
+
+    my $conf = new FS::Conf;
+    if (    $conf->exists('cust-fields')
+         && $conf->config('cust-fields') =~ /^([\w \|\#\(\)]+):?/
+       )
+    {
+      warn "  found cust-fields configuration value"
+        if $DEBUG;
+      $cust_fields = $1;
+    } else { 
+      warn "  no cust-fields configuration value found; using default 'Customer'"
+        if $DEBUG;
+      $cust_fields = 'Customer';
+    }
+  
   }
 
+  @cust_header = split(/ \| /, $cust_fields);
+  @cust_fields = map { $header2method{$_} } @cust_header;
+
   #my $svc_x = shift;
   @cust_header;
 }
 
-=item cust_fields
+=item cust_sql_fields [ CUST_FIELDS_VALUE ]
+
+Returns a list of fields for the SELECT portion of an SQL query.
+
+As with L<the cust_header subroutine|/cust_header>, the fields returned are
+defined by the supplied customer fields setting, or if no customer fields
+setting is supplied, the <B>cust-fields</B> configuration value. 
+
+=cut
+
+sub cust_sql_fields {
+
+  my @fields = qw( last first company );
+  push @fields, map "ship_$_", @fields;
+  push @fields, 'country';
+
+  cust_header(@_);
+  #inefficientish, but tiny lists and only run once per page
+  push @fields,
+    grep { my $field = $_; grep { $_ eq $field } @cust_fields }
+         qw( address1 address2 city state zip daytime night );
+
+  map "cust_main.$_", @fields;
+}
+
+=item cust_fields SVC_OBJECT [ CUST_FIELDS_VALUE ]
 
 Given a svc_ object that contains fields from cust_main (say, from a
 JOINed search.  See httemplate/search/svc_* for examples), returns an array
-of customer information according to the <B>cust-fields</B> configuration
-setting, or "(unlinked)" if this service is not linked to a customer.
+of customer information, or "(unlinked)" if this service is not linked to a
+customer.
+
+As with L<the cust_header subroutine|/cust_header>, the fields returned are
+defined by the supplied customer fields setting, or if no customer fields
+setting is supplied, the <B>cust-fields</B> configuration value. 
 
 =cut
 
@@ -107,7 +152,8 @@ sub cust_fields {
        "(cust_fields: @cust_fields)"
     if $DEBUG > 1;
 
-  cust_header() unless @cust_fields;
+  #cust_header(@_) unless @cust_fields; #now need to cache to keep cust_fields
+  #                                     #override incase we were passed as a sub
 
   my $seen_unlinked = 0;
   map { 
diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm
index a114c5a8a..aa4143df1 100644
--- a/FS/FS/cust_main_Mixin.pm
+++ b/FS/FS/cust_main_Mixin.pm
@@ -89,6 +89,50 @@ sub ship_contact {
     : $self->cust_unlinked_msg;
 }
 
+=item country_full
+
+Given an object that contains fields from cust_main (say, from a JOINed
+search; see httemplate/search/ for examples), returns the equivalent of the
+FS::cust_main I<country_full> method, or "(unlinked)" if this object is not
+linked to a customer.
+
+=cut
+
+sub country_full {
+  my $self = shift;
+  $self->cust_linked
+    ? FS::cust_main::country_full($self)
+    : $self->cust_unlinked_msg;
+}
+
+=item invoicing_list_emailonly
+
+Given an object that contains fields from cust_main (say, from a JOINed
+search; see httemplate/search/ for examples), returns the equivalent of the
+FS::cust_main I<country_full> method, or "(unlinked)" if this object is not
+linked to a customer.
+
+=cut
+
+sub invoicing_list_emailonly {
+  my $self = shift;
+  warn "invoicing_list_email only called on $self, ".
+       "custnum ". $self->custnum. "\n";
+  $self->cust_linked
+    ? FS::cust_main::invoicing_list_emailonly($self)
+    : $self->cust_unlinked_msg;
+}
+
+#read-only
+sub invoicing_list {
+  my $self = shift;
+  $self->cust_linked
+    ? FS::cust_main::invoicing_list($self)
+    : ();
+}
+
+=cut
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 783cc73a3..ed9f2cbc6 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2,6 +2,7 @@ package FS::cust_pkg;
 
 use strict;
 use vars qw(@ISA $disable_agentcheck @SVCDB_CANCEL_SEQ $DEBUG);
+use Tie::IxHash;
 use FS::UID qw( getotaker dbh );
 use FS::Misc qw( send_email );
 use FS::Record qw( qsearch qsearchs );
@@ -824,26 +825,45 @@ Returns a short status string for this package, currently:
 sub status {
   my $self = shift;
 
+  my $freq = length($self->freq) ? $self->freq : $self->part_pkg->freq;
+
   return 'cancelled' if $self->get('cancel');
   return 'suspended' if $self->susp;
   return 'not yet billed' unless $self->setup;
-  return 'one-time charge' if $self->part_pkg->freq =~ /^(0|$)/;
+  return 'one-time charge' if $freq =~ /^(0|$)/;
   return 'active';
 }
 
-=item statuscolor
+=item statuses
 
-Returns a hex triplet color string for this package's status.
+Class method that returns the list of possible status strings for pacakges
+(see L<the status method|/status>).  For example:
+
+  @statuses = FS::cust_pkg->statuses();
 
 =cut
 
-my %statuscolor = (
+tie my %statuscolor, 'Tie::IxHash', 
   'not yet billed'  => '000000',
   'one-time charge' => '000000',
   'active'          => '00CC00',
   'suspended'       => 'FF9900',
   'cancelled'       => 'FF0000',
-);
+;
+
+sub statuses {
+  my $self = shift; #could be class...
+  grep { $_ !~ /^(not yet billed)$/ } #this is a dumb status anyway
+                                      # mayble split btw one-time vs. recur
+    keys %statuscolor;
+}
+
+=item statuscolor
+
+Returns a hex triplet color string for this package's status.
+
+=cut
+
 sub statuscolor {
   my $self = shift;
   $statuscolor{$self->status};
@@ -1163,7 +1183,7 @@ sub reexport {
 
 =back
 
-=head1 CLASS METHOD
+=head1 CLASS METHODS
 
 =over 4
 
@@ -1178,6 +1198,17 @@ sub recurring_sql { "
              where cust_pkg.pkgpart = part_pkg.pkgpart )
 "; }
 
+=item onetime_sql
+
+Returns an SQL expression identifying one-time packages.
+
+=cut
+
+sub onetime_sql { "
+  '0' = ( select freq from part_pkg
+            where cust_pkg.pkgpart = part_pkg.pkgpart )
+"; }
+
 =item active_sql
 
 Returns an SQL expression identifying active packages.
@@ -1190,6 +1221,19 @@ sub active_sql { "
   AND ( cust_pkg.susp   IS NULL OR cust_pkg.susp   = 0 )
 "; }
 
+=item inactive_sql
+
+Returns an SQL expression identifying inactive packages (one-time packages
+that are otherwise unsuspended/uncancelled).
+
+=cut
+
+sub inactive_sql { "
+  ". $_[0]->onetime_sql(). "
+  AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
+  AND ( cust_pkg.susp   IS NULL OR cust_pkg.susp   = 0 )
+"; }
+
 =item susp_sql
 =item suspended_sql
 
@@ -1198,11 +1242,13 @@ Returns an SQL expression identifying suspended packages.
 =cut
 
 sub suspended_sql { susp_sql(@_); }
-sub susp_sql { "
-  ". $_[0]->recurring_sql(). "
-  AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-  AND cust_pkg.susp IS NOT NULL AND cust_pkg.susp != 0
-"; }
+sub susp_sql {
+  #$_[0]->recurring_sql(). ' AND '.
+  "
+        ( cust_pkg.cancel IS     NULL  OR cust_pkg.cancel = 0 )
+    AND   cust_pkg.susp   IS NOT NULL AND cust_pkg.susp  != 0
+  ";
+}
 
 =item cancel_sql
 =item cancelled_sql
@@ -1212,10 +1258,10 @@ Returns an SQL exprression identifying cancelled packages.
 =cut
 
 sub cancelled_sql { cancel_sql(@_); }
-sub cancel_sql { "
-  ". $_[0]->recurring_sql(). "
-  AND cust_pkg.cancel IS NOT NULL AND cust_pkg.cancel != 0
-"; }
+sub cancel_sql { 
+  #$_[0]->recurring_sql(). ' AND '.
+  "cust_pkg.cancel IS NOT NULL AND cust_pkg.cancel != 0";
+}
 
 =head1 SUBROUTINES
 
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 21f79a9dc..6008c0e42 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -55,25 +55,65 @@ function SafeOnsubmit() {
              #warn $i->key unless defined($type);
         %>
           <% if ( $type eq '' ) { %>
-            <font color="#ff0000">no type</font>
+
+               <font color="#ff0000">no type</font>
+
           <% } elsif ( $type eq 'textarea' ) { %>
-            <textarea name="<%= $i->key. $n %>" rows=5><%= "\n". join("\n", $conf->config($i->key) ) %></textarea>
+
+               <textarea name="<%= $i->key. $n %>" rows=5><%= "\n". join("\n", $conf->config($i->key) ) %></textarea>
+
           <% } elsif ( $type eq 'checkbox' ) { %>
-            <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
+
+               <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
+
           <% } elsif ( $type eq 'text' )  { %>
-            <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
+
+               <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
+
           <% } elsif ( $type eq 'select' || $type eq 'selectmultiple' )  { %>
-            <select name="<%= $i->key. $n %>" <%= $type eq 'selectmultiple' ? 'MULTIPLE' : '' %>>
-              <% my %saw;
-                 foreach my $value ( "", @{$i->select_enum} ) {
-                    local($^W)=0; next if $saw{$value}++; %>
-                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) || ( $type eq 'selectmultiple' && grep { $_ eq $value } $conf->config($i->key) ) ? ' SELECTED' : '' %>><%= $value %>
-              <% } %>
-              <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
-                <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>
+          
+               <select name="<%= $i->key. $n %>" <%= $type eq 'selectmultiple' ? 'MULTIPLE' : '' %>>
+               <% 
+                  my %hash = ();
+                  if ( $i->select_enum ) {
+                    tie %hash, 'Tie::IxHash',
+                      '' => '', map { $_ => $_ } @{ $i->select_enum };
+                  } elsif ( $i->select_hash ) {
+                    if ( ref($i->select_hash) eq 'ARRAY' ) {
+                      tie %hash, 'Tie::IxHash',
+                        '' => '', @{ $i->select_hash };
+                    } else {
+                      tie %hash, 'Tie::IxHash',
+                        '' => '', %{ $i->select_hash };
+                    }
+                  } else {
+                    %hash = ( '' => 'WARNING: neither select_enum nor select_hash specified in Conf.pm for configuration option "'. $i->key. '"' );
+                  }
+
+                  my %saw = ();
+                  foreach my $value ( keys %hash ) {
+                    local($^W)=0; next if $saw{$value}++;
+                    my $label = $hash{$value};
+               %>
+
+                    <option value="<%= $value %>"<%= $value eq $conf->config($i->key) || ( $type eq 'selectmultiple' && grep { $_ eq $value } $conf->config($i->key) ) ? ' SELECTED' : '' %>><%= $label %>
+
+               <% } %>
+
+              <% my $curvalue = $conf->config($i->key);
+                 if ( $conf->exists($i->key) && $curvalue
+                      && ! grep { $curvalue eq $_ } @{$i->select_enum}
+                    ) {
+              %>
+              
+                   <option value="<%= $conf->config($i->key) %>" SELECTED><%= exists( $hash{ $conf->config($i->key) } ) ? $hash{ $conf->config($i->key) } : $conf->config($i->key) %>
+
               <% } %>
+
             </select>
+
           <% } elsif ( $type eq 'select-sub' ) { %>
+
             <select name="<%= $i->key. $n %>">
               <option value="">
               <% my %options = &{$i->options_sub};
@@ -88,7 +128,9 @@ function SafeOnsubmit() {
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>: <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
               <% } %>
             </select>
-          <% } elsif ( $type eq 'editlist' )  { %>
+
+          <% } elsif ( $type eq 'editlist' ) { %>
+
             <script>
               function doremove<%= $i->key. $n %>() {
                 fromObject = document.OneTrueForm.<%= $i->key. $n %>;
@@ -167,9 +209,13 @@ function SafeOnsubmit() {
             <% } %>
             <td><input type="button" value="add" onClick="doadd<%= $i->key. $n %>(this.form)"></td>
             </tr></table>
+
           <% } else { %>
+
             <font color="#ff0000">unknown type <%= $type %></font>
+
           <% } %>
+
         <% $n++; } %>
       </td>
       <td><a name="<%= $i->key %>">
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index c09fcee8c..8da197f34 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -85,7 +85,7 @@
     'All customer packages' => [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ],
     'Suspended customer packages' => [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ],
     'Customer packages with unconfigured services' => [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ],
-    'By next bill date' => [ $fsurl.'search/cust_pkg_report.cgi', 'Search packages by next bill date' ],
+    'Advanced package reports' => [ $fsurl.'search/report_cust_pkg.html', 'by agent, date range, status, package definition' ],
   ;
 
   tie my %report_financial, 'Tie::IxHash', 
@@ -264,7 +264,7 @@
 
        if ( ref($url_or_submenu) ) {
 
-         warn $item;
+         #warn $item;
 
          my( $subhtml, $submenuname ) = submenu($url_or_submenu, $item);
 
diff --git a/httemplate/elements/select-cust-fields.html b/httemplate/elements/select-cust-fields.html
new file mode 100644
index 000000000..4d47fbe40
--- /dev/null
+++ b/httemplate/elements/select-cust-fields.html
@@ -0,0 +1,23 @@
+<%
+  my( $cust_fields, %opt ) = @_;
+
+  use FS::ConfDefaults;
+  $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];
+
+  tie my %hash, 'Tie::IxHash', @{ $opt{'avail_fields'} };
+
+%>
+
+<SELECT NAME="cust_fields">
+
+  <OPTION VALUE="">(configured default)
+
+  <% 
+     foreach my $value ( keys %hash ) { %>
+
+       <OPTION VALUE="<%= $value %>"><%= $hash{$value} %>
+
+  <% } %>
+
+</SELECT>
+
diff --git a/httemplate/elements/select-cust_pkg-status.html b/httemplate/elements/select-cust_pkg-status.html
new file mode 100644
index 000000000..5da93fe79
--- /dev/null
+++ b/httemplate/elements/select-cust_pkg-status.html
@@ -0,0 +1,19 @@
+<%
+  my( $status, %opt ) = @_;
+
+  $opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )
+
+%>
+
+<SELECT NAME="status">
+
+  <OPTION VALUE="">all
+
+  <% foreach my $status ( @{ $opt{'statuses'} } ) { %>
+
+       <OPTION VALUE="<%= $status %>"><%= $status %>
+
+  <% } %>
+
+</SELECT>
+
diff --git a/httemplate/elements/tr-select-cust-fields.html b/httemplate/elements/tr-select-cust-fields.html
new file mode 100644
index 000000000..ca37e4276
--- /dev/null
+++ b/httemplate/elements/tr-select-cust-fields.html
@@ -0,0 +1,14 @@
+<%
+  my( $cust_fields, %opt ) = @_;
+
+  use FS::ConfDefaults;
+  $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];
+
+%>
+
+<TR>
+  <TD ALIGN="right"><%= $opt{'label'} || 'Customer fields' %></TD>
+  <TD>
+    <%= include( '/elements/select-cust-fields.html', $cust_fields, %opt ) %>
+  </TD>
+</TR>
diff --git a/httemplate/elements/tr-select-cust_pkg-status.html b/httemplate/elements/tr-select-cust_pkg-status.html
new file mode 100644
index 000000000..17768517d
--- /dev/null
+++ b/httemplate/elements/tr-select-cust_pkg-status.html
@@ -0,0 +1,13 @@
+<%
+  my( $status, %opt ) = @_;
+
+  $opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )
+
+%>
+
+<TR>
+  <TD ALIGN="right"><%= $opt{'label'} || 'Status' %></TD>
+  <TD>
+    <%= include( '/elements/select-cust_pkg-status.html', $status, %opt ) %>
+  </TD>
+</TR>
diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi
index cb8225516..acd39b025 100644
--- a/httemplate/graph/cust_bill_pkg.cgi
+++ b/httemplate/graph/cust_bill_pkg.cgi
@@ -18,6 +18,7 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
 }
 my $title = $sel_agent ? $sel_agent->agent.' ' : '';
 
+#false lazinessish w/search/cust_pkg.cgi
 my $classnum = 0;
 my @pkg_class = ();
 if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
@@ -34,6 +35,7 @@ if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
     push @pkg_class, '(empty class)';
   }
 }
+#eslaf
 
 my $hue = 0;
 #my $hue_increment = 170;
diff --git a/httemplate/search/cust_pkg_report.cgi b/httemplate/search/cust_pkg_report.cgi
deleted file mode 100755
index d9aada5f4..000000000
--- a/httemplate/search/cust_pkg_report.cgi
+++ /dev/null
@@ -1,22 +0,0 @@
-<%= include('/elements/header.html', 'Packages' ) %>
-
-<FORM ACTION="cust_pkg.cgi" METHOD="GET">
-<INPUT TYPE="hidden" NAME="magic" VALUE="bill">
-
-Return packages with next bill date:
-<BR><BR>
-
-  <TABLE>
-    <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-    <%= include( '/elements/tr-select-agent.html',
-                   $cgi->param('agentnum'),
-               )
-    %>
-  </TABLE>
-
-<BR>
-<INPUT TYPE="submit" VALUE="Get Report">
-
-</FORM>
-
-<%= include('/elements/footer.html') %>
diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html
new file mode 100755
index 000000000..98e91217f
--- /dev/null
+++ b/httemplate/search/report_cust_pkg.html
@@ -0,0 +1,47 @@
+<%= include('/elements/header.html', 'Package Report' ) %>
+
+<FORM ACTION="cust_pkg.cgi" METHOD="GET">
+<INPUT TYPE="hidden" NAME="magic" VALUE="bill">
+
+  <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+
+    <TR>
+      <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Search options</FONT></TH>
+    </TR>
+    <%= include( '/elements/tr-select-agent.html',
+                   $cgi->param('agentnum'),
+               )
+    %>
+    <%= include( '/elements/tr-select-cust_pkg-status.html' ) %>
+    <%= include( '/elements/tr-select-pkg_class.html', '',
+                   'pre_options' => [ '0' => 'all' ],
+                   'empty_label' => '(empty class)',
+               )
+    %>
+    <% #include( '/elements/tr-selectmultiple-part_pkg.html' ) %>
+    <TR>
+      <TD ALIGN="right" VALIGN="center">Next bill date</TD>
+      <TD>
+        <TABLE>
+          <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+        </TABLE>
+      </TD>
+    </TR>
+    
+    <TR>
+      <TH BGCOLOR="#e8e8e8" COLSPAN=2>&nbsp;</TH>
+    </TR>
+
+    <TR>
+      <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Display options</FONT></TH>
+    </TR>
+    <%= include( '/elements/tr-select-cust-fields.html' ) %>
+    
+  </TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 7aba11813..48371550b 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -114,7 +114,7 @@ Service address
 </TR>
 <TR>
   <TD ALIGN="right">Country</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->get("${pre}country") %></TD>
+  <TD BGCOLOR="#ffffff"><%= code2country( $cust_main->get("${pre}country") ) %></TD>
 </TR>
 <TR>
   <TD ALIGN="right"><%= $daytime_label %></TD>
-- 
cgit v1.2.1


From 41a6a1b1811e337be2fca47504ff9687b6b46cf8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jun 2006 11:25:14 +0000
Subject: ACLs, take three or four or something

---
 FS/FS/AccessRight.pm                           | 42 +++++++++--
 FS/FS/access_user.pm                           | 23 ++++++
 FS/FS/cust_main.pm                             | 18 +++--
 httemplate/elements/menu.html                  | 99 +++++++++++++++-----------
 httemplate/view/cust_main.cgi                  | 55 +++++++-------
 httemplate/view/cust_main/packages.html        | 91 ++++++++++++++++++-----
 httemplate/view/cust_main/payment_history.html | 78 +++++++++++++++-----
 7 files changed, 296 insertions(+), 110 deletions(-)

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 5229e1e65..f04779a07 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -84,10 +84,13 @@ assigned to users and/or groups.
   #'View Customer | View tickets',
   'Edit customer',
   'Cancel customer',
-  'Delete customer',
+  'Complimentary customer', #aka users-allow_comp 
+  'Delete customer', #aka. deletecustomers #Enable customer deletions. Be very careful! Deleting a customer will remove all traces that this customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customers' packages if they cancel service.
 
   'Order customer package',
+  'One-time charge',
   'Change customer package',
+  'Bulk change customer packages',
   'Edit customer package dates',
   'Customize customer package',
   'Suspend customer package',
@@ -95,14 +98,43 @@ assigned to users and/or groups.
   'Cancel customer package immediately',
   'Cancel customer package later',
 
-  'Provision service',
-  'Unprovision service',
-  #legacy link stuff
+  'Provision customer service',
+  'Unprovision customer service',
+
+  'View/link unlinked services', #not agent-virtualizable without more work
+
+  'View invoices',
 
   'Post payment',
+  'Post payment batch',
+  'Unapply payment', #aka. unapplypayments Enable "unapplication" of unclosed payments.
   'Process payment',
+  'Refund payment',
+
+  'Delete payment', #aka. deletepayments - Enable deletion of unclosed payments. Be very careful! Only delete payments that were data-entry errors, not adjustments. Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.
+
   'Post credit',
-  #more financial stuff
+  #'Apply credit',
+  'Unapply credit', #aka unapplycredits Enable "unapplication" of unclosed credits.
+  'Delete credit', #aka. deletecredits Enable deletion of unclosed credits. Be very careful! Only delete credits that were data-entry errors, not adjustments. Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.
+
+  'Credit card void', #aka. cc-void #Enable local-only voiding of echeck payments in addition to refunds against the payment gateway
+  'Echeck void', #aka. echeck-void #Enable local-only voiding of echeck payments in addition to refunds against the payment gateway
+  'Unvoid', #aka. unvoid #Enable unvoiding of voided payments
+
+  'List customers',
+  #'List zip codes',
+  'List invoices',
+  'List packages',
+  'List services',
+
+  'Financial reports',
+
+  'Job queue', # these are not currently agent-virtualized
+  'Import',    #
+  'Export',    #
+
+  'Configuration', #none of the configuraiton is agent-virtualized either
 
 );
 
diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index c95d02984..e3bf2cb9f 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -192,6 +192,29 @@ sub agentnums_sql {
   ' )';
 }
 
+=item access_right
+
+Given a right name, returns true if this user has this right (currently via
+group membership, eventually also via user overrides).
+
+=cut
+
+sub access_right {
+  my( $self, $rightname ) = @_;
+  my $sth = dbh->prepare("
+    SELECT groupnum FROM access_usergroup
+                    LEFT JOIN access_group USING ( groupnum )
+                    LEFT JOIN access_right
+                         ON ( access_group.groupnum = access_right.rightobjnum )
+      WHERE usernum = ?
+        AND righttype = 'FS::access_group'
+        AND rightname = ?
+  ") or die dbh->errstr;
+  $sth->execute($self->usernum, $rightname) or die $sth->errstr;
+  my $row = $sth->fetchrow_arrayref;
+  $row ? $row->[0] : '';
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8956d5b26..511762e63 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -944,10 +944,13 @@ sub replace {
     $old = qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
   }
 
-  if ( $self->payby eq 'COMP' && $self->payby ne $old->payby
-       && $conf->config('users-allow_comp')                  ) {
-    return "You are not permitted to create complimentary accounts."
-      unless grep { $_ eq getotaker } $conf->config('users-allow_comp');
+  my $curuser = $FS::CurrentUser::CurrentUser;
+  if (    $self->payby eq 'COMP'
+       && $self->payby ne $old->payby
+       && ! $curuser->access_right('Complimentary customer')
+     )
+  {
+    return "You are not permitted to create complimentary accounts.";
   }
 
   local($ignore_expired_card) = 1
@@ -1302,9 +1305,12 @@ sub check {
 
   } elsif ( $self->payby eq 'COMP' ) {
 
-    if ( !$self->custnum && $conf->config('users-allow_comp') ) {
+    my $curuser = $FS::CurrentUser::CurrentUser;
+    if (    ! $self->custnum
+         && ! $curuser->access_right('Complimentary customer')
+       )
+    {
       return "You are not permitted to create complimentary accounts."
-        unless grep { $_ eq getotaker } $conf->config('users-allow_comp');
     }
 
     $error = $self->ut_textn('payinfo');
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 8da197f34..05db0f659 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -3,6 +3,8 @@
   my $conf = new FS::Conf;
   my $fsurl = $opt{'freeside_baseurl'};
 
+  my $curuser = $FS::CurrentUser::CurrentUser;
+
   #Active tickets not assigned to a customer
 
   tie my %report_customers_lists, 'Tie::IxHash',
@@ -40,23 +42,27 @@
   tie my %report_services_acct, 'Tie::IxHash',
     'All accounts by username' => [ $fsurl.'search/svc_acct.cgi?username', '' ],
     'All accounts by UID'      => [ $fsurl.'search/svc_acct.cgi?uid', '' ],
-    'Unlinked accounts'        => [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside accounts without a customer record' ],
   ;
+  $report_services_acct{'Unlinked accounts'} = [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside accounts without a customer record' ]
+    if $curuser->access_right('View/link unlinked services');
 
   tie my %report_services_domain, 'Tie::IxHash',
     'All domains'      => [ $fsurl.'search/svc_domain.cgi?domain', '' ],
-    'Unlinked domains' => [ $fsurl.'search/svc_domain.cgi?UN_domain', 'Pre-Freeside domains without a customer record' ],
   ;
+  $report_services_domain{'Unlinked domains'} = [ $fsurl.'search/svc_domain.cgi?UN_domain', 'Pre-Freeside domains without a customer record' ]
+    if $curuser->access_right('View/link unlinked services');
 
   tie my %report_services_forward, 'Tie::IxHash',
     'All mail forwards'      => [ $fsurl.'search/svc_forward.cgi?svcnum', '' ],
-    'Unlinked mail forwards' => [ $fsurl.'search/svc_forward.cgi?UN_svcnum', 'Pre-Freeside mail forwards without a customer record' ],
   ;
+  $report_services_forward{'Unlinked mail forwards'} = [ $fsurl.'search/svc_forward.cgi?UN_svcnum', 'Pre-Freeside mail forwards without a customer record' ]
+    if $curuser->access_right('View/link unlinked services');
 
   tie my %report_services_www, 'Tie::IxHash',
     'All virtual hosts'     => [ $fsurl.'search/svc_www.cgi?svcnum', '' ],
-    'Unlinked virtual hosts' => [ $fsurl.'search/svc_www.cgi?UN_svcnum', 'Pre-Freeside virtual hosts without a customer record' ],
   ;
+  $report_services_www{'Unlinked virtual hosts'} = [ $fsurl.'search/svc_www.cgi?UN_svcnum', 'Pre-Freeside virtual hosts without a customer record' ]
+    if $curuser->access_right('View/link unlinked services');
 
   tie my %report_services_broadband, 'Tie::IxHash',
     'All broadband services' => [ $fsurl.'search/svc_broadband.cgi?svcnum', '' ],
@@ -65,28 +71,31 @@
 
   tie my %report_services_external, 'Tie::IxHash',
     'All external services' => [ $fsurl.'search/svc_external.cgi?id', '' ],
-    'Unlinked external services' => [ $fsurl.'search/svc_external.cgi?UN_id', 'Pre-Freeside domains without a customer record' ],
-  ;
-
-  tie my %report_services, 'Tie::IxHash',
-    'Service definitions' => [ $fsurl.'browse/part_svc.cgi?orderby=active', 'Service definitions by number of active packages' ],
-    'separator' => '',
-    'Accounts'            => [ \%report_services_acct, 'Access accounts and mailboxes' ],
-    'Domains'             => [ \%report_services_domain, 'Domains', ],
-    'Mail forwards'       => [ \%report_services_forward, 'Mail forwards', ],
-    'Virtual hosts'       => [ \%report_services_www, 'Virtual hosting', ],
-    'Broadband services'  => [ \%report_services_broadband, 'Fixed (username-less) broadband services', ],
-    'External services'   => [ \%report_services_external, 'External services', ],
   ;
+  $report_services_external{'Unlinked external services'} = [ $fsurl.'search/svc_external.cgi?UN_id', 'Pre-Freeside domains without a customer record' ]
+    if $curuser->access_right('View/link unlinked services');
 
-  tie my %report_packages, 'Tie::IxHash',
-    'Package definitions' => [ $fsurl.'browse/part_pkg.cgi?active=1', 'Package definitions by number of active packages' ],
-    'separator' => '',
-    'All customer packages' => [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ],
-    'Suspended customer packages' => [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ],
-    'Customer packages with unconfigured services' => [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ],
-    'Advanced package reports' => [ $fsurl.'search/report_cust_pkg.html', 'by agent, date range, status, package definition' ],
-  ;
+  tie my %report_services, 'Tie::IxHash';
+  if ( $curuser->access_right('Configuration') ) {
+    $report_services{'Service definitions'} =  [ $fsurl.'browse/part_svc.cgi?orderby=active', 'Service definitions by number of active packages' ];
+    $report_services{'separator'} =  '';
+  }
+  $report_services{'Accounts'} =  [ \%report_services_acct, 'Access accounts and mailboxes' ];
+  $report_services{'Domains'} =  [ \%report_services_domain, 'Domains', ];
+  $report_services{'Mail forwards'} =  [ \%report_services_forward, 'Mail forwards', ];
+  $report_services{'Virtual hosts'} =  [ \%report_services_www, 'Virtual hosting', ];
+  $report_services{'Broadband services'} =  [ \%report_services_broadband, 'Fixed (username-less) broadband services', ];
+  $report_services{'External services'} =  [ \%report_services_external, 'External services', ];
+
+  tie my %report_packages, 'Tie::IxHash';
+  if ( $curuser->access_right('Configuration') ) {
+    $report_packages{'Package definitions'} =  [ $fsurl.'browse/part_pkg.cgi?active=1', 'Package definitions by number of active packages' ];
+    $report_packages{'separator'} =  '';
+  }
+  $report_packages{'All customer packages'} =  [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ];
+  $report_packages{'Suspended customer packages'} =  [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ];
+  $report_packages{'Customer packages with unconfigured services'} =  [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ];
+  $report_packages{'Advanced package reports'} =  [ $fsurl.'search/report_cust_pkg.html', 'by agent, date range, status, package definition' ];
 
   tie my %report_financial, 'Tie::IxHash', 
     'Sales, Credits and Receipts' => [ $fsurl.'graph/report_money_time.html', 'Sales, credits and receipts summary graph' ],
@@ -98,13 +107,17 @@
     'Sales Tax Liability' => [ $fsurl.'search/report_tax.html', 'Sales tax liability report' ],
   ;
 
-  tie my %report_menu, 'Tie::IxHash',
-    'Customers' => [ \%report_customers,  'Customer reports'  ],
-    'Invoices'  => [ \%report_invoices,   'Invoice reports'   ],
-    'Packages'  => [ \%report_packages,   'Package reports'   ],
-    'Services'  => [ \%report_services,   'Services reports'   ],
-    'Financial' => [ \%report_financial,  'Financial reports' ],
-  ;
+  tie my %report_menu, 'Tie::IxHash';
+  $report_menu{'Customers'} = [ \%report_customers, 'Customer reports'  ]
+    if $curuser->access_right('List customers');
+  $report_menu{'Invoices'} =  [ \%report_invoices,  'Invoice reports'   ]
+    if $curuser->access_right('List invoices');
+  $report_menu{'Packages'} =  [ \%report_packages,  'Package reports'   ]
+    if $curuser->access_right('List packages');
+  $report_menu{'Services'} =  [ \%report_services,  'Services reports'  ]
+    if $curuser->access_right('List services');
+  $report_menu{'Financial'} = [ \%report_financial, 'Financial reports' ]
+    if $curuser->access_right('Financial reports');
 
   tie my %tools_importing, 'Tie::IxHash',
     'Import customers from CSV file' => [ $fsurl.'misc/cust_main-import.cgi', '' ],
@@ -120,12 +133,15 @@
   #      <!-- or <A HREF="browse/nas-sqlradius.cgi">RADIUS</A>
   #    <BR> -->
 
-  tie my %tools_menu, 'Tie::IxHash',
-    'Quick payment entry' => [ $fsurl.'misc/batch-cust_pay.html', 'Enter multiple payments in a batch' ],
-    'Job Queue' => [ $fsurl.'search/queue.html', 'View pending job queue' ],
-    'Importing' => [ \%tools_importing, 'Import tools' ],
-    'Exporting' => [ \%tools_exporting, 'Export tools' ],
-  ;
+  tie my %tools_menu, 'Tie::IxHash', ();
+  $tools_menu{'Quick payment entry'} =  [ $fsurl.'misc/batch-cust_pay.html', 'Enter multiple payments in a batch' ]
+    if $curuser->access_right('Post payment batch');
+  $tools_menu{'Job Queue'} =  [ $fsurl.'search/queue.html', 'View pending job queue' ]
+    if $curuser->access_right('Job queue');
+  $tools_menu{'Importing'} =  [ \%tools_importing, 'Import tools' ]
+    if $curuser->access_right('Import');
+  $tools_menu{'Exporting'} =  [ \%tools_exporting, 'Export tools' ]
+    if $curuser->access_right('Export');
 
   tie my %config_employees, 'Tie::IxHash',
     'View/Edit employees' => [ $fsurl.'browse/access_user.html', 'Setup internal users' ],
@@ -191,10 +207,13 @@
                           ),
                           'Ticketing start page',
                         ],
-    'Reports'        => [ \%report_menu, 'Lists, reporting and graphing' ],
-    'Tools'          => [ \%tools_menu, 'Tools' ],
-    'Configuration'  => [ \%config_menu, 'Configuraiton and setup' ],
   ;
+  $menu{'Reports'} = [ \%report_menu, 'Lists, reporting and graphing' ]
+    if keys %report_menu;
+  $menu{'Tools'} = [ \%tools_menu, 'Tools' ]
+    if keys %tools_menu;
+  $menu{'Configuration'} = [ \%config_menu, 'Configuraiton and setup' ]
+    if $curuser->access_right('Configuration');
 
   use vars qw($gmenunum);
   $gmenunum = 0;
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 58f2925d5..e7b3319c7 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
@@ -12,13 +11,17 @@ foreach my $part_svc ( qsearch('part_svc',{}) ) {
 
 %>
 
+
 <%= include("/elements/header.html","Customer View", 
 	include("/elements/menubar.html",
   'Main Menu' => $p,
 )) %>
 
+
 <%
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "No customer specified (bad URL)!" unless $cgi->keywords;
 my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
 $query =~ /^(\d+)$/;
@@ -26,10 +29,14 @@ my $custnum = $1;
 my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Customer not found!" unless $cust_main;
 
-print qq!<A HREF="${p}edit/cust_main.cgi?$custnum">Edit this customer</A>!;
-
 %>
 
+
+<% if ( $curuser->access_right('Edit customer') ) { %>
+  <A HREF="<%= $p %>edit/cust_main.cgi?<%= $custnum %>">Edit this customer</A> | 
+<% } %>
+
+
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
@@ -60,37 +67,36 @@ var confirm_cancel = '<FORM METHOD="POST" ACTION="<%= $p %>misc/cust_main-cancel
 
 </SCRIPT>
 
-<% if ( $cust_main->ncancelled_pkgs ) { %>
+<% if ( $curuser->access_right('Cancel customer')
+        && $cust_main->ncancelled_pkgs
+      ) {
+%>
+  <A HREF="javascript:void(0);" onClick="overlib(confirm_cancel, CAPTION, 'Confirm cancellation', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' ); return false; ">Cancel this customer</A> | 
+<% } %>
 
-  | <A HREF="javascript:void(0);" onClick="overlib(confirm_cancel, CAPTION, 'Confirm cancellation', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' ); return false; ">Cancel this customer</A>
 
+<% if ( $conf->exists('deletecustomers')
+        && $curuser->access_right('Delete customer')
+      ) {
+%>
+  <A HREF="<%= $p %>misc/delete-customer.cgi?<%= $custnum%>">Delete this customer</A> | 
 <% } %>
 
-<%
 
-print qq! | <A HREF="${p}misc/delete-customer.cgi?$custnum">!.
-      'Delete this customer</A>'
-  if $conf->exists('deletecustomers');
+<% unless ( $conf->exists('disable_customer_referrals') ) { %>
+  <A HREF="<%= popurl(2) %>edit/cust_main.cgi?referral_custnum=<%= $custnum %>">Refer a new customer</A> | 
+  <A HREF="<%= popurl(2) %>search/cust_main.cgi?referral_custnum=<%= $custnum %>">View this customer's referrals</A>
+<% } %>
 
-unless ( $conf->exists('disable_customer_referrals') ) {
-  print qq! | <A HREF="!, popurl(2),
-        qq!edit/cust_main.cgi?referral_custnum=$custnum">!,
-        qq!Refer a new customer</A>!;
 
-  print qq! | <A HREF="!, popurl(2),
-        qq!search/cust_main.cgi?referral_custnum=$custnum">!,
-        qq!View this customer's referrals</A>!;
-}
-
-print '<BR><BR>';
+<BR><BR>
 
+<%
 my $signupurl = $conf->config('signupurl');
 if ( $signupurl ) {
-print "This customer's signup URL: ".
-      "<a href=\"$signupurl?ref=$custnum\">$signupurl?ref=$custnum</a><BR><BR>";
-}
-
 %>
+  This customer's signup URL: <A HREF="<%= $signupurl %>?ref=<%= $custnum %>"><%= $signupurl %>?ref=<%= $custnum %></A><BR><BR>
+<% } %>
 
 <A NAME="cust_main"></A>
 <TABLE BORDER=0>
@@ -135,5 +141,4 @@ Comments
   <%= include('cust_main/payment_history.html', $cust_main ) %>
 <% } %>
 
-</BODY></HTML>
-
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 32e0ee1fc..8312a8663 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -2,6 +2,8 @@
   my( $cust_main ) = @_;
   my $conf = new FS::Conf;
 
+  my $curuser = $FS::CurrentUser::CurrentUser;
+
   my $packages = get_packages($cust_main, $conf);
 %>
 
@@ -11,13 +13,21 @@
 
 <A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A>
 
-<%= include('order_pkg.html', $cust_main ) %>
+<% if ( $curuser->access_right('Order customer package') ) { %>
+  <%= include('order_pkg.html', $cust_main ) %>
+<% } %>
 
-<% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
+<% if ( $curuser->access_right('One-time charge')
+        && $conf->config('payby-default') ne 'HIDE'
+      ) {
+%>
   <%= include('quick-charge.html', $cust_main ) %>
 <% } %>
 
-<A HREF="<%= $p %>edit/cust_pkg.cgi?<%= $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services)
+<% if ( $curuser->access_right('Bulk change customer packages') ) { %>
+  <A HREF="<%= $p %>edit/cust_pkg.cgi?<%= $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services)
+<% } %>
+
 <BR><BR>
 
 <% if ( @$packages ) { %>
@@ -70,10 +80,19 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
   <TD ROWSPAN=<%= $rowspan || 1 %>>
     <A NAME="cust_pkg<%=$pkg->{pkgnum}%>"><%=$pkg->{pkgnum}%></A>:
     <%=$pkg->{pkg}%> - <%=$pkg->{comment}%><BR>
-<% unless ($pkg->{cancel}) { %>
-    (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
-    (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;|&nbsp;<%=pkg_customize_link($pkg,$cust_main->custnum)%>&nbsp;)
-<% } %>
+    <FONT SIZE=-1>
+      <% unless ( $pkg->{cancel} ) { %>
+        <% if ( $curuser->access_right('Change customer package') ) { %>
+            (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
+        <% } %>
+        <% if ( $curuser->access_right('Edit customer package dates') ) { %>
+            (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;)
+        <% } %>
+        <% if ( $curuser->access_right('Customize customer package') ) { %>
+            (&nbsp;<%=pkg_customize_link($pkg,$cust_main->custnum)%>&nbsp;)
+        <% } %>
+      <% } %>
+    </FONT>
   </TD>
   <TD ROWSPAN=<%= $rowspan || 1 %>>
     <TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
@@ -182,7 +201,16 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
     <% } %>
 
     <TR>
-      <TD COLSPAN=<%=$colspan%>>(&nbsp;<%= pkg_unsuspend_link($pkg) %>&nbsp;|&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)</TD>
+      <TD COLSPAN=<%=$colspan%>>
+        <FONT SIZE=-1>
+          <% if ( $curuser->access_right('Unsuspend customer package') ) { %>
+            (&nbsp;<%= pkg_unsuspend_link($pkg) %>&nbsp;)
+          <% } %>
+          <% if ( $curuser->access_right('Cancel customer package') ) { %>
+            (&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)
+          <% } %>
+        </FONT>
+      </TD>
     </TR>
 
   <% } else { %> <!-- #status: active -->
@@ -196,7 +224,13 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
         </TR>
 
         <TR>
-          <TD COLSPAN=<%=$colspan%>>(&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)</TD>
+          <TD COLSPAN=<%=$colspan%>>
+            <FONT SIZE=-1>
+              <% if ( $curuser->access_right('Cancel customer package immediately') ) { %>
+                (&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)
+              <% } %>
+            </FONT>
+          </TD>
         </TR>
 
       <% } else { %>
@@ -258,7 +292,19 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 
     <% if ( $pkg->{freq} ) { %>
       <TR>
-        <TD COLSPAN=<%=$colspan%>>(&nbsp;<%= pkg_suspend_link($pkg) %>&nbsp;|&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)</TD>
+        <TD COLSPAN=<%=$colspan%>>
+          <FONT SIZE=-1>
+            <% if ( $curuser->access_right('Suspend customer package') ) { %>
+              (&nbsp;<%= pkg_suspend_link($pkg) %>&nbsp;)
+            <% } %>
+            <% if ( $curuser->access_right('Cancel customer package immediately') ) { %>
+              (&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)
+            <% } %>
+            <% if ( $curuser->access_right('Cancel customer package later') ) { %>
+              (&nbsp;<%= pkg_expire_link($pkg) %>&nbsp;)
+            <% } %>
+          <FONT>
+        </TD>
       </TR>
     <% } %>
 
@@ -278,14 +324,20 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
       print '<TR>' if ($cnt > 0);
 %>
   <TD><%=svc_link($svcpart,$service)%></TD>
-  <TD><%=svc_label_link($svcpart,$service)%><BR>(&nbsp;<%=svc_unprovision_link($service)%>&nbsp;)</TD>
+  <TD><%=svc_label_link($svcpart,$service)%>
+    <% if ( $curuser->access_right('Unprovision customer service') ) { %>
+      <BR>(&nbsp;<%=svc_unprovision_link($service)%>&nbsp;)
+    <% } %>
+  </TD>
 </TR>
 <%
       $cnt++;
     }
-    if ($svcpart->{count} < $svcpart->{quantity}) {
+    if ( $svcpart->{count} < $svcpart->{quantity} 
+         && $curuser->access_right('Provision customer services')
+       ) {
       print qq!<TR>\n! if ($cnt > 0);
-      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg, $svcpart, $conf).qq!</TD>\n</TR>\n!;
+      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg, $svcpart, $conf, $curuser).qq!</TD>\n</TR>\n!;
     }
   }
 }
@@ -393,7 +445,7 @@ sub svc_label_link {
 }
 
 sub svc_provision_link {
-  my ($pkg, $svcpart, $conf) = @_;
+  my ($pkg, $svcpart, $conf, $curuser) = @_;
   ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/&nbsp;/g;
   my $num_left = $svcpart->{quantity} - $svcpart->{count};
   my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}";
@@ -411,7 +463,10 @@ sub svc_provision_link {
 
   my $link = qq!<A CLASS="provision" HREF="$url">!.
              "Provision&nbsp;$svc_nbsp&nbsp;($num_left)</A>";
-  if ( $conf->exists('legacy_link') ) {
+  if ( $conf->exists('legacy_link')
+       && $curuser->access_right('View/link unlinked services')
+     )
+  {
     $link .= '<BR>'.
              qq!<A CLASS="provision" HREF="${p}misc/link.cgi?!.
              qq!$pkgnum_svcpart">!.
@@ -475,7 +530,11 @@ sub pkg_cancel_link {
   my $pkg = shift or return '';
   qq!<A HREF="javascript:areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}', !.
   qq!'Permanently delete included services and cancel this package?')">!.
-  qq!Cancel now</A> | !.
+  qq!Cancel now</A>!;
+}
+
+sub pkg_expire_link {
+  my $pkg = shift or return '';
   qq!<A HREF="${p}misc/expire_pkg.cgi?$pkg->{pkgnum}">Cancel later</A>!;
 }
 
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index f0cd993ff..b7621d57a 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -4,6 +4,8 @@
 
   my $conf = new FS::Conf;
 
+  my $curuser = $FS::CurrentUser::CurrentUser;
+
   my @payby = grep /\w/, $conf->config('payby');
   #@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
   @payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
@@ -16,42 +18,48 @@
 
 <BR><BR><A NAME="history"><FONT SIZE="+2">Payment History</FONT></A><BR>
 
-<% if ( $payby{'BILL'} ) { %>
+<% if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>edit/cust_pay.cgi?payby=BILL;custnum=<%= $custnum %>">Post check payment</A>
 
 <% } %>
 
-<% if ( $payby{'CASH'} ) { %>
+<% if ( $payby{'CASH'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>edit/cust_pay.cgi?payby=CASH;custnum=<%= $custnum %>">Post cash payment</A>
 
 <% } %>
 
-<% if ( $payby{'WEST'} ) { %>
+<% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;custnum=<%= $custnum %>">Post Western Union payment</A>
 
 <% } %>
 
-<% if ( $payby{'CARD'} || $payby{'DCRD'} ) { %>
+<% if ( ( $payby{'CARD'} || $payby{'DCRD'} )
+        && $curuser->access_right('Process payment')
+      ) {
+%>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>misc/payment.cgi?payby=CARD;custnum=<%= $custnum %>">Process credit card payment</A>
 
 <% } %>
 
-<% if ( $payby{'CHEK'} || $payby{'DCHK'} ) { %>
+<% if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
+        && $curuser->access_right('Process payment')
+      ) {
+%>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>misc/payment.cgi?payby=CHEK;custnum=<%= $custnum %>">Process electronic check (ACH) payment</A>
 
 <% } %>
 
-<% if ( $payby{'MCRD'} ) { %>
+<% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<%= $custnum %>">Post manual credit card payment</A>
@@ -60,9 +68,13 @@
 
 <BR>
 
-<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">Post credit</A>
+<% if ( $curuser->access_right('Post credit') ) { %>
 
-<BR>
+  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">Post credit</A>
+
+  <BR>
+
+<% } %>
 
 <%
 #get payment history
@@ -75,11 +87,14 @@ foreach my $cust_bill ($cust_main->cust_bill) {
               : '';
   my $post = ( $cust_bill->owed > 0 ) ? '</FONT></B>' : '';
   my $invnum = $cust_bill->invnum;
+  my $link = $curuser->access_right('View invoices')
+               ? qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!
+               : '';
   push @history, {
     'date'   => $cust_bill->_date,
-    'desc'   => qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!. $pre.
+    'desc'   => $link. $pre.
                 "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'.
-                $post. '</A>',
+                $post. ( $link ? '</A>' : '' ),
     'charge' => $cust_bill->charged,
   };
 }
@@ -169,6 +184,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
        && $cust_pay->payby =~ /^(CARD|CHEK)$/
        && time-$cust_pay->_date < $refund_days*86400
        && $cust_pay->unrefunded > 0
+       && $curuser->access_right('Refund payment')
   ) {
     $refund = qq! (<A HREF="${p}edit/cust_refund.cgi?payby=$1;!.
               qq!paynum=!. $cust_pay->paynum. '"'.
@@ -178,9 +194,17 @@ foreach my $cust_pay ($cust_main->cust_pay) {
 
   my $void = '';
   if (    $cust_pay->closed !~ /^Y/i
-       && ( $cust_pay->payby ne 'CARD' || $conf->exists('cc-void')     )
-       && ( $cust_pay->payby ne 'CHEK' || $conf->exists('echeck-void') ) 
-     ) {
+       && (    ( $cust_pay->payby eq 'CARD'
+                 && $conf->exists('cc-void')
+                 && $curuser->acccess_right('Credit card void')
+               )
+            || ( $cust_pay->payby eq 'CHEK'
+                 && $conf->exists('echeck-void')
+                 && $curuser->acccess_right('Echeck void')
+               ) 
+          )
+     )
+  {
     $void = qq! (<A HREF="javascript:areyousure('!.
             qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
             qq!', 'Are you sure you want to void this payment?')"!.
@@ -193,7 +217,11 @@ foreach my $cust_pay ($cust_main->cust_pay) {
   }
 
   my $delete = '';
-  if ( $cust_pay->closed !~ /^Y/i && $conf->exists('deletepayments') ) {
+  if ( $cust_pay->closed !~ /^Y/i
+       && $conf->exists('deletepayments')
+       && $curuser->access_right('Delete payment')
+     )
+  {
     $delete = qq! (<A HREF="javascript:areyousure('!.
               qq!${p}misc/delete-cust_pay.cgi?!. $cust_pay->paynum.
               qq!', 'Are you sure you want to delete this payment?')"!.
@@ -204,7 +232,10 @@ foreach my $cust_pay ($cust_main->cust_pay) {
   my $unapply = '';
   if (    $cust_pay->closed !~ /^Y/i
        && $conf->exists('unapplypayments')
-       && scalar(@cust_bill_pay)           ) {
+       && scalar(@cust_bill_pay)           
+       && $curuser->access_right('Unapply payment')
+     )
+  {
     $unapply = qq! (<A HREF="javascript:areyousure('!.
                qq!${p}misc/unapply-cust_pay.cgi?!. $cust_pay->paynum.
                qq!', 'Are you sure you want to unapply this payment?')"!.
@@ -236,7 +267,11 @@ foreach my $cust_pay_void ($cust_main->cust_pay_void) {
   my $info = $payby ? " ($payby$payinfo)" : '';
 
   my $unvoid = '';
-  if ( $cust_pay_void->closed !~ /^Y/i && $conf->exists('unvoid') ) {
+  if ( $cust_pay_void->closed !~ /^Y/i
+       && $conf->exists('unvoid')
+       && $curuser->access_right('Unvoid')
+     )
+  {
     $unvoid = qq! (<A HREF="javascript:areyousure('!.
               qq!${p}misc/unvoid-cust_pay_void.cgi?!. $cust_pay_void->paynum.
               qq!', 'Are you sure you want to unvoid this payment?')"!.
@@ -314,7 +349,11 @@ foreach my $cust_credit ($cust_main->cust_credit) {
   }
 #
   my $delete = '';
-  if ( $cust_credit->closed !~ /^Y/i && $conf->exists('deletecredits') ) {
+  if ( $cust_credit->closed !~ /^Y/i
+       && $conf->exists('deletecredits')
+       && $curuser->access_right('Delete credit')
+     )
+  {
     $delete = qq! (<A HREF="javascript:areyousure('!.
               qq!${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum.
               qq!', 'Are you sure you want to delete this credit?')">!.
@@ -324,7 +363,10 @@ foreach my $cust_credit ($cust_main->cust_credit) {
   my $unapply = '';
   if (    $cust_credit->closed !~ /^Y/i
        && $conf->exists('unapplycredits')
-       && scalar(@cust_credit_bill)       ) {
+       && scalar(@cust_credit_bill)
+       && $curuser->access_right('Unapply credit')
+     )
+  {
     $unapply = qq! (<A HREF="javascript:areyousure('!.
                qq!${p}misc/unapply-cust_credit.cgi?!. $cust_credit->crednum.
                qq!', 'Are you sure you want to unapply this credit?')">!.
-- 
cgit v1.2.1


From 64a57a198d5046a458ea2bdc1d34fbc4682f3292 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jun 2006 11:57:39 +0000
Subject: ACL bootstrapping/upgrade

---
 Changes.1.7.0              |  9 +++---
 README.1.7.0               |  4 +++
 bin/mapsecrets2access_user | 76 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100755 bin/mapsecrets2access_user

diff --git a/Changes.1.7.0 b/Changes.1.7.0
index 8dcc36e08..d5dcf3da7 100644
--- a/Changes.1.7.0
+++ b/Changes.1.7.0
@@ -9,6 +9,11 @@
 - gross sales report/graph broken down by agent and package class
 - config switch to base tax off shipping address if present (warning: tax reports can take a long time with this switch on)
 - plesk provisioning
+- "inactive" package status 
+- more options in package report (classes, etc.)
+and (now they're finally here)...
+- ACLs
+- Agent virtualization
 
 -------- some of the above, nicely:
 
@@ -33,7 +38,3 @@
   - Bookeeping/Collections | Sales report (by agent, package class ...
 
 --------
-
-and...
-- ACLs
-- Agent virtualization
diff --git a/README.1.7.0 b/README.1.7.0
index a6e18d05d..4ce58cc64 100644
--- a/README.1.7.0
+++ b/README.1.7.0
@@ -18,6 +18,10 @@ run "freeside-upgrade username" to uprade your database schema
 (if freeside-upgrade hangs, try stopping Apache, all Freeside processes, and
  anything else connected to your database, especially on older Pg versions)
 
+ACL bootstrapping:
+  - Run "bin/mapsecrets2access_user username"
+  - You can then add more restrictive groups and move your users into them
+
 If you have any records in the cust_tax_exempt table, you *MUST* migrate them
 to the new cust_tax_exempt_pkg table.  An example script to get you started is
 in bin/fs-migrate-cust_tax_exempt - it may need to be customized for your
diff --git a/bin/mapsecrets2access_user b/bin/mapsecrets2access_user
new file mode 100755
index 000000000..934cd7698
--- /dev/null
+++ b/bin/mapsecrets2access_user
@@ -0,0 +1,76 @@
+#!/usr/bin/perl -w
+
+use strict;
+use File::Copy "cp";
+use FS::UID qw(adminsuidsetup);
+use FS::AccessRight;
+use FS::Record qw(qsearchs qsearch);
+use FS::access_group;
+use FS::access_user;
+use FS::access_usergroup;
+use FS::access_right;
+use FS::access_groupagent;
+use FS::agent;
+
+adminsuidsetup shift;
+
+my $supergroup = qsearchs('access_group', { 'groupname' => 'Superuser' } );
+unless ( $supergroup ) {
+
+  $supergroup = new FS::access_group { 'groupname' => 'Superuser' };
+  my $error = $supergroup->insert;
+  die $error if $error;
+
+  foreach my $rightname ( FS::AccessRight->rights ) {
+    my $access_right = new FS::access_right {
+      'righttype'   => 'FS::access_group',
+      'rightobjnum' => $supergroup->groupnum,
+      'rightname'   => $rightname,
+    };
+    my $ar_error = $access_right->insert;
+    die $ar_error if $ar_error;
+  }
+
+  foreach my $agent ( qsearch('agent', {} ) ) {
+    my $access_groupagent = new FS::access_groupagent {
+      'groupnum' => $supergroup->groupnum,
+      'agentnum' => $agent->agentnum,
+    };
+    my $aga_error = $access_groupagent->insert;
+    die $aga_error if $aga_error;
+  }
+
+}
+my $supergroupnum = $supergroup->groupnum;
+
+my $mapsecrets = '/usr/local/etc/freeside/mapsecrets';
+open(MAPSECRETS, "<$mapsecrets");
+while (<MAPSECRETS>) {
+  /([\w]+)\s+secrets\s*$/ or die "unparsable line in mapsecrets: $_";
+  my $username = $1;
+
+  next if qsearchs('access_user', { 'username' => $username } );
+
+  my $access_user = new FS::access_user {
+    'username'  => $username,
+    '_password' => 'notyet',
+    'first'     => 'Legacy',
+    'last'      => 'User',
+  };
+  my $au_error = $access_user->insert;
+  die $au_error if $au_error;
+
+  my $access_usergroup = new FS::access_usergroup { 
+    'usernum'  => $access_user->usernum,
+    'groupnum' => $supergroupnum,
+  };
+  my $aug_error = $access_usergroup->insert;
+  die $aug_error if $aug_error;
+
+}
+
+# okay to clobber mapsecrets now i guess
+cp $mapsecrets, "$mapsecrets.bak$$";
+open(MAPSECRETS, ">$mapsecrets");
+print MAPSECRETS '* secrets'. "\n";
+close MAPSECRETS;
-- 
cgit v1.2.1


From b2ff1141cfaacfce2fd9c6e5b78fdae2bae95406 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jun 2006 12:09:14 +0000
Subject: forgot to commit this test

---
 FS/t/ConfDefaults.t | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 FS/t/ConfDefaults.t

diff --git a/FS/t/ConfDefaults.t b/FS/t/ConfDefaults.t
new file mode 100644
index 000000000..433555adb
--- /dev/null
+++ b/FS/t/ConfDefaults.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::ConfDefaults;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 1ed201c9f897f768e3ec8b9e7aee0fcb8b2bfed1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jun 2006 12:15:32 +0000
Subject: ACL bootstrapping

---
 FS/FS/CurrentUser.pm    | 9 ++++++---
 FS/bin/freeside-upgrade | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/FS/FS/CurrentUser.pm b/FS/FS/CurrentUser.pm
index 13d34167d..37ed3592a 100644
--- a/FS/FS/CurrentUser.pm
+++ b/FS/FS/CurrentUser.pm
@@ -1,11 +1,13 @@
 package FS::CurrentUser;
 
-use vars qw($CurrentUser);
+use vars qw($CurrentUser $upgrade_hack);
 
 #not at compile-time, circular dependancey causes trouble
 #use FS::Record qw(qsearchs);
 #use FS::access_user;
 
+$upgrade_hack = 0;
+
 =head1 NAME
 
 FS::CurrentUser - Package representing the current user
@@ -19,8 +21,9 @@ FS::CurrentUser - Package representing the current user
 sub load_user {
   my( $class, $user ) = @_; #, $pass
 
-  #XXX remove me at some point
-  return "" if $user =~ /^fs_(queue|selfservice)$/;
+  return "" if $upgrade_hack;
+
+  #return "" if $user =~ /^fs_(queue|selfservice)$/;
 
   #not the best thing in the world...
   eval "use FS::Record qw(qsearchs);";
diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 25d883fcf..a1212ae98 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -5,6 +5,7 @@ use vars qw($DEBUG $DRY_RUN);
 use Term::ReadKey;
 use DBIx::DBSchema 0.31;
 use FS::UID qw(adminsuidsetup checkeuid datasrc );  #getsecrets);
+use FS::CurrentUser;
 use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
 
 $DEBUG = 1;
@@ -12,6 +13,7 @@ $DEBUG = 1;
 die "Not running uid freeside!" unless checkeuid();
 
 my $user = shift or die &usage;
+$FS::CurrentUser::upgrade_hack = 1;
 my $dbh = adminsuidsetup($user);
 
 #needs to match FS::Schema...
-- 
cgit v1.2.1


From 637378f8fa3c8d76a009cbf92984cdfb571cc5ee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jun 2006 12:22:09 +0000
Subject: ACL bootstrapping

---
 bin/mapsecrets2access_user | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/mapsecrets2access_user b/bin/mapsecrets2access_user
index 934cd7698..b34e0321a 100755
--- a/bin/mapsecrets2access_user
+++ b/bin/mapsecrets2access_user
@@ -3,6 +3,7 @@
 use strict;
 use File::Copy "cp";
 use FS::UID qw(adminsuidsetup);
+use FS::CurrentUser;
 use FS::AccessRight;
 use FS::Record qw(qsearchs qsearch);
 use FS::access_group;
@@ -12,6 +13,7 @@ use FS::access_right;
 use FS::access_groupagent;
 use FS::agent;
 
+$FS::CurrentUser::upgrade_hack = 1;
 adminsuidsetup shift;
 
 my $supergroup = qsearchs('access_group', { 'groupname' => 'Superuser' } );
-- 
cgit v1.2.1


From 3489c3e13d952972c06b82d1eb2bbd0315ed5a7c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jun 2006 12:47:55 +0000
Subject: better error checking for this thrown-together bootstrapping script

---
 bin/mapsecrets2access_user | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/mapsecrets2access_user b/bin/mapsecrets2access_user
index b34e0321a..3fcd5069b 100755
--- a/bin/mapsecrets2access_user
+++ b/bin/mapsecrets2access_user
@@ -46,7 +46,7 @@ unless ( $supergroup ) {
 my $supergroupnum = $supergroup->groupnum;
 
 my $mapsecrets = '/usr/local/etc/freeside/mapsecrets';
-open(MAPSECRETS, "<$mapsecrets");
+open(MAPSECRETS, "<$mapsecrets") or die $!;
 while (<MAPSECRETS>) {
   /([\w]+)\s+secrets\s*$/ or die "unparsable line in mapsecrets: $_";
   my $username = $1;
@@ -70,9 +70,10 @@ while (<MAPSECRETS>) {
   die $aug_error if $aug_error;
 
 }
+close MAPSECRETS;
 
 # okay to clobber mapsecrets now i guess
 cp $mapsecrets, "$mapsecrets.bak$$";
-open(MAPSECRETS, ">$mapsecrets");
+open(MAPSECRETS, ">$mapsecrets") or die $!;
 print MAPSECRETS '* secrets'. "\n";
-close MAPSECRETS;
+close MAPSECRETS or die $!;
-- 
cgit v1.2.1


From b5c26536197f16a3e1ea47c14c94884312c7fd24 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 19 Jun 2006 13:09:14 +0000
Subject: fix ACL name for service provisioning and prevent disabled service
 provisioning from messing up table formatting

---
 httemplate/view/cust_main/packages.html | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 8312a8663..beb67f325 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -333,12 +333,18 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 <%
       $cnt++;
     }
-    if ( $svcpart->{count} < $svcpart->{quantity} 
-         && $curuser->access_right('Provision customer services')
-       ) {
-      print qq!<TR>\n! if ($cnt > 0);
-      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg, $svcpart, $conf, $curuser).qq!</TD>\n</TR>\n!;
+    if ( $svcpart->{count} < $svcpart->{quantity} ) {
+      print '<TR>' if ($cnt > 0);
+      if ( $curuser->access_right('Provision customer service') ) {
+        print '<TD COLSPAN=2>'.
+              svc_provision_link($pkg, $svcpart, $conf, $curuser).
+              '</TD></TR>';
+      } else {
+        #print '<TD COLSPAN=2>&nbsp;</TD></TR>';
+        print '<TD COLSPAN=2></TD></TR>';
+      }
     }
+
   }
 }
 #end display packages
-- 
cgit v1.2.1


From 6c472b9d7eb5d64026baf188623cc133416253f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jun 2006 08:42:18 +0000
Subject: speed up the agent type report when there are lots of package
 definitions

---
 FS/FS/agent_type.pm              | 28 ++++++++++++++++++++++++++++
 httemplate/browse/agent_type.cgi | 13 +++++--------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/FS/FS/agent_type.pm b/FS/FS/agent_type.pm
index b28c57285..2660bb4a3 100644
--- a/FS/FS/agent_type.pm
+++ b/FS/FS/agent_type.pm
@@ -136,6 +136,27 @@ sub type_pkgs {
   qsearch('type_pkgs', { 'typenum' => $self->typenum } );
 }
 
+=item type_pkgs_enabled
+
+Returns all FS::type_pkg objects (see L<FS::type_pkgs>) that link to enabled
+package definitions (see L<FS::part_pkg>).
+
+An additional strange feature is that the returned type_pkg objects also have
+all fields of the associated part_pkg object.
+
+=cut
+
+sub type_pkgs_enabled {
+  my $self = shift;
+  qsearch({
+    'table'     => 'type_pkgs',
+    'addl_from' => 'JOIN part_pkg USING ( pkgpart )',
+    'hashref'   => { 'typenum' => $self->typenum },
+    'extra_sql' => " AND ( disabled = '' OR disabled IS NULL )".
+                   " ORDER BY pkg",
+  });
+}
+
 =item pkgpart
 
 Returns the pkgpart of all package definitions (see L<FS::part_pkg>) for this
@@ -152,6 +173,13 @@ sub pkgpart {
 
 =head1 BUGS
 
+type_pkgs_enabled should order itself by something (pkg?)
+
+type_pkgs_enabled should populate something that caches for the part_pkg method
+rather than add fields to this object, right?  In fact we need a "poop" object
+framework that does that automatically for any joined search at some point....
+right?
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::agent>, L<FS::type_pkgs>, L<FS::cust_main>,
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index a5ffb1048..ceffce3d4 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -13,21 +13,18 @@ my $packages_sub = sub {
 
   [ map  {
            my $type_pkgs = $_;
-           my $part_pkg = $type_pkgs->part_pkg;
+           #my $part_pkg = $type_pkgs->part_pkg;
            [
              {
-               'data'  => $part_pkg->pkg. ' - '. $part_pkg->comment,
+               #'data'  => $part_pkg->pkg. ' - '. $part_pkg->comment,
+               'data'  => $type_pkgs->pkg. ' - '. $type_pkgs->comment,
                'align' => 'left',
                'link'  => $p. 'edit/part_pkg.cgi?'. $type_pkgs->pkgpart,
              },
            ];
          }
-    #sort {
-    #     }
-    grep {
-           $_->part_pkg and ! $_->part_pkg->disabled
-         }
-    $agent_type->type_pkgs #XXX the method should order itself by something
+
+    $agent_type->type_pkgs_enabled
   ];
 
 };
-- 
cgit v1.2.1


From 262da96c9a051046a22182d0b19e8126623d2207 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jun 2006 12:56:23 +0000
Subject: add overlib iframe function

---
 httemplate/elements/iframecontentmws.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 httemplate/elements/iframecontentmws.js

diff --git a/httemplate/elements/iframecontentmws.js b/httemplate/elements/iframecontentmws.js
new file mode 100644
index 000000000..9df9cf681
--- /dev/null
+++ b/httemplate/elements/iframecontentmws.js
@@ -0,0 +1,21 @@
+/*
+ iframecontentmws.js - Foteos Macrides
+   Initial: October 10, 2004 - Last Revised: May 9, 2005
+ Simple script for using an HTML file as iframe content in overlibmws popups.
+ Include WRAP and TEXTPADDING,0 in the overlib call to ensure that the width
+ arg is respected (unless the CAPTION plus CLOSETEXT widths add up to more than
+ the width arg, in which case you should increase the width arg).  The name arg
+ should be a unique string for each popup with iframe content in the document.
+ The frameborder arg should be 1 (browser default if omitted) or 0.
+
+ See http://www.macridesweb.com/oltest/IFRAME.html for demonstration.
+*/
+
+function OLiframeContent(src, width, height, name, frameborder) {
+ alert(src);
+ return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
+ +(name!=null?' name="'+name+'" id="'+name+'"':'')
+ +(frameborder!=null?' frameborder="'+frameborder+'"':'')
+ +' scrolling="auto">'
+ +'<div>[iframe not supported]</div></iframe>');
+}
-- 
cgit v1.2.1


From 3f19b759d4cb69bdf92e18b77a4c810d76d1b38d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jun 2006 12:57:36 +0000
Subject: adding a header element for popups to replace CGI::header

---
 httemplate/elements/header-popup.html | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 httemplate/elements/header-popup.html

diff --git a/httemplate/elements/header-popup.html b/httemplate/elements/header-popup.html
new file mode 100644
index 000000000..73377abfe
--- /dev/null
+++ b/httemplate/elements/header-popup.html
@@ -0,0 +1,22 @@
+<%
+  my($title, $menubar) = ( shift, shift ); #$menubar is unused here though
+  my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
+  my $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
+  my $conf = new FS::Conf;
+%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>
+      <%= $title %>
+    </TITLE>
+    <META HTTP-Equiv="Cache-Control" Content="no-cache">
+    <META HTTP-Equiv="Pragma" Content="no-cache">
+    <META HTTP-Equiv="Expires" Content="0"> 
+    <%= $head %>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8" <%= $etc %>>
+    <FONT SIZE=6>
+      <CENTER><%= $title %></CENTER>
+    </FONT>
+    <BR><!--<BR>-->
-- 
cgit v1.2.1


From 265a8a9728e907ccee97ed395e6eca3014deb890 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jun 2006 12:58:43 +0000
Subject: need the OLiframecontent sub

---
 httemplate/view/cust_main.cgi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index e7b3319c7..89ddc38f2 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -40,6 +40,7 @@ die "Customer not found!" unless $cust_main;
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/iframecontentmws.js"></SCRIPT>
 
 <SCRIPT TYPE="text/javascript">
 function areyousure(href, message) {
-- 
cgit v1.2.1


From fd34361cbb47f911b381ad9a38fa4314d159c87c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jun 2006 13:00:09 +0000
Subject: http://www.macridesweb.com/oltest/ONCLICK.html !!!!!

---
 httemplate/view/cust_main/payment_history.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index b7621d57a..5c2aa24c9 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -70,7 +70,7 @@
 
 <% if ( $curuser->access_right('Post credit') ) { %>
 
-  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">Post credit</A>
+  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Post credit</A>
 
   <BR>
 
@@ -135,7 +135,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
     $post = '</FONT></B>';
     $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
              $cust_pay->paynum.
-             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!;
+             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
 
   } elsif (    scalar(@cust_bill_pay)   == 1
             && scalar(@cust_pay_refund) == 0
@@ -173,7 +173,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
                $cust_pay->unapplied. ' unapplied</FONT></B>'.
                qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
                $cust_pay->paynum. 
-               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!.
+               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
                '<BR>';
     }
   }
@@ -307,7 +307,7 @@ foreach my $cust_credit ($cust_main->cust_credit) {
     $post = '</FONT></B>';
     $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
              $cust_credit->crednum.
-             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!;
+             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
   } elsif (    scalar(@cust_credit_bill)   == 1
             && scalar(@cust_credit_refund) == 0
             && $cust_credit->credited == 0      ) {
@@ -343,7 +343,7 @@ foreach my $cust_credit ($cust_main->cust_credit) {
                $cust_credit->credited. ' unapplied</FONT></B>'.
                qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
                $cust_credit->crednum.
-               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!.
+               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
                '<BR>';
     }
   }
-- 
cgit v1.2.1


From 23c176909c814f9772e3bd8de7cef24887de8a5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jun 2006 13:00:43 +0000
Subject: oops, don't want this debugging in here

---
 httemplate/elements/iframecontentmws.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/httemplate/elements/iframecontentmws.js b/httemplate/elements/iframecontentmws.js
index 9df9cf681..c80998957 100644
--- a/httemplate/elements/iframecontentmws.js
+++ b/httemplate/elements/iframecontentmws.js
@@ -12,7 +12,6 @@
 */
 
 function OLiframeContent(src, width, height, name, frameborder) {
- alert(src);
  return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
  +(name!=null?' name="'+name+'" id="'+name+'"':'')
  +(frameborder!=null?' frameborder="'+frameborder+'"':'')
-- 
cgit v1.2.1


From 8af88c7428552043516f529007645ab489b32063 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jun 2006 16:26:48 +0000
Subject: fix show/hide disabled link interaction w/pager

---
 httemplate/browse/part_pkg.cgi | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 41d86358c..b67a5e55f 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -53,11 +53,14 @@ my $posttotal;
 if ( $cgi->param('showdisabled') ) {
   $cgi->param('showdisabled', 0);
   $posttotal = '( <a href="'. $cgi->self_url. '">hide disabled packages</a> )';
+  $cgi->param('showdisabled', 1);
 } else {
   $cgi->param('showdisabled', 1);
   $posttotal = '( <a href="'. $cgi->self_url. '">show disabled packages</a> )';
+  $cgi->param('showdisabled', 0);
 }
 
+
 # ------
 
 my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ];
@@ -68,7 +71,8 @@ my $align = 'rll';
 my @links = ( $link, $link, '' );
 my @style = ( '', '', '' );
 
-unless ( $cgi->param('showdisabled') ) { #its been reversed already
+#unless ( $cgi->param('showdisabled') ) { #its been reversed already
+if ( $cgi->param('showdisabled') ) { #its been reversed already
   push @header, 'Status';
   push @fields, sub { shift->disabled
                         ? '<FONT COLOR="#FF0000">DISABLED</FONT>'
-- 
cgit v1.2.1


From 9608be1f5c73517fc348f1ab458892b34ed7facb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Jun 2006 16:41:45 +0000
Subject: Add the ability to link customer service definition fields to
 inventory   classes, with an "automatic/manual" flag.  Add the ability for
 the web   interface to maintain these links.  Start prettying up the service
 def.   edit in preparation for Bigger Changes.

---
 FS/FS/part_svc.pm                     |  21 ++-
 FS/FS/part_svc_column.pm              |  10 +-
 httemplate/browse/part_svc.cgi        |  28 +++-
 httemplate/edit/part_svc.cgi          | 271 ++++++++++++++++++++++++++--------
 httemplate/elements/select-table.html |  16 +-
 httemplate/elements/table-grid.html   |   8 +-
 6 files changed, 273 insertions(+), 81 deletions(-)

diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 1a478a9cd..7f791947a 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -11,7 +11,7 @@ use FS::cust_svc;
 
 @ISA = qw(FS::Record);
 
-$DEBUG = 0;
+$DEBUG = 1;
 
 =head1 NAME
 
@@ -79,7 +79,7 @@ the part_svc_column table appropriately (see L<FS::part_svc_column>).
 
 =item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
 
-=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed.  For virtual fields, can also be 'X' for excluded.
+=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null or empty (no default), `D' for default, `F' for fixed (unchangeable), `M' for manual selection from inventory, or `A' for automatic selection from inventory.  For virtual fields, can also be 'X' for excluded.
 
 =back
 
@@ -142,7 +142,8 @@ sub insert {
     } );
 
     my $flag = $self->getfield($svcdb.'__'.$field.'_flag');
-    if ( uc($flag) =~ /^([DFX])$/ ) {
+    #if ( uc($flag) =~ /^([DFMAX])$/ ) {
+    if ( uc($flag) =~ /^([A-Z])$/ ) { #part_svc_column will test it
       $part_svc_column->setfield('columnflag', $1);
       $part_svc_column->setfield('columnvalue',
         $self->getfield($svcdb.'__'.$field)
@@ -260,7 +261,8 @@ sub replace {
       } );
 
       my $flag = $new->getfield($svcdb.'__'.$field.'_flag');
-      if ( uc($flag) =~ /^([DFX])$/ ) {
+      #if ( uc($flag) =~ /^([DFMAX])$/ ) {
+      if ( uc($flag) =~ /^([A-Z])$/ ) { #part_svc_column will test it
         $part_svc_column->setfield('columnflag', $1);
         $part_svc_column->setfield('columnvalue',
           $new->getfield($svcdb.'__'.$field)
@@ -536,7 +538,16 @@ sub process {
         map { my $svcdb = $_;
               my @fields = fields($svcdb);
               push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
-              map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
+
+              map {
+                    if ( $param->{ $svcdb.'__'.$_.'_flag' } =~ /^[MA]$/ ) {
+                      $param->{ $svcdb.'__'.$_ } =
+                        delete( $param->{ $svcdb.'__'.$_.'_classnum' } );
+                    }
+                    ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' );
+                  }
+                  @fields;
+
             } grep defined( dbdef->table($_) ),
                    qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
       )
diff --git a/FS/FS/part_svc_column.pm b/FS/FS/part_svc_column.pm
index 0450b35ef..fb08eaa0d 100644
--- a/FS/FS/part_svc_column.pm
+++ b/FS/FS/part_svc_column.pm
@@ -41,7 +41,7 @@ fields are currently supported:
 
 =item columnvalue - default or fixed value for the column
 
-=item columnflag - null, D, F, X (virtual fields)
+=item columnflag - null or empty (no default), `D' for default, `F' for fixed (unchangeable), `M' for manual selection from inventory, or `A' for automatic selection from inventory.  For virtual fields, can also be 'X' for excluded.
 
 =back
 
@@ -91,10 +91,16 @@ sub check {
   ;
   return $error if $error;
 
-  $self->columnflag =~ /^([DFX])$/
+  $self->columnflag =~ /^([DFMAX])$/
     or return "illegal columnflag ". $self->columnflag;
   $self->columnflag(uc($1));
 
+  if ( $self->columnflag =~ /^[MA]$/ ) {
+    $error =
+      $self->ut_foreign_key( 'columnvalue', 'inventory_class', 'classnum' );
+    return $error if $error;
+  }
+
   $self->SUPER::check;
 }
 
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index eef2676c0..805bd88b9 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,9 +1,15 @@
 <% 
 
+#code duplication w/ edit/part_svc.cgi, should move this hash to part_svc.pm
 my %flag = (
-  'D' => 'Default',
-  'F' => 'Fixed',
   ''  => '',
+  'D' => 'Default',
+  'F' => 'Fixed (unchangeable)',
+  #'M' => 'Manual selection from inventory',
+  'M' => 'Manual selected from inventory',
+  #'A' => 'Automatically fill in from inventory',
+  'A' => 'Automatically filled in from inventory',
+  'X' => 'Excluded',
 );
 
 my %search;
@@ -27,6 +33,8 @@ if ( $cgi->param('orderby') eq 'active' ) {
   @part_svc = sort { lc($a->svc) cmp lc($b->svc) } @part_svc;
 }
 
+my %inventory_class = ();
+
 %>
 <%= include("/elements/header.html",'Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
@@ -125,7 +133,21 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
      <%= $n1 %>
      <TD><%= $field %></TD>
      <TD><%= $flag{$flag} %></TD>
-     <TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
+
+     <TD>
+       <% my $value = $part_svc->part_svc_column($field)->columnvalue;
+          if ( $flag =~ /^[MA]$/ ) { 
+            $inventory_class{$value}
+              ||= qsearchs('inventory_class', { 'classnum' => $value } );
+       %>
+            <%= $inventory_class{$value}
+                  ? $inventory_class{$value}->classname
+                  : "WARNING: inventory_class.classnum $value not found" %>
+       <% } else { %>
+            <%= $value %>
+       <% } %>
+     </TD>
+
 
 <%     $n1="</TR><TR>";
      }
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index c5fff25e0..77011e9dd 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -38,28 +38,24 @@ Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>"><BR>
 Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
 <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <BR>
-Services are items you offer to your customers.
-<UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
+Service definitions are the templates for items you offer to your customers.
+<UL><LI>svc_acct - Accounts - anything with a username (Mailboxes, PPP accounts, shell accounts, etc.)
     <LI>svc_domain - Domains
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
-    <LI>svc_broadband - Broadband/High-speed Internet service
+    <LI>svc_broadband - Broadband/High-speed Internet service (always-on)
     <LI>svc_external - Externally-tracked service
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
 -->
 </UL>
 For the selected table, you can give fields default or fixed (unchangable)
-values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
-<B>slipip</B> of <B>0.0.0.0</B>, while a POP mailbox will probably have a fixed
-blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
-<B>/usr/bin/passwd</B>.
+values, or select an inventory class to manually or automatically fill in
+that field.
 <BR><BR>
 
 <%
 
-my %vfields;
-
 #these might belong somewhere else for other user interfaces 
 #pry need to eventually create stuff that's shared amount UIs
 my $conf = new FS::Conf;
@@ -77,28 +73,42 @@ my %defs = (
                      select_label => 'city',
                    },
     'username'  => {
-                      desc => 'Username',
-                      type => 'disabled',
+                     desc => 'Username',
+                     type => 'text',
+                     disable_default => 1,
+                     disable_fixed => 1,
+                   },
+    'quota'     => { 
+                     desc => '',
+                     type => 'text',
+                     disable_inventory => 1,
                    },
-    'quota'     => '',
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => {
-                     desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file, set to blank for no shell tracking)',
+                     #desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file, set to blank for no shell tracking)',
+                     desc =>'Shell ( set to blank for no shell tracking)',
                      type =>'select',
                      select_list => [ $conf->config('shells') ],
+                     disable_inventory => 1,
                    },
-    'finger'    => 'GECOS',
+    'finger'    => 'Real name (GECOS)',
     'domsvc'    => {
                      desc =>'svcnum from svc_domain',
                      type =>'select',
                      select_table => 'svc_domain',
                      select_key   => 'svcnum',
                      select_label => 'domain',
+                     disable_inventory => 1,
                    },
     'usergroup' => {
                      desc =>'RADIUS groups',
                      type =>'radius_usergroup_selector',
+                     disable_inventory => 1,
+                   },
+    'seconds'   => { desc => '',
+                     type => 'text',
+                     disable_inventory => 1,
                    },
   },
   'svc_domain' => {
@@ -132,6 +142,7 @@ my %defs = (
   },
 );
 
+  my %vfields;
   foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
     my $self = "FS::$svcdb"->new;
     $vfields{$svcdb} = {};
@@ -149,6 +160,37 @@ my %defs = (
       warn "\$vfields{$svcdb}->{$field} = $pvf";
     } #next $field
   } #next $svcdb
+
+  #code duplication w/ edit/part_svc.cgi, should move this hash to part_svc.pm
+  # and generalize the subs
+  # condition sub is tested to see whether to disable display of this choice
+  # params: ( $def, $layer, $field )  (see SUB below)
+  my $inv_sub = sub {
+    ref($_[0]) && (    $_[0]->{disable_inventory} 
+                    || $_[0]->{'type'} ne 'text'  )
+  };
+  tie my %flag, 'Tie::IxHash',
+    ''  => { 'desc' => 'No default', },
+    'D' => { 'desc' => 'Default',
+             'condition' =>
+               sub { ref($_[0]) && $_[0]->{disable_default} }, 
+           },
+    'F' => { 'desc' => 'Fixed (unchangeable)',
+             'condition' =>
+               sub { ref($_[0]) && $_[0]->{disable_fixed} }, 
+           },
+    'M' => { 'desc' => 'Manual selection from inventory',
+             'condition' => $inv_sub,
+           },
+    'A' => { 'desc' => 'Automatically fill in from inventory',
+             'condition' => $inv_sub,
+           },
+    'X' => { 'desc' => 'Excluded',
+             'condition' =>
+               sub { ! $vfields{$_[1]}->{$_[2]} },
+
+           },
+  ;
   
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
@@ -174,8 +216,8 @@ my %defs = (
       my @part_export =
         map { qsearch( 'part_export', {exporttype => $_ } ) }
           keys %{FS::part_export::export_info($layer)};
-      $html .= '<BR><BR>'. table().
-               table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
+      $html .= '<BR><BR>'. table(). 
+               "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
         $html .= '<TD><INPUT TYPE="checkbox"'.
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
@@ -191,75 +233,176 @@ my %defs = (
       }
       $html .= '</TR></TABLE><BR><BR>';
 
-      $html .=  table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
+      $html .= include('/elements/table-grid.html', 'cellpadding' => 4 ).
+               '<TR>'.
+                 '<TH CLASS="grid" BGCOLOR="#cccccc">Field</TH>'.
+                 '<TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=2>Modifier</TH>'.
+               '</TR>';
+
+      my $bgcolor1 = '#eeeeee';
+      my $bgcolor2 = '#ffffff';
+      my $bgcolor;
+
       #yucky kludge
       my @fields = defined( dbdef->table($layer) )
                       ? grep { $_ ne 'svcnum' } fields($layer)
                       : ();
       push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
       $part_svc->svcpart($clone) if $clone; #haha, undone below
+
+
       foreach my $field (@fields) {
+
         my $part_svc_column = $part_svc->part_svc_column($field);
         my $value = $part_svc_column->columnvalue;
         my $flag = $part_svc_column->columnflag;
         my $def = $defs{$layer}{$field};
         my $desc = ref($def) ? $def->{desc} : $def;
+
+        if ( $bgcolor eq $bgcolor1 ) {
+          $bgcolor = $bgcolor2;
+        } else {
+          $bgcolor = $bgcolor1;
+        }
         
-        $html .= "<TR><TD>$field";
+        $html .= qq!<TR><TD CLASS="grid" BGCOLOR="$bgcolor" ALIGN="right">!.
+                 $field;
         $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
         $html .=  "</TD>";
         $flag = '' if ref($def) && $def->{type} eq 'disabled';
-        $html .=
-          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
-          ' CHECKED'x($flag eq ''). ">Off</TD>".
-          '<TD>';
-        unless ( ref($def) && $def->{type} eq 'disabled' ) {
-          $html .= 
-            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
-            ' CHECKED'x($flag eq 'D'). ">Default ".
-            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
-            ' CHECKED'x($flag eq 'F'). ">Fixed ";
-          $html .= '<BR>';
-        }
-        if ( ref($def) ) {
-          if ( $def->{type} eq 'select' ) {
-            $html .= qq!<SELECT NAME="${layer}__${field}">!;
-            $html .= '<OPTION> </OPTION>' unless $value;
-            if ( $def->{select_table} ) {
-              foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
-                my $rvalue = $record->getfield($def->{select_key});
-                $html .= qq!<OPTION VALUE="$rvalue"!.
-                         ( $rvalue==$value ? ' SELECTED>' : '>' ).
-                         $record->getfield($def->{select_label}). '</OPTION>';
-              } #next $record
-            } else { # select_list
-              foreach my $item ( @{$def->{select_list}} ) {
-                $html .= qq!<OPTION VALUE="$item"!.
-                         ( $item eq $value ? ' SELECTED>' : '>' ).
-                         $item. '</OPTION>';
-              } #next $item
-            } #endif
-            $html .= '</SELECT>';
-          } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
-            $html .= FS::svc_acct::radius_usergroup_selector(
-              [ split(',', $value) ], "${layer}__${field}" );
-          } elsif ( $def->{type} eq 'disabled' ) {
-            $html .=
-              qq!<INPUT TYPE="hidden" NAME="${layer}__${field}" VALUE="">!;
-          } else {
-            $html .= '<font color="#ff0000">unknown type'. $def->{type};
-          }
+
+        $html .= qq!<TD CLASS="grid" BGCOLOR="$bgcolor">!;
+
+        if ( ref($def) && $def->{type} eq 'disabled' ) {
+        
+          $html .= 'No default';
+
         } else {
-          $html .=
-            qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value">!;
+
+          $html .= qq!<SELECT NAME="${layer}__${field}_flag"!.
+                      qq! onChange="${layer}__${field}_flag_changed(this)">!;
+
+          foreach my $f ( keys %flag ) {
+
+            #here is where the SUB from above is called, to skip some choices
+            next if $flag{$f}->{condition}
+                 && &{ $flag{$f}->{condition} }( $def, $layer, $field );
+
+            $html .= qq!<OPTION VALUE="$f"!.
+                     ' SELECTED'x($flag eq $f ).
+                     '>'. $flag{$f}->{desc};
+
+          }
+
+          $html .= '</SELECT>';
+
+          $html .= join("\n",
+            '<SCRIPT>',
+            "  function ${layer}__${field}_flag_changed(what) {",
+            '    var f = what.options[what.selectedIndex].value;',
+            '    if ( f == "" || f == "X" ) { //disable',
+            "      what.form.${layer}__${field}.disabled = true;".
+            "      what.form.${layer}__${field}.style.backgroundColor = '#dddddd';".
+            "      if ( what.form.${layer}__${field}_classnum ) {".
+            "        what.form.${layer}__${field}_classnum.disabled = true;".
+            "        what.form.${layer}__${field}_classnum.style.backgroundColor = '#dddddd';".
+            "      }".
+            '    } else if ( f == "D" || f == "F" ) { //enable, text box',
+            "      what.form.${layer}__${field}.disabled = false;".
+            "      what.form.${layer}__${field}.style.backgroundColor = '#ffffff';".
+            "      what.form.${layer}__${field}.style.display = '';".
+            "      if ( what.form.${layer}__${field}_classnum ) {".
+            "        what.form.${layer}__${field}_classnum.disabled = false;".
+            "        what.form.${layer}__${field}_classnum.style.backgroundColor = '#ffffff';".
+            "        what.form.${layer}__${field}_classnum.style.display = 'none';".
+            "      }".
+            '    } else if ( f == "M" || f == "A" ) { //enable, inventory',
+            "      what.form.${layer}__${field}.disabled = false;".
+            "      what.form.${layer}__${field}.style.backgroundColor = '#ffffff';".
+            "      what.form.${layer}__${field}.style.display = 'none';".
+            "      if ( what.form.${layer}__${field}_classnum ) {".
+            "        what.form.${layer}__${field}_classnum.disabled = false;".
+            "        what.form.${layer}__${field}_classnum.style.backgroundColor = '#ffffff';".
+            "        what.form.${layer}__${field}_classnum.style.display = '';".
+            "      }".
+            '    }',
+            '  }',
+            '</SCRIPT>',
+          );
+
         }
 
-        if($vfields{$layer}->{$field}) {
-          $html .= qq!<BR><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="X"!.
-          ' CHECKED'x($flag eq 'X'). ">Excluded ";
+        $html .= qq!</TD><TD CLASS="grid" BGCOLOR="$bgcolor">!;
+
+        my $disabled = $flag ? ''
+                             : 'DISABLED STYLE="background-color: #dddddd"';
+
+        if ( ! ref($def) || $def->{type} eq 'text' ) {
+
+          my $nodisplay = ' STYLE="display:none"';
+          my $is_inv = ( $flag =~ /^[MA]$/ );
+
+          $html .=
+            qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value" !.
+            $disabled.
+            ( $is_inv ? $nodisplay : $disabled ).
+            '>';
+
+          $html .= include('/elements/select-table.html',
+                             'element_name' => "${layer}__${field}_classnum",
+                             'element_etc'  => ( $is_inv
+                                                   ? $disabled
+                                                   : $nodisplay
+                                               ),
+                             'table'        => 'inventory_class',
+                             'name_col'     => 'classname',
+                             'value'        => $value,
+                             'empty_label'  => 'Select inventory class',
+                          );
+
+        } elsif ( $def->{type} eq 'select' ) {
+
+          $html .= qq!<SELECT NAME="${layer}__${field}" $disabled>!;
+          $html .= '<OPTION> </OPTION>' unless $value;
+          if ( $def->{select_table} ) {
+            foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+              my $rvalue = $record->getfield($def->{select_key});
+              $html .= qq!<OPTION VALUE="$rvalue"!.
+                       ( $rvalue==$value ? ' SELECTED>' : '>' ).
+                       $record->getfield($def->{select_label}). '</OPTION>';
+            } #next $record
+          } else { # select_list
+            foreach my $item ( @{$def->{select_list}} ) {
+              $html .= qq!<OPTION VALUE="$item"!.
+                       ( $item eq $value ? ' SELECTED>' : '>' ).
+                       $item. '</OPTION>';
+            } #next $item
+          } #endif
+          $html .= '</SELECT>';
+
+        } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
+
+          #XXX disable the RADIUS usergroup selector?  ugh it sure does need
+          #an overhaul, people have dum group problems because of it
+
+          $html .= FS::svc_acct::radius_usergroup_selector(
+            [ split(',', $value) ], "${layer}__${field}" );
+
+        } elsif ( $def->{type} eq 'disabled' ) {
+
+          $html .=
+            qq!<INPUT TYPE="hidden" NAME="${layer}__${field}" VALUE="">!;
+
+        } else {
+
+          $html .= '<font color="#ff0000">unknown type'. $def->{type};
+
         }
+
         $html .= "</TD></TR>\n";
-      }
+
+      } #foreach my $field (@fields) {
+
       $part_svc->svcpart('') if $clone; #undone
       $html .= "</TABLE>";
 
diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html
index 6c8089b31..36eb4e211 100644
--- a/httemplate/elements/select-table.html
+++ b/httemplate/elements/select-table.html
@@ -8,11 +8,15 @@
   # 'value'    => 'current_value',
   #
   ##opt
-  # 'empty_label' => '', #better specify it though, the default might change
-  # 'hashref'     => {},
-  # 'extra_sql'   => '',
-  # 'records'     => \@records, #instead of hashref
-  # 'pre_options' => [ 'value' => 'option' ], #before normal options
+  # 'empty_label'  => '', #better specify it though, the default might change
+  # 'hashref'      => {},
+  # 'extra_sql'    => '',
+  # 'records'      => \@records, #instead of hashref
+  # 'pre_options'  => [ 'value' => 'option' ], #before normal options
+  # 'element_name' => '', #HTML element name, defaults to the name of
+  #                       # the primary key column
+  # 'element_etc'  => '', #additional attributes (i.e. "DISABLED") for the
+  #                       #<SELECT> element
 
   my( %opt ) = @_;
 
@@ -37,7 +41,7 @@
 
 %>
 
-<SELECT NAME="<%= $key %>">
+<SELECT NAME="<%= $opt{'element_name'} || $key %>" <%= $opt{'element_etc'} %>>
 
   <% while ( @pre_options ) { %>
     <OPTION VALUE="<%= shift(@pre_options) %>"><%= shift(@pre_options) %>
diff --git a/httemplate/elements/table-grid.html b/httemplate/elements/table-grid.html
index 80611f511..17eafdf1a 100644
--- a/httemplate/elements/table-grid.html
+++ b/httemplate/elements/table-grid.html
@@ -1,8 +1,14 @@
+<%
+  my %opt = @_;
+  $opt{cellspacing} ||= 0;
+  $opt{cellpadding} ||= 0;
+
+%>
 <STYLE TYPE="text/css">
 .grid table { border: solid; empty-cells: show }
 .grid TH { padding-left: 3px; padding-right: 3px; border: 1px solid #dddddd; border-bottom: dashed 1px black; border-right: none }
 .grid TD { padding-left: 3px; padding-right: 3px; empty-cells: show; border: 1px solid #cccccc; border-bottom: none; border-right: none }
 </STYLE>
 
-<TABLE CLASS="grid" CELLSPACING=0 CELLPADDING=0 BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
+<TABLE CLASS="grid" CELLSPACING=<%= $opt{cellspacing} %> CELLPADDING=<%= $opt{cellpadding} %> BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
 
-- 
cgit v1.2.1


From 3a68d152457d4656ccaa41246e52b8584b000e19 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 27 Jun 2006 14:19:16 +0000
Subject: going to wikiland

---
 httemplate/docs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index bec62e34a..1693b6d9b 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -6,7 +6,7 @@
 <img src="overview-new.png">
 <h3>Installation and upgrades</h3>
 <ul>
-  <li><a href="install.html">New Installation</a>
+  <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Installation">New Installation</a>
   <li><a href="install-rt.html">Installing integrated RT ticketing</a>
   <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
   <li><a href="upgrade-1.4.2.html">Upgrading from 1.4.1 to 1.4.2</a>
-- 
cgit v1.2.1


From 947c955be56140c4a10b16345c1b15c44b02070a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2006 13:47:44 +0000
Subject: finish at least the automatic provisioning part

---
 FS/FS/inventory_class.pm               |   2 +-
 FS/FS/svc_Common.pm                    | 206 ++++++++++++++++++++++++++++++---
 httemplate/browse/inventory_class.html |   2 +-
 httemplate/edit/part_svc.cgi           |   7 +-
 httemplate/edit/svc_acct.cgi           |  21 +---
 httemplate/edit/svc_broadband.cgi      |   9 +-
 httemplate/edit/svc_domain.cgi         |   9 +-
 httemplate/edit/svc_external.cgi       |   9 +-
 httemplate/edit/svc_forward.cgi        |   9 +-
 httemplate/edit/svc_www.cgi            |   9 +-
 httemplate/search/inventory_item.html  |  62 +++++++++-
 11 files changed, 268 insertions(+), 77 deletions(-)

diff --git a/FS/FS/inventory_class.pm b/FS/FS/inventory_class.pm
index 04ee207d3..508889bca 100644
--- a/FS/FS/inventory_class.pm
+++ b/FS/FS/inventory_class.pm
@@ -120,7 +120,7 @@ sub num_avail {
 
 sub num_sql {
   my( $self, $sql ) = @_;
-  my $sql = "AND $sql" if length($sql);
+  $sql = "AND $sql" if length($sql);
   my $statement =
     "SELECT COUNT(*) FROM inventory_item WHERE classnum = ? $sql";
   my $sth = dbh->prepare($statement) or die dbh->errstr. " preparing $statement";
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 962e36a07..f2e1b9adb 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -9,10 +9,12 @@ use FS::cust_svc;
 use FS::part_svc;
 use FS::queue;
 use FS::cust_main;
+use FS::inventory_item;
+use FS::inventory_class;
 
 @ISA = qw( FS::cust_main_Mixin FS::Record );
 
-$DEBUG = 0;
+$DEBUG = 1;
 
 =head1 NAME
 
@@ -202,6 +204,12 @@ sub insert {
     $self->svcpart($cust_svc->svcpart);
   }
 
+  $error = $self->set_auto_inventory;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
   $error = $self->SUPER::insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -297,7 +305,7 @@ sub delete {
   #new-style exports!
   unless ( $noexport_hack ) {
     foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
-      my $error = $part_export->export_delete($self);
+      $error = $part_export->export_delete($self);
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
         return "exporting to ". $part_export->exporttype.
@@ -306,11 +314,18 @@ sub delete {
     }
   }
 
-  return $error if $error;
+  $error = $self->return_inventory;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "error returning inventory: $error";
+  }
 
   my $cust_svc = $self->cust_svc;
   $error = $cust_svc->delete;
-  return $error if $error;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
@@ -338,7 +353,13 @@ sub replace {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $error = $new->SUPER::replace($old);
+  my $error = $new->set_auto_inventory;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $error = $new->SUPER::replace($old);
   if ($error) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -409,7 +430,7 @@ to test the return).  Usually called by the check method.
 
 sub setfixed {
   my $self = shift;
-  $self->setx('F');
+  $self->setx('F', @_);
 }
 
 =item setdefault
@@ -422,20 +443,68 @@ the FS::part_svc object (use ref() to test the return).
 
 sub setdefault {
   my $self = shift;
-  $self->setx('D');
+  $self->setx('D', @_ );
+}
+
+=item set_default_and_fixed
+
+=cut
+
+sub set_default_and_fixed {
+  my $self = shift;
+  $self->setx( [ 'D', 'F' ], @_ );
 }
 
+=item setx FLAG | FLAG_ARRAYREF , [ CALLBACK_HASHREF ]
+
+Sets fields according to the passed in flag or arrayref of flags.
+
+Optionally, a hashref of field names and callback coderefs can be passed.
+If a coderef exists for a given field name, instead of setting the field,
+the coderef is called with the column value (part_svc_column.columnvalue)
+as the single parameter.
+
+=cut
+
 sub setx {
   my $self = shift;
   my $x = shift;
+  my @x = ref($x) ? @$x : ($x);
+  my %coderef = @_ ? shift : {};
 
-  my $error;
-
-  $error =
+  my $error =
     $self->ut_numbern('svcnum')
   ;
   return $error if $error;
 
+  my $part_svc = $self->part_svc;
+  return "Unkonwn svcpart" unless $part_svc;
+
+  #set default/fixed/whatever fields from part_svc
+
+  foreach my $part_svc_column (
+    grep { my $f = $_->columnflag; grep { $f eq $_ } @x } #columnflag in @x
+    $part_svc->all_part_svc_column
+  ) {
+
+    my $columnname  = $part_svc_column->columnname;
+    my $columnvalue = $part_svc_column->columnvalue;
+
+    if ( exists( $coderef{columnname} ) ) {
+      &{ $coderef{$columnname} }( $self, $columnvalue);
+    } else {
+      $self->setfield( $columnname, $columnvalue );
+    }
+
+  }
+
+ $part_svc;
+
+}
+
+sub part_svc {
+  my $self = shift;
+
   #get part_svc
   my $svcpart;
   if ( $self->get('svcpart') ) {
@@ -445,20 +514,129 @@ sub setx {
     return "Unknown svcnum" unless $cust_svc; 
     $svcpart = $cust_svc->svcpart;
   }
-  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+
+  qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+
+}
+
+=item set_auto_inventory
+
+Sets any fields which auto-populate from inventory (see L<FS::part_svc>).
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub set_auto_inventory {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('svcnum')
+  ;
+  return $error if $error;
+
+  my $part_svc = $self->part_svc;
   return "Unkonwn svcpart" unless $part_svc;
 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   #set default/fixed/whatever fields from part_svc
   my $table = $self->table;
   foreach my $field ( grep { $_ ne 'svcnum' } $self->fields ) {
     my $part_svc_column = $part_svc->part_svc_column($field);
-    if ( $part_svc_column->columnflag eq $x ) {
-      $self->setfield( $field, $part_svc_column->columnvalue );
+    if ( $part_svc_column->columnflag eq 'A' && $self->$field() eq '' ) {
+
+      my $classnum = $part_svc_column->columnvalue;
+      my $inventory_item = qsearchs({
+        'table'     => 'inventory_item',
+        'hashref'   => { 'classnum' => $classnum, 
+                         'svcnum'   => '',
+                       },
+        'extra_sql' => 'LIMIT 1 FOR UPDATE',
+      });
+
+      unless ( $inventory_item ) {
+        $dbh->rollback if $oldAutoCommit;
+        my $inventory_class =
+          qsearchs('inventory_class', { 'classnum' => $classnum } );
+        return "Can't find inventory_class.classnum $classnum"
+          unless $inventory_class;
+        return "Out of ". $inventory_class->classname. "s\n"; #Lingua:: BS
+                                                              #for pluralizing
+      }
+
+      $inventory_item->svcnum( $self->svcnum );
+      my $ierror = $inventory_item->replace();
+      if ( $ierror ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "Error provisioning inventory: $ierror";
+        
+      }
+
+      $self->setfield( $field, $inventory_item->item );
+
     }
   }
 
- $part_svc;
+ $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+ '';
+
+}
+
+=item return_inventory
+
+=cut
+
+sub return_inventory {
+  my $self = shift;
 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $inventory_item ( $self->inventory_item ) {
+    $inventory_item->svcnum('');
+    my $error = $inventory_item->replace();
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Error returning inventory: $error";
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+}
+
+=item inventory_item
+
+Returns the inventory items associated with this svc_ record, as
+FS::inventory_item objects (see L<FS::inventory_item>.
+
+=cut
+
+sub inventory_item {
+  my $self = shift;
+  qsearch({
+    'table'     => 'inventory_item',
+    'hashref'   => { 'svcnum' => $self->svcnum, },
+  });
 }
 
 =item cust_svc
diff --git a/httemplate/browse/inventory_class.html b/httemplate/browse/inventory_class.html
index 6da3c9e3c..4a15bf7d4 100644
--- a/httemplate/browse/inventory_class.html
+++ b/httemplate/browse/inventory_class.html
@@ -8,7 +8,7 @@ tie my %labels, 'Tie::IxHash',
 
 my %link = (
   'num_avail' => ';avail=1',
-  'num_used'  => ';avail=1',
+  'num_used'  => ';used=1',
   'num_total' => '',
 );
 
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 77011e9dd..0298a5461 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -179,9 +179,10 @@ my %defs = (
              'condition' =>
                sub { ref($_[0]) && $_[0]->{disable_fixed} }, 
            },
-    'M' => { 'desc' => 'Manual selection from inventory',
-             'condition' => $inv_sub,
-           },
+# need to template-ize httemplate/edit/svc_* first
+#    'M' => { 'desc' => 'Manual selection from inventory',
+#             'condition' => $inv_sub,
+#           },
     'A' => { 'desc' => 'Automatically fill in from inventory',
              'condition' => $inv_sub,
            },
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 1e87c67ad..4b324a501 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -68,18 +68,9 @@ unless ( $svcnum || $cgi->param('error') ) { #adding
     }
   }
 
-  #set fixed and default fields from part_svc
-  foreach my $part_svc_column (
-    grep { $_->columnflag } $part_svc->all_part_svc_column
-  ) {
-    if ( $part_svc_column->columnname eq 'usergroup' ) {
-      @groups = split(',', $part_svc_column->columnvalue);
-    } else {
-      $svc_acct->setfield( $part_svc_column->columnname,
-                           $part_svc_column->columnvalue,
-                         );
-    }
-  }
+  $svc_acct->set_default_and_fixed( {
+    'usergroup' => sub { @groups = split(',', shift ); },
+  } );
 
 }
 
@@ -274,7 +265,7 @@ if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) {
 <% foreach my $xid (qw( uid gid )) { %>
 
   <%
-  if ( $part_svc->part_svc_column($xid)->columnflag eq 'F'
+  if ( $part_svc->part_svc_column($xid)->columnflag =~ /^[FA]$/
        || ! $conf->exists("svc_acct-edit_$xid")
      ) {
   %>
@@ -376,7 +367,7 @@ if ( $part_svc->part_svc_column('shell')->columnflag eq 'F'
 <% } %>
 
 
-<% if ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) { %>
+<% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { %>
 
   <INPUT TYPE="hidden" NAME="slipip" VALUE="<%= $svc_acct->slipip %>">
 
@@ -396,7 +387,7 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
   my $a = $2;
 %>
 
-  <% if ( $part_svc->part_svc_column($r)->columnflag eq 'F' ) { %>
+  <% if ( $part_svc->part_svc_column($r)->columnflag =~ /^[FA]$/ ) { %>
 
     <INPUT TYPE="hidden" NAME="<%= $r %>" VALUE="<%= $svc_acct->getfield($r) %>">
 
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index cbd0c2c3a..d66cff690 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -47,14 +47,7 @@ if ( $cgi->param('error') ) {
 
     $svcnum='';
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_broadband->setfield( $part_svc_column->columnname,
-                                $part_svc_column->columnvalue,
-                              );
-    }
+    $svc_broadband->set_default_and_fixed;
 
   }
 }
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index f47ba0a8f..1156bf0ba 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -44,14 +44,7 @@ if ( $cgi->param('error') ) {
 
     $svcnum='';
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_domain->setfield( $part_svc_column->columnname,
-                             $part_svc_column->columnvalue,
-                           );
-    }
+    $svc_domain->set_default_and_fixed;
 
   }
 
diff --git a/httemplate/edit/svc_external.cgi b/httemplate/edit/svc_external.cgi
index bcfc85e3f..38b3ce1a4 100644
--- a/httemplate/edit/svc_external.cgi
+++ b/httemplate/edit/svc_external.cgi
@@ -40,14 +40,7 @@ if ( $cgi->param('error') ) {
 
     $svcnum='';
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_external->setfield( $part_svc_column->columnname,
-                               $part_svc_column->columnvalue,
-                             );
-    }
+    $svc_external->set_default_and_fixed;
 
   }
 }
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index c1b90a9bd..c32fbd7c1 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -44,14 +44,7 @@ if ( $cgi->param('error') ) {
 
     $svcnum='';
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_forward->setfield( $part_svc_column->columnname,
-                              $part_svc_column->columnvalue,
-                            );
-    }
+    $svc_forward->set_default_and_fixed;
   }
 
 }
diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index 3cb752850..280346bb4 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -42,14 +42,7 @@ if ( $cgi->param('error') ) {
 
     $svcnum='';
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_www->setfield( $part_svc_column->columnname,
-                          $part_svc_column->columnvalue,
-                        );
-    }
+    $svc_www->set_default_and_fixed;
 
   }
 }
diff --git a/httemplate/search/inventory_item.html b/httemplate/search/inventory_item.html
index bd74f5619..7049c8841 100644
--- a/httemplate/search/inventory_item.html
+++ b/httemplate/search/inventory_item.html
@@ -24,7 +24,30 @@ if ( $cgi->param('avail') ) {
 my $count_query =
   "SELECT COUNT(*) FROM inventory_item WHERE classnum = $classnum $extra_sql";
 
+my $link = sub {
+  my $inventory_item = shift;
+  if ( $inventory_item->svcnum ) {
+    [ "${p}view/svc_acct.cgi?", 'svcnum' ];
+  } else {
+    '';
+  }
+};
+my $link_cust = sub {
+  my $inventory_item = shift;
+  if ( $inventory_item->custnum ) {
+    [ "${p}view/cust_main.cgi?", 'custnum' ];
+  } else {
+    '';
+  }
+};
+
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
 %><%= include( 'elements/search.html',
+
                  'title'       => $title,
 
                  #less lame to use Lingua:: something to pluralize
@@ -33,19 +56,52 @@ my $count_query =
                  'query'       => {
                                     'table'   => 'inventory_item',
                                     'hashref' => { 'classnum' => $classnum },
+                                    'select'  => join(', ',
+                                        'inventory_item.*',
+                                        'cust_main.custnum',
+                                        FS::UI::Web::cust_sql_fields(),
+                                      ),
                                     'extra_sql' => $extra_sql,
+                                    'addl_from' => $addl_from,
                                   },
 
                  'count_query' => $count_query,
 
-                 # XXX proper full service/customer link ala svc_acct
-                 'header'      => [ '#', $inventory_class->classname, 'svcnum' ],
+                 'header'      => [
+                   '#',
+                   $inventory_class->classname,
+                   'Service',
+                   FS::UI::Web::cust_header(),
+                 ],
 
                  'fields'      => [
                    'itemnum',
                    'item',
-                   'svcnum', #XXX proper full service customer link ala svc_acct
+                   #'svcnum', #XXX proper full service customer link ala svc_acct
                              # "unallocated" ?  "available" ?
+                   sub {
+                     #this could be way more efficient with a mixin
+                     # like cust_main_Mixin that let us all all the methods
+                     # on data we already have...
+                     my $inventory_item = shift;
+                     my $cust_svc = $inventory_item->cust_svc;
+                     if ( $cust_svc ) {
+                       my($label, $value) = $cust_svc->label;
+                       "$label: $value";
+                     } else {
+                       '(available)';
+                     }
+                   },
+
+                   \&FS::UI::Web::cust_fields,
+
+                 ],
+
+                 'links'       => [
+                   '',
+                   '',
+                   $link,
+                   ( map { $link_cust } FS::UI::Web::cust_header() ),
                  ],
 
              )
-- 
cgit v1.2.1


From daaad950e1a8314eddf59a1c7d1b77c355362dc0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2006 15:19:59 +0000
Subject: percentage late fees too

---
 httemplate/edit/part_bill_event.cgi | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 57eedbc71..32a3f2df0 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -139,13 +139,21 @@ my $money_char = $conf->config('money_char') || '$';
 tie my %events, 'Tie::IxHash',
 
   'fee' => {
-    'name'   => 'Late fee',
+    'name'   => 'Late fee (flat)',
     'code'   => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
     'html'   => 
       'Amount <INPUT TYPE="text" SIZE="7" NAME="charge" VALUE="%%%charge%%%">'.
       '<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="%%%reason%%%">',
     'weight' => 10,
   },
+  'fee_percent' => {
+    'name'   => 'Late fee (percentage)',
+    'code'   => '$cust_main->charge( sprintf(\'%.2f\', $cust_bill->owed * %%%percent%%% / 100 ), \'%%%reason%%%\' );',
+    'html'   => 
+      'Percent <INPUT TYPE="text" SIZE="2" NAME="percent" VALUE="%%%percent%%%">%'.
+      '<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="%%%reason%%%">',
+    'weight' => 10,
+  },
   'suspend' => {
     'name'   => 'Suspend',
     'code'   => '$cust_main->suspend();',
-- 
cgit v1.2.1


From fffb8cbfac6c7f2eea302691fcf4c09180128e3d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 29 Jun 2006 15:45:57 +0000
Subject: small patch to set $new_finger from Tim Yardley

---
 FS/FS/part_export/shellcommands.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 646c5ff71..e488a52b2 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -257,7 +257,7 @@ sub _export_replace {
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
-  $new_finger =~ /^(.*)\s+(\S+)$/ or $finger =~ /^((.*))$/;
+  $new_finger =~ /^(.*)\s+(\S+)$/ or $new_finger =~ /^((.*))$/;
   ($new_first, $new_last ) = ( $1, $2 );
   $new_first = shell_quote $new_first;
   $new_last = shell_quote $new_last;
-- 
cgit v1.2.1


From c930d34504a46a50eb2438f12dc896efbb15b49d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Jun 2006 14:30:26 +0000
Subject: checkin freeside-adduser with the -g flag!  sheesh

---
 FS/bin/freeside-adduser | 77 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 22 deletions(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 2eef75827..3ec2e72cd 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,27 +1,27 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.10 2006-04-13 21:29:01 ivan Exp $
+# $Id: freeside-adduser,v 1.11 2006-06-30 14:30:26 ivan Exp $
 
 use strict;
-use vars qw($opt_h $opt_b $opt_c $opt_s);
+use vars qw($opt_h $opt_b $opt_c $opt_g);
 use Fcntl qw(:flock);
 use Getopt::Std;
 
 my $FREESIDE_CONF = "/usr/local/etc/freeside";
 
-getopts("bch:s:");
+getopts("bch:g:");
 die &usage if $opt_c && ! $opt_h;
 my $user = shift or die &usage;
 
-if ( -e "$FREESIDE_CONF/mapsecrets" ) {
-  open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
-    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-  while (<MAPSECRETS>) {
-    /^(\S+) / or die "unparsable line in mapsecrets: $_";
-    die "user $user already exists\n" if $user eq $1;
-  }
-  close MAPSECRETS;
-}
+#if ( -e "$FREESIDE_CONF/mapsecrets" ) {
+#  open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
+#    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+#  while (<MAPSECRETS>) {
+#    /^(\S+) / or die "unparsable line in mapsecrets: $_";
+#    die "user $user already exists\n" if $user eq $1;
+#  }
+#  close MAPSECRETS;
+#}
 
 if ( $opt_h ) {
   my @args = ( 'htpasswd' );
@@ -32,16 +32,49 @@ if ( $opt_h ) {
   system(@args) == 0 or die "htpasswd failed: $?";
 }
 
-my $secretfile = $opt_s || 'secrets';
+#my $secretfile = $opt_s || 'secrets';
+#
+#open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
+#  and flock(MAPSECRETS,LOCK_EX)
+#    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+#print MAPSECRETS "$user $secretfile\n";
+#close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
+
+###
+
+use FS::UID qw(adminsuidsetup);
+use FS::CurrentUser;
+use FS::access_user;
+use FS::access_usergroup;
+
+$FS::CurrentUser::upgrade_hack = 1;
+#adminsuidsetup $rootuser;
+adminsuidsetup $user;
+
+my $access_user = new FS::access_user {
+  'username'  => $user,
+  '_password' => 'notyet',
+  'first'     => 'Firstname', # $opt_f || 
+  'last'      => 'Lastname',  # $opt_l || 
+};
+my $au_error = $access_user->insert;
+die $au_error if $au_error;
+
+if ( $opt_g ) {
+
+  my $access_usergroup = new FS::access_usergroup {
+    'usernum'  => $access_user->usernum,
+    'groupnum' => $opt_g,
+  };
+  my $aug_error = $access_usergroup->insert;
+  die $aug_error if $aug_error;
+
+}
 
-open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
-  and flock(MAPSECRETS,LOCK_EX)
-    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-print MAPSECRETS "$user $secretfile\n";
-close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
+###
 
 sub usage {
-  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -s secretfile ] username"
+  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -g groupnum ] username"
 }
 
 =head1 NAME
@@ -50,7 +83,7 @@ freeside-adduser - Command line interface to add (freeside) users.
 
 =head1 SYNOPSIS
 
-  freeside-adduser [ -h htpasswd_file [ -c ] ] [ -s secretfile ] username
+  freeside-adduser [ -h htpasswd_file [ -c ] ] -g 1 username
 
 =head1 DESCRIPTION
 
@@ -61,10 +94,10 @@ sales/tech folks) to the web interface, not for adding customer accounts.
 
   -c: Passed to htpasswd(1)
 
-  -s: Specify an alternate secret file
-
   -b: same as htpasswd(1), probably insecure, not recommended
 
+  -g: initial groupnum
+
 =head1 SEE ALSO
 
 L<htpasswd>(1), base Freeside documentation
-- 
cgit v1.2.1


From b63800b2aaca886ae42c0f61f83ae2e2f0b4c44f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 1 Jul 2006 11:26:06 +0000
Subject: another Pg 8.1 fix?  noticed by Damon Vincent

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index fa0d2d87e..9a99aebe7 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -763,7 +763,7 @@ sub insert {
       #my $i_sql = "SELECT $primary_key FROM $table WHERE oid = ?";
 
       my $default = $self->dbdef_table->column($primary_key)->default;
-      unless ( $default =~ /^nextval\('"?([\w\.]+)"?'/i ) {
+      unless ( $default =~ /^nextval\(\(?'"?([\w\.]+)"?'/i ) {
         dbh->rollback if $FS::UID::AutoCommit;
         return "can't parse $table.$primary_key default value".
                " for sequence name: $default";
-- 
cgit v1.2.1


From 079be338fb0e200309777249f9e3ea1d115d374e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Jul 2006 12:01:03 +0000
Subject: adding freeside-addgroup

---
 FS/MANIFEST              |  1 +
 FS/bin/freeside-addgroup | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
 FS/bin/freeside-adduser  |  2 --
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100755 FS/bin/freeside-addgroup

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 6db82710c..3c315fc97 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -5,6 +5,7 @@ Makefile.PL
 README
 bin/freeside-addoutsource
 bin/freeside-addoutsourceuser
+bin/freeside-addgroup
 bin/freeside-adduser
 bin/freeside-apply-credits
 bin/freeside-bill
diff --git a/FS/bin/freeside-addgroup b/FS/bin/freeside-addgroup
new file mode 100755
index 000000000..7b30f7d95
--- /dev/null
+++ b/FS/bin/freeside-addgroup
@@ -0,0 +1,50 @@
+#!/usr/bin/perl
+
+use strict;
+use vars qw($opt_s);
+use Getopt::Std;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch);
+use FS::CurrentUser;
+use FS::AccessRight;
+use FS::access_group;
+use FS::access_right;
+use FS::access_groupagent;
+
+getopts("s");
+my $user = shift or die &usage; #just for adminsuidsetup
+my $group = shift or die &usage;
+
+$FS::CurrentUser::upgrade_hack = 1;
+#adminsuidsetup $rootuser;
+adminsuidsetup $user;
+
+my $access_group = new FS::access_group { 'groupname' => $group };
+my $error = $access_group->insert;
+die $error if $error;
+
+if ( $opt_s ) {
+  foreach my $rightname ( FS::AccessRight->rights ) {
+    my $access_right = new FS::access_right {
+      'righttype'   => 'FS::access_group',
+      'rightobjnum' => $access_group->groupnum,
+      'rightname'   => $rightname,
+    };
+    my $ar_error = $access_right->insert;
+    die $ar_error if $ar_error;
+  }
+
+  foreach my $agent ( qsearch('agent', {} ) ) {
+    my $access_groupagent = new FS::access_groupagent {
+      'groupnum' => $access_group->groupnum,
+      'agentnum' => $agent->agentnum,
+    };
+    my $aga_error = $access_groupagent->insert;
+    die $aga_error if $aga_error;
+  }
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-addgroup [ -s ] username groupname"
+}
+
diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 3ec2e72cd..0d8b454bf 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,6 +1,4 @@
 #!/usr/bin/perl -w
-#
-# $Id: freeside-adduser,v 1.11 2006-06-30 14:30:26 ivan Exp $
 
 use strict;
 use vars qw($opt_h $opt_b $opt_c $opt_g);
-- 
cgit v1.2.1


From fae06b0c549ff10468804c7283f0a636a7320e4a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 5 Jul 2006 11:23:52 +0000
Subject: hint about permissions and users

---
 README.1.7.0 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.1.7.0 b/README.1.7.0
index 4ce58cc64..69b395a34 100644
--- a/README.1.7.0
+++ b/README.1.7.0
@@ -19,7 +19,8 @@ run "freeside-upgrade username" to uprade your database schema
  anything else connected to your database, especially on older Pg versions)
 
 ACL bootstrapping:
-  - Run "bin/mapsecrets2access_user username"
+  - cd /usr/local/etc/freeside; chown freeside mapsecrets htpasswd
+  - Run "bin/mapsecrets2access_user username" as the freeside user
   - You can then add more restrictive groups and move your users into them
 
 If you have any records in the cust_tax_exempt table, you *MUST* migrate them
-- 
cgit v1.2.1


From 1f759ea4c4755370080bf72f339e18ab863756c7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 5 Jul 2006 14:55:28 +0000
Subject: patch to fix fuzzy searching from Ryan Gunn

---
 FS/FS/cust_main.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 511762e63..cbcf6cc51 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3886,7 +3886,7 @@ sub smart_search {
       push @cust_main, qsearch( {
         'table'     => 'cust_main',
         'hashref'   => { 'last'     => { 'op'    => 'ILIKE',
-                                         'value' => "%$q_value%" },
+                                         'value' => "%$value%" },
                          %options,
                        },
         'extra_sql' => " AND $agentnums_sql", #agent virtualizaiton
@@ -3894,7 +3894,7 @@ sub smart_search {
       push @cust_main, qsearch( {
         'table'     => 'cust_main',
         'hashref'   => { 'ship_last' => { 'op'     => 'ILIKE',
-                                          'value' => "%$q_value%" },
+                                          'value' => "%$value%" },
                          %options, 
                        },
         'extra_sql' => " AND $agentnums_sql", #agent virtualization
@@ -3904,7 +3904,7 @@ sub smart_search {
       push @cust_main, qsearch( {
         'table'     => 'cust_main',
         'hashref'   => { 'company'  => { 'op'    => 'ILIKE',
-                                         'value' => "%$q_value%" },
+                                         'value' => "%$value%" },
                          %options,
                        },
         'extra_sql' => " AND $agentnums_sql", #agent virtualization
@@ -3912,7 +3912,7 @@ sub smart_search {
       push @cust_main, qsearch(  {
         'table'     => 'cust_main',
         'hashref'   => { 'ship_company' => { 'op'    => 'ILIKE',
-                                             'value' => "%$q_value%" },
+                                             'value' => "%$value%" },
                          %options,
                        },
         'extra_sql' => " AND $agentnums_sql", #agent virtualization
-- 
cgit v1.2.1


From a8665e44dbd99bd864e48231928405a31cedce5f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 9 Jul 2006 14:35:30 +0000
Subject: fix the image path in the kludged looknfeel integration

---
 rt/html/Elements/Header     | 2 +-
 rt/html/Elements/PageLayout | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index bad8b58eb..c1bc92afd 100644
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -67,7 +67,7 @@ function hideshow(num) {
 </script>
 <& /Elements/Callback, _CallbackName => 'Head', %ARGS &>
 </HEAD>
-<BODY BACKGROUND="<%$fsurl%>images/background-cheat.png" STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0" 
+<BODY BACKGROUND="<% $RT::URI::freeside::URL %>/images/background-cheat.png" STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0" 
 % if ($Focus) {
 ONLOAD="
     var tmp = (document.getElementsByName('<% $Focus %>'));
diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout
index dd0fd7504..52353fa46 100644
--- a/rt/html/Elements/PageLayout
+++ b/rt/html/Elements/PageLayout
@@ -45,7 +45,7 @@
 %# END BPS TAGGED BLOCK }}}
 <table class="black" border=0 cellspacing=0 cellpadding=0 width="100%">
 <tr>
-  <TD colspan=5 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
+  <TD colspan=5 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>/images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
 </tr>
 <tr>
 %#  <th class="black" align="left" width=15%><span class="rtname"><%$AppName%></span>
@@ -62,15 +62,15 @@
 <table border=0 cellspacing=0 cellpadding=0 width="100%" height="100%">
 <TR>
   <TD BGCOLOR="#000000" STYLE="padding:0" WIDTH="154"></TD>
-  <TD STYLE="padding:0" WIDTH="13"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gray-corner.png"></TD>
-  <TD STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gray-top.png" HEIGHT="13" WIDTH="100%"></TD>
+  <TD STYLE="padding:0" WIDTH="13"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>/images/black-gray-corner.png"></TD>
+  <TD STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>/images/black-gray-top.png" HEIGHT="13" WIDTH="100%"></TD>
 </TR>
 %# Vertical menu
 <TR height="100%">
 <TD valign="top" width="140" class="black">
           <& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &>
 </TD>
-<TD STYLE="padding:0" HEIGHT="100%" WIDTH=13 VALIGN="top"><IMG WIDTH="13" HEIGHT="100%" BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gray-side.png"></TD>
+<TD STYLE="padding:0" HEIGHT="100%" WIDTH=13 VALIGN="top"><IMG WIDTH="13" HEIGHT="100%" BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>/images/black-gray-side.png"></TD>
 <td valign="top">
 <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
-- 
cgit v1.2.1


From 1053db7f76169cbbc87840539959a4c362aff242 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Jul 2006 00:20:23 +0000
Subject: svc_phone service and CDR billing from imported CDRs

---
 FS/FS/AccessRight.pm                             |   2 +
 FS/FS/Record.pm                                  |   2 +-
 FS/FS/Schema.pm                                  |  12 ++
 FS/FS/cdr.pm                                     |  83 ++++++++++++-
 FS/FS/cust_svc.pm                                |  24 ++--
 FS/FS/h_svc_phone.pm                             |  33 +++++
 FS/FS/part_pkg/voip_cdr.pm                       | 146 ++++++++++++-----------
 FS/FS/part_svc.pm                                |  10 +-
 FS/FS/svc_phone.pm                               | 146 +++++++++++++++++++++++
 FS/MANIFEST                                      |   3 +
 htetc/handler.pl                                 |   1 +
 httemplate/edit/elements/edit.html               |  68 +++++++----
 httemplate/edit/elements/svc_Common.html         |  98 +++++++++++++++
 httemplate/edit/part_svc.cgi                     |  25 +++-
 httemplate/edit/process/elements/process.html    |  15 ++-
 httemplate/edit/process/elements/svc_Common.html |  14 +++
 httemplate/edit/process/svc_phone.html           |   4 +
 httemplate/edit/svc_phone.cgi                    |  11 ++
 httemplate/elements/menu.html                    |  22 +++-
 httemplate/misc/cdr-import.html                  |   3 +-
 httemplate/search/cdr.html                       |   6 +-
 httemplate/search/report_cdr.html                |   2 +-
 httemplate/search/svc_phone.cgi                  |  94 +++++++++++++++
 httemplate/view/elements/svc_Common.html         | 116 ++++++++++++++++++
 httemplate/view/svc_phone.cgi                    |  10 ++
 25 files changed, 831 insertions(+), 119 deletions(-)
 create mode 100644 FS/FS/h_svc_phone.pm
 create mode 100644 FS/FS/svc_phone.pm
 create mode 100644 httemplate/edit/elements/svc_Common.html
 create mode 100644 httemplate/edit/process/elements/svc_Common.html
 create mode 100644 httemplate/edit/process/svc_phone.html
 create mode 100644 httemplate/edit/svc_phone.cgi
 create mode 100644 httemplate/search/svc_phone.cgi
 create mode 100644 httemplate/view/elements/svc_Common.html
 create mode 100644 httemplate/view/svc_phone.cgi

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index f04779a07..797a12a4d 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -128,6 +128,8 @@ assigned to users and/or groups.
   'List packages',
   'List services',
 
+  'List rating data',
+
   'Financial reports',
 
   'Job queue', # these are not currently agent-virtualized
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 9a99aebe7..41e0eba51 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1727,7 +1727,7 @@ sub _quote {
        ( $nullable ? ' NULL' : ' NOT NULL' ).
        ")\n" if $DEBUG > 2;
 
-  if ( $value eq '' && $column_type =~ /^int/ ) {
+  if ( $value eq '' && $column_type =~ /^(int|numeric)/ ) {
     if ( $nullable ) {
       'NULL';
     } else {
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 7219274e6..3e1d68f1b 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1538,6 +1538,18 @@ sub tables_hashref {
       'index'  => [],
     },
 
+    'svc_phone' => {
+      'columns' => [
+        'svcnum',      'int',         '',      '', '', '', 
+        'countrycode', 'varchar',     '',       3, '', '', 
+        'phonenum',    'varchar',     '',      15, '', '',  #12 ?
+        'pin',         'varchar', 'NULL', $char_d, '', '',
+      ],
+      'primary_key' => 'svcnum',
+      'unique' => [],
+      'index'  => [ [ 'countrycode', 'phonenum' ] ],
+    },
+
   };
 
     #'new_table' => {
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 5eb0cf393..2f47170fb 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw( @ISA );
 use Date::Parse;
 use Date::Format;
+use Time::Local;
 use FS::UID qw( dbh );
 use FS::Record qw( qsearch qsearchs );
 use FS::cdr_type;
@@ -224,6 +225,17 @@ sub check {
 #  ;
 #  return $error if $error;
 
+  $self->calldate( $self->startdate_sql )
+    if !$self->calldate && $self->startdate;
+
+  unless ( $self->charged_party ) {
+    if ( $self->dst =~ /^(\+?1)?8[02-8]{2}/ ) {
+      $self->charged_party($self->dst);
+    } else {
+      $self->charged_party($self->src);
+    }
+  }
+
   #check the foreign keys even?
   #do we want to outright *reject* the CDR?
   my $error =
@@ -252,7 +264,7 @@ error, otherwise returns false.
 
 sub set_status_and_rated_price {
   my($self, $status, $rated_price) = @_;
-  $self->status($status);
+  $self->freesidestatus($status);
   $self->rated_price($rated_price);
   $self->replace();
 }
@@ -267,6 +279,20 @@ sub calldate_unix {
   str2time(shift->calldate);
 }
 
+=item startdate_sql
+
+Parses the startdate in UNIX timestamp format and returns a string in SQL
+format.
+
+=cut
+
+sub startdate_sql {
+  my($sec,$min,$hour,$mday,$mon,$year) = localtime(shift->startdate);
+  $mon++;
+  $year += 1900;
+  "$year-$mon-$mday $hour:$min:$sec";
+}
+
 =item cdr_carrier
 
 Returns the FS::cdr_carrier object associated with this CDR, or false if no
@@ -420,6 +446,8 @@ sub downstream_csv {
 
 =cut
 
+my($tmp_mday, $tmp_mon, $tmp_year);
+
 my %import_formats = (
   'asterisk' => [
     'accountcode',
@@ -465,7 +493,42 @@ my %import_formats = (
     'quantity',
     'carrierid',
     'upstream_rateid',
-  ]
+  ],
+  'ams' => [
+
+    # Date
+    sub { my($cdr, $date) = @_;
+          $date =~ /^(\d{1,2})\/(\d{1,2})\/(\d\d(\d\d)?)$/
+            or die "unparsable date: $date"; #maybe we shouldn't die...
+          #$cdr->startdate( timelocal(0, 0, 0 ,$2, $1-1, $3) );
+          ($tmp_mday, $tmp_mon, $tmp_year) = ( $2, $1-1, $3 );
+        },
+
+    # Time
+    sub { my($cdr, $time) = @_;
+          #my($sec, $min, $hour, $mday, $mon, $year)= localtime($cdr->startdate);
+          $time =~ /^(\d{1,2}):(\d{1,2}):(\d{1,2})$/
+            or die "unparsable time: $time"; #maybe we shouldn't die...
+          #$cdr->startdate( timelocal($3, $2, $1 ,$mday, $mon, $year) );
+          $cdr->startdate(
+            timelocal($3, $2, $1 ,$tmp_mday, $tmp_mon, $tmp_year)
+          );
+        },
+
+    # Source_Number
+    'src',
+
+    # Terminating_Number
+    'dst',
+
+    # Duration
+    sub { my($cdr, $min) = @_;
+          my $sec = sprintf('%.0f', $min * 60 );
+          $cdr->billsec(  $sec );
+          $cdr->duration( $sec );
+        },
+
+  ],
 );
 
 sub batch_import {
@@ -494,10 +557,20 @@ sub batch_import {
   my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
-  
+
+  if ( $format eq 'ams' ) { # and other formats with a header too?
+
+  }
+
+  my $body = 0;
   my $line;
   while ( defined($line=<$fh>) ) {
 
+    #skip header...
+    if ( ! $body++ && $format eq 'ams' && $line =~ /^[\w\, ]+$/ ) {
+      next;
+    }
+
     $csv->parse($line) or do {
       $dbh->rollback if $oldAutoCommit;
       return "can't parse: ". $csv->error_input();
@@ -506,6 +579,10 @@ sub batch_import {
     my @columns = $csv->fields();
     #warn join('-',@columns);
 
+    if ( $format eq 'ams' ) {
+      @columns = map { s/^ +//; $_; } @columns;
+    }
+
     my @later = ();
     my %cdr =
       map {
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index e7afa77ea..8914e8c73 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -13,6 +13,7 @@ use FS::svc_acct;
 use FS::svc_domain;
 use FS::svc_forward;
 use FS::svc_broadband;
+use FS::svc_phone;
 use FS::svc_external;
 use FS::domain_record;
 use FS::part_export;
@@ -277,6 +278,10 @@ Returns a list consisting of:
 - The table name (i.e. svc_domain) for this service
 - svcnum
 
+Usage example:
+
+  my($label, $value, $svcdb) = $cust_svc->label;
+
 =cut
 
 sub label {
@@ -315,6 +320,8 @@ sub _svc_label {
     $tag = $domain_record->zone;
   } elsif ( $svcdb eq 'svc_broadband' ) {
     $tag = $svc_x->ip_addr;
+  } elsif ( $svcdb eq 'svc_phone' ) {
+    $tag = $svc_x->phonenum; #XXX format it better
   } elsif ( $svcdb eq 'svc_external' ) {
     my $conf = new FS::Conf;
     if ( $conf->config('svc_external-display_type') eq 'artera_turbo' ) {
@@ -586,30 +593,29 @@ sub get_cdrs_for_update {
 
   my $default_prefix = $options{'default_prefix'};
 
-  #Currently CDRs are associated with svc_acct services via a DID in the
-  #username.  This part is rather tenative and still subject to change...
-  #return () unless $self->svc_x->isa('FS::svc_acct');
-  return () unless $self->part_svc->svcdb eq 'svc_acct';
-  my $number = $self->svc_x->username;
+  #CDRs are now associated with svc_phone services via svc_phone.phonenum
+  #return () unless $self->svc_x->isa('FS::svc_phone');
+  return () unless $self->part_svc->svcdb eq 'svc_phone';
+  my $number = $self->svc_x->phonenum;
 
   my @cdrs = 
-    qsearch(
+    qsearch( {
       'table'      => 'cdr',
       'hashref'    => { 'freesidestatus' => '',
                         'charged_party'  => $number
                       },
       'extra_sql'  => 'FOR UPDATE',
-    );
+    } );
 
   if ( length($default_prefix) ) {
     push @cdrs,
-      qsearch(
+      qsearch( {
         'table'      => 'cdr',
         'hashref'    => { 'freesidestatus' => '',
                           'charged_party'  => "$default_prefix$number",
                         },
         'extra_sql'  => 'FOR UPDATE',
-      );
+      } );
   }
 
   @cdrs;
diff --git a/FS/FS/h_svc_phone.pm b/FS/FS/h_svc_phone.pm
new file mode 100644
index 000000000..95898c7b0
--- /dev/null
+++ b/FS/FS/h_svc_phone.pm
@@ -0,0 +1,33 @@
+package FS::h_svc_phone;
+
+use strict;
+use vars qw( @ISA );
+use FS::h_Common;
+use FS::svc_phone;
+
+@ISA = qw( FS::h_Common FS::svc_phone );
+
+sub table { 'h_svc_phone' };
+
+=head1 NAME
+
+FS::h_svc_phone - Historical phone number objects
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+An FS::h_svc_phone object represents a historical phone number.
+FS::h_svc_phone inherits from FS::h_Common and FS::svc_phone.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::h_Common>, L<FS::svc_phone>, L<FS::Record>, schema.html from the base
+documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 15af77b4f..500a1b0a4 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -102,9 +102,8 @@ sub calc_recur {
 
   my $downstream_cdr = '';
 
-  # also look for a specific domain??? (username@telephonedomain)
   foreach my $cust_svc (
-    grep { $_->part_svc->svcdb eq 'svc_acct' } $cust_pkg->cust_svc
+    grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc
   ) {
 
     foreach my $cdr (
@@ -125,78 +124,85 @@ sub calc_recur {
          )
       {
 
-        die "rating_method 'prefix' not yet supported";
-
-#        ###
-#        # look up rate details based on called station id
-#        ###
-#  
-#        my $dest = $cdr->dst;
-#  
-#        #remove non-phone# stuff and whitespace
-#        $dest =~ s/\s//g;
+        ###
+        # look up rate details based on called station id
+        # (or calling station id for toll free calls)
+        ###
+
+        my( $to_or_from, $number );
+        if ( $cdr->dst =~ /^(\+?1)?8[02-8]{2}/ ) { #tollfree call
+          $to_or_from = 'from';
+          $number = $cdr->src;
+        } else { #regular call
+          $to_or_from = 'to';
+          $number = $cdr->dst;
+        }
+  
+        #remove non-phone# stuff and whitespace
+        $number =~ s/\s//g;
 #        my $proto = '';
 #        $dest =~ s/^(\w+):// and $proto = $1; #sip:
 #        my $siphost = '';
 #        $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
-#  
-#        #determine the country code
-#        my $countrycode;
-#        if (    $dest =~ /^011(((\d)(\d))(\d))(\d+)$/
-#             || $dest =~ /^\+(((\d)(\d))(\d))(\d+)$/
-#           )
-#        {
-#  
-#          my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
-#          #first look for 1 digit country code
-#          if ( qsearch('rate_prefix', { 'countrycode' => $one } ) ) {
-#            $countrycode = $one;
-#            $dest = $u1.$u2.$rest;
-#          } elsif ( qsearch('rate_prefix', { 'countrycode' => $two } ) ) { #or 2
-#            $countrycode = $two;
-#            $dest = $u2.$rest;
-#          } else { #3 digit country code
-#            $countrycode = $three;
-#            $dest = $rest;
-#          }
-#  
-#        } else {
-#          $countrycode = '1';
-#          $dest =~ s/^1//;# if length($dest) > 10;
-#        }
-#  
-#        warn "rating call to +$countrycode $dest\n" if $DEBUG;
-#        $pretty_destnum = "+$countrycode $dest";
-#  
-#        #find a rate prefix, first look at most specific (4 digits) then 3, etc.,
-#        # finally trying the country code only
-#        my $rate_prefix = '';
-#        for my $len ( reverse(1..6) ) {
-#          $rate_prefix = qsearchs('rate_prefix', {
-#            'countrycode' => $countrycode,
-#            #'npa'         => { op=> 'LIKE', value=> substr($dest, 0, $len) }
-#            'npa'         => substr($dest, 0, $len),
-#          } ) and last;
-#        }
-#        $rate_prefix ||= qsearchs('rate_prefix', {
-#          'countrycode' => $countrycode,
-#          'npa'         => '',
-#        });
-#  
-#        die "Can't find rate for call to +$countrycode $dest\n"
-#          unless $rate_prefix;
-#  
-#        $regionnum = $rate_prefix->regionnum;
-#        $rate_detail = qsearchs('rate_detail', {
-#          'ratenum'        => $ratenum,
-#          'dest_regionnum' => $regionnum,
-#        } );
-#  
-#        $rate_region = $rate_prefix->rate_region;
-#
-#        warn "  found rate for regionnum $regionnum ".
-#             "and rate detail $rate_detail\n"
-#          if $DEBUG;
+  
+        #determine the country code
+        my $countrycode;
+        if (    $number =~ /^011(((\d)(\d))(\d))(\d+)$/
+             || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/
+           )
+        {
+  
+          my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
+          #first look for 1 digit country code
+          if ( qsearch('rate_prefix', { 'countrycode' => $one } ) ) {
+            $countrycode = $one;
+            $number = $u1.$u2.$rest;
+          } elsif ( qsearch('rate_prefix', { 'countrycode' => $two } ) ) { #or 2
+            $countrycode = $two;
+            $number = $u2.$rest;
+          } else { #3 digit country code
+            $countrycode = $three;
+            $number = $rest;
+          }
+  
+        } else {
+          $countrycode = '1';
+          $number =~ s/^1//;# if length($number) > 10;
+        }
+  
+        warn "rating call $to_or_from +$countrycode $number\n" if $DEBUG;
+        $pretty_destnum = "+$countrycode $number";
+  
+        #find a rate prefix, first look at most specific (4 digits) then 3, etc.,
+        # finally trying the country code only
+        my $rate_prefix = '';
+        for my $len ( reverse(1..6) ) {
+          $rate_prefix = qsearchs('rate_prefix', {
+            'countrycode' => $countrycode,
+            #'npa'         => { op=> 'LIKE', value=> substr($number, 0, $len) }
+            'npa'         => substr($number, 0, $len),
+          } ) and last;
+        }
+        $rate_prefix ||= qsearchs('rate_prefix', {
+          'countrycode' => $countrycode,
+          'npa'         => '',
+        });
+
+        #
+        die "Can't find rate for call $to_or_from +$countrycode $\numbern"
+          unless $rate_prefix;
+  
+        $regionnum = $rate_prefix->regionnum;
+        $rate_detail = qsearchs('rate_detail', {
+          'ratenum'        => $ratenum,
+          'dest_regionnum' => $regionnum,
+        } );
+  
+        $rate_region = $rate_prefix->rate_region;
+
+        warn "  found rate for regionnum $regionnum ".
+             "and rate detail $rate_detail\n"
+          if $DEBUG;
 
       } elsif ( $self->option('rating_method') eq 'upstream' ) {
 
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 7f791947a..258734735 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -347,7 +347,6 @@ and replace methods.
 
 sub check {
   my $self = shift;
-  my $recref = $self->hashref;
 
   my $error;
   $error=
@@ -358,8 +357,9 @@ sub check {
   ;
   return $error if $error;
 
-  my @fields = eval { fields( $recref->{svcdb} ) }; #might die
-  return "Unknown svcdb!" unless @fields;
+  my @fields = eval { fields( $self->svcdb ) }; #might die
+  return "Unknown svcdb: ". $self->svcdb. " (Error: $@)"
+    unless @fields;
 
   $self->SUPER::check;
 }
@@ -549,7 +549,9 @@ sub process {
                   @fields;
 
             } grep defined( dbdef->table($_) ),
-                   qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
+                   qw( svc_acct svc_domain svc_forward svc_www svc_broadband
+                       svc_phone svc_external
+                     )
       )
   } );
   
diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
new file mode 100644
index 000000000..fca33690d
--- /dev/null
+++ b/FS/FS/svc_phone.pm
@@ -0,0 +1,146 @@
+package FS::svc_phone;
+
+use strict;
+use vars qw( @ISA );
+#use FS::Record qw( qsearch qsearchs );
+use FS::svc_Common;
+
+@ISA = qw( FS::svc_Common );
+
+=head1 NAME
+
+FS::svc_phone - Object methods for svc_phone records
+
+=head1 SYNOPSIS
+
+  use FS::svc_phone;
+
+  $record = new FS::svc_phone \%hash;
+  $record = new FS::svc_phone { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_phone object represents a phone number.  FS::svc_phone inherits
+from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item svcnum - primary key
+
+=item countrycode - 
+
+=item phonenum - 
+
+=item pin - 
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new phone number.  To add the number to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'svc_phone'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item suspend
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item unsuspend
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item cancel
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item check
+
+Checks all fields to make sure this is a valid phone number.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('svcnum')
+    || $self->ut_numbern('countrycode')
+    || $self->ut_number('phonenum')
+    || $self->ut_numbern('pin')
+  ;
+  return $error if $error;
+
+  $self->countrycode(1) unless $self->countrycode;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_Common>, L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>,
+L<FS::cust_pkg>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 3c315fc97..42b616575 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -347,3 +347,6 @@ FS/ConfDefaults.pm
 t/ConfDefaults.t
 FS/m2name_Common.pm
 FS/CurrentUser.pm
+FS/svc_phone.pm
+t/svc_phone.t
+FS/h_svc_phone.pm
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 1dfa1376e..ef3aed7e7 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -186,6 +186,7 @@ sub handler
       use FS::access_groupagent;
       use FS::access_right;
       use FS::AccessRight;
+      use FS::svc_phone;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 6fa2b3b6e..f79cc0b24 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -9,25 +9,35 @@
   #               'column' => 'Label',
   #             }
   #
-  # listref - each item is a literal column name (or method) or (notyet) coderef
+  # listref - each item is a literal column name (or method) or hashref
+  #                                                          or (notyet) coderef
   # if not specified all columns (except for the primary key) will be editable
   # 'fields' => [
+  #               'columname',
+  #               { 'field' => 'another_columname',
+  #                 'type' => 'text', #text, fixed, hidden
+  #               },
   #             ]
   #
   # 'menubar'     => '', #menubar arrayref
   #
   # #run when re-displaying with an error
-  # 'error_callback' => sub { my $cgi, $object = @_; },
+  # 'error_callback' => sub { my( $cgi, $object ) = @_; },
   #
   # #run when editing
-  # 'edit_callback' => sub { my $cgi, $object = @_; },
+  # 'edit_callback' => sub { my( $cgi, $object ) = @_; },
+  #
+  # # returns a hashref for the new object
+  # 'new_hashref_callback'
   #
   # #run when adding
-  # 'new_callback' => sub { my $cgi, $object = @_; },
+  # 'new_callback' => sub { my( $cgi, $object ) = @_; },
+  #
+  # #XXX describe
+  # 'field_callback' => sub { },
   #
-  # #uninmplemented
-  # #'html_table_bottom' => '', #string or listref of additinal HTML to
-  # #                           #add before </TABLE>
+  # #string or coderef of additional HTML to add before </TABLE>
+  # 'html_table_bottom' => '',
   #
   # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
   #
@@ -64,13 +74,19 @@
     my( $query ) = $cgi->keywords;
     $query =~ /^(\d+)$/;
     $object = qsearchs( $table, { $pkey => $1 } );
+    warn "$table $pkey => $1"
+      if $opt{'debug'};
 
     &{$opt{'edit_callback'}}($cgi, $object)
       if $opt{'edit_callback'};
 
   } else { #adding
 
-    $object = $class->new( {} );
+    my $hashref = $opt{'new_hashref_callback'}
+                    ? &{$opt{'new_hashref_callback'}}
+                    : {};
+
+    $object = $class->new( $hashref );
 
     &{$opt{'new_callback'}}($cgi, $object)
       if $opt{'new_callback'};
@@ -113,16 +129,15 @@
 
 <%= ntable("#cccccc",2) %>
 
-<% foreach my $f ( @$fields ) {
+<% foreach my $f ( map { ref($_) ? $_ : {'field'=>$_} }
+                       @$fields
+                 ) {
 
-    my( $field, $type);
-    if ( ref($f) ) {
-      $field = $f->{'field'},
-      $type  = $f->{'type'} || 'text',
-    } else {
-      $field = $f;
-      $type = 'text';
-    }
+    &{ $opt{'field_callback'} }( $f )
+      if $opt{'field_callback'};
+
+    my $field = $f->{'field'};
+    my $type = $f->{'type'} ||= 'text';
 
 %>
 
@@ -137,16 +152,29 @@
 
     <%
       #eventually more options for <SELECT>, etc. fields
+      if ( $type eq 'fixed' ) {
     %>
 
-    <TD>
-      <INPUT TYPE="<%= $type %>" NAME="<%= $field %>" VALUE="<%= $object->$field() %>">
-    <TD>
+      <TD BGCOLOR="#dddddd"><%= $f->{'value'} %></TD>
+      <INPUT TYPE="hidden" NAME="<%= $field %>" VALUE="<%= $f->{'value'} %>">
+
+    <% } else { %>
+
+      <TD>
+        <INPUT TYPE="<%= $type %>" NAME="<%= $field %>" VALUE="<%= $object->$field() %>">
+      <TD>
+
+    <% } %>
 
   </TR>
 
 <% } %>
 
+<%= ref( $opt{'html_table_bottom'} )
+      ? &{ $opt{'html_table_bottom'} }( $object )
+      : $opt{'html_table_bottom'}
+%>
+
 </TABLE>
 
 <%= ref( $opt{'html_bottom'} )
diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
new file mode 100644
index 000000000..c113ad645
--- /dev/null
+++ b/httemplate/edit/elements/svc_Common.html
@@ -0,0 +1,98 @@
+<%
+
+  my %opt = @_;
+
+  #my( $svcnum, $pkgnum, $svcpart, $part_svc );
+  my( $pkgnum, $svcpart, $part_svc );
+
+  #get & untaint pkgnum & svcpart
+  my($query) = $cgi->keywords; #they're not proper cgi params
+  if ( $query =~ /^pkgnum(\d+)-svcpart(\d+)$/ ) {
+    $pkgnum  = $1;
+    $svcpart = $2;
+    $cgi->delete_all(); #so the standard edit.html treats this correctly as new
+  }
+
+%><%= include( 'edit.html',
+
+                 'menubar' => [],
+
+                 'error_callback' => sub {
+                   my( $cgi, $svc_x ) = @_;
+                   #$svcnum = $svc_x->svcnum;
+                   $pkgnum  = $cgi->param('pkgnum');
+                   $svcpart = $cgi->param('svcpart');
+
+                   $part_svc = qsearchs( 'part_svc', { svcpart=>$svcpart });
+                   die "No part_svc entry!" unless $part_svc;
+                 },
+
+                 'edit_callback' => sub {
+                   my( $cgi, $svc_x ) = @_;
+                   #$svcnum = $svc_x->svcnum;
+                   my $cust_svc = $svc_x->cust_svc
+                     or die "Unknown (cust_svc) svcnum!";
+
+                   $pkgnum  = $cust_svc->pkgnum;
+                   $svcpart = $cust_svc->svcpart;
+  
+                   $part_svc = qsearchs ('part_svc', { svcpart=>$svcpart });
+                   die "No part_svc entry!" unless $part_svc;
+                 },
+
+                 'new_hash_callback' => sub {
+                   #my( $cgi, $svc_x ) = @_;
+
+                   { svcpart => $svcpart };
+
+                 },
+
+                 'new_callback' => sub {
+                    my( $cgi, $svc_x ) = @_;;
+
+                    $part_svc = qsearchs( 'part_svc', { svcpart=>$svcpart });
+                    die "No part_svc entry!" unless $part_svc;
+
+                    #$svcnum='';
+
+                    $svc_x->set_default_and_fixed;
+
+                 },
+
+                 'field_callback' => sub {
+                   my $f = shift;
+                   my $columndef = $part_svc->part_svc_column($f->{'field'});
+                   my $flag = $columndef->columnflag;
+                   if ( $flag eq 'F' ) {
+                     $f->{'type'} = 'fixed';
+                     $f->{'value'} = $columndef->columnvalue;
+                   }
+                 },
+
+                 'html_table_bottom' => sub {
+                   my $svc_x = shift;
+                   my $html = '';
+                   foreach my $field ($svc_x->virtual_fields) {
+                     if ($part_svc->part_svc_column($field)->columnflag ne 'F'){
+                       # If the flag is X, it won't even show up
+                       # in $svc_acct->virtual_fields.
+                       $html .=
+                         $svc_x->pvf($field)->widget( 'HTML',
+                                                      'edit', 
+                                                      $svc_x->getfield($field)
+                                                    );
+                     }
+                   }
+                   $html;
+                 },
+
+                 'html_bottom' => sub {
+                   qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!.
+                   qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+                 },
+
+                 'debug' => 1,
+
+                 %opt #pass through/override params
+             )
+%>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 0298a5461..489a2339c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -39,11 +39,12 @@ Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref-
 <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <BR>
 Service definitions are the templates for items you offer to your customers.
-<UL><LI>svc_acct - Accounts - anything with a username (Mailboxes, PPP accounts, shell accounts, etc.)
+<UL><LI>svc_acct - Accounts - anything with a username (Mailboxes, PPP accounts, shell accounts, RADIUS entries for broadband, etc.)
     <LI>svc_domain - Domains
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
     <LI>svc_broadband - Broadband/High-speed Internet service (always-on)
+    <LI>svc_phone - Customer phone numbers
     <LI>svc_external - Externally-tracked service
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
@@ -60,6 +61,7 @@ that field.
 #pry need to eventually create stuff that's shared amount UIs
 my $conf = new FS::Conf;
 my %defs = (
+
   'svc_acct' => {
     'dir'       => 'Home directory',
     'uid'       => 'UID (set to fixed and blank for no UIDs)',
@@ -111,14 +113,17 @@ my %defs = (
                      disable_inventory => 1,
                    },
   },
+
   'svc_domain' => {
     'domain'    => 'Domain',
   },
+
   'svc_forward' => {
     'srcsvc'    => 'service from which mail is to be forwarded',
     'dstsvc'    => 'service to which mail is to be forwarded',
     'dst'       => 'someone@another.domain.com to use when dstsvc is 0',
   },
+
 #  'svc_charge' => {
 #    'amount'    => 'amount',
 #  },
@@ -126,20 +131,36 @@ my %defs = (
 #    'worker'    => 'Worker',
 #    '_date'      => 'Date',
 #  },
+
   'svc_www' => {
     #'recnum' => '',
     #'usersvc' => '',
   },
+
   'svc_broadband' => {
     'speed_down' => 'Maximum download speed for this service in Kbps.  0 denotes unlimited.',
     'speed_up' => 'Maximum upload speed for this service in Kbps.  0 denotes unlimited.',
     'ip_addr' => 'IP address.  Leave blank for automatic assignment.',
     'blocknum' => 'Address block.',
   },
+
+  'svc_phone' => {
+    'countrycode' => { desc => 'Country code',
+                       type => 'text',
+                       disable_inventory => 1,
+                     },
+    'phonenum'    => 'Phone number',
+    'pin'         => { desc => 'Personal Identification Number',
+                       type => 'text',
+                       disable_inventory => 1,
+                     },
+  },
+
   'svc_external' => {
     #'id' => '',
     #'title' => '',
   },
+
 );
 
   my %vfields;
@@ -195,7 +216,7 @@ my %defs = (
   
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_forward svc_www svc_broadband svc_external );
+             : qw( svc_acct svc_domain svc_forward svc_www svc_broadband svc_phone svc_external );
 
   tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } grep dbdef->table($_), @dbs;
   my $widget = new HTML::Widgets::SelectLayers(
diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index a6e3b50e3..7cae78bfc 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -5,6 +5,7 @@
   ###
   ##req
   ##
+  #
   # 'table' => 
   #
   # #? 'primary_key' => #required when the dbdef doesn't know...???
@@ -13,7 +14,14 @@
   ###
   ##opt
   ###
+  #
   # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
+  # OR
+  # 'redirect'    => 'view/table.cgi?', # value of primary key is appended
+  #
+  # 'edit_ext' => 'html', #defaults to 'html', you might want 'cgi' while the
+  #                       #naming is still inconsistent
+  # 
   # 'process_m2m' => { 'link_table'   => 'link_table_name',
   #                    'target_table' => 'target_table_name',
   #                  },
@@ -65,9 +73,14 @@
                                  );
   }
 
+  # XXX print?!?!
+
   if ( $error ) {
     $cgi->param('error', $error);
-    print $cgi->redirect(popurl(2). "$table.html?". $cgi->query_string );
+    my $edit_ext = $opt{'edit_ext'} || 'html';
+    print $cgi->redirect(popurl(2). "$table.$edit_ext?". $cgi->query_string );
+  } elsif ( $opt{'redirect'} ) {
+    print $cgi->redirect( $opt{'redirect'}. $pkeyvalue );
   } else { 
     print $cgi->redirect( popurl(3).
                           ( $opt{'viewall_dir'} || 'search' ).
diff --git a/httemplate/edit/process/elements/svc_Common.html b/httemplate/edit/process/elements/svc_Common.html
new file mode 100644
index 000000000..1f8f8315e
--- /dev/null
+++ b/httemplate/edit/process/elements/svc_Common.html
@@ -0,0 +1,14 @@
+<%
+
+  my %opt = @_;
+  my $table = $opt{'table'};
+  $opt{'fields'} ||= [ fields($table) ];
+  push @{ $opt{'fields'} }, qw( pkgnum svcpart );
+
+%><%= include( 'process.html',
+                 'edit_ext' => 'cgi',
+                 'redirect' => popurl(3)."view/$table.cgi?",
+                 %opt,
+           )
+%>
+
diff --git a/httemplate/edit/process/svc_phone.html b/httemplate/edit/process/svc_phone.html
new file mode 100644
index 000000000..c1d4b7547
--- /dev/null
+++ b/httemplate/edit/process/svc_phone.html
@@ -0,0 +1,4 @@
+<%= include( 'elements/svc_Common.html',
+               'table'    => 'svc_phone',
+           )
+%>
diff --git a/httemplate/edit/svc_phone.cgi b/httemplate/edit/svc_phone.cgi
new file mode 100644
index 000000000..77b4975a1
--- /dev/null
+++ b/httemplate/edit/svc_phone.cgi
@@ -0,0 +1,11 @@
+<%= include( 'elements/svc_Common.html',
+               'name'     => 'Phone number',
+               'table'    => 'svc_phone',
+               'fields'   => [qw( countrycode phonenum )], #pin
+               'labels'   => {
+                               'countrycode' => 'Country code',
+                               'phonenum'    => 'Phone number',
+                               'pin'         => 'PIN',
+                             },
+           )
+%>
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 05db0f659..8c62d9778 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -69,6 +69,10 @@
     #'Unlinked domain' => [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside domains without a customer record' ],
   ;
 
+  tie my %report_services_phone, 'Tie::IxHash',
+    'All phone numbers' => [ $fsurl.'search/svc_phone.cgi?svcnum', '' ],
+  ;
+
   tie my %report_services_external, 'Tie::IxHash',
     'All external services' => [ $fsurl.'search/svc_external.cgi?id', '' ],
   ;
@@ -85,6 +89,7 @@
   $report_services{'Mail forwards'} =  [ \%report_services_forward, 'Mail forwards', ];
   $report_services{'Virtual hosts'} =  [ \%report_services_www, 'Virtual hosting', ];
   $report_services{'Broadband services'} =  [ \%report_services_broadband, 'Fixed (username-less) broadband services', ];
+  $report_services{'Phone numbers'} =  [ \%report_services_phone, 'Telephone numbers', ];
   $report_services{'External services'} =  [ \%report_services_external, 'External services', ];
 
   tie my %report_packages, 'Tie::IxHash';
@@ -97,6 +102,10 @@
   $report_packages{'Customer packages with unconfigured services'} =  [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ];
   $report_packages{'Advanced package reports'} =  [ $fsurl.'search/report_cust_pkg.html', 'by agent, date range, status, package definition' ];
 
+  tie my %report_rating, 'Tie::IxHash',
+    'Call Detail Records (CDRs)' => [ $fsurl.'search/report_cdr.html', '' ],
+  ;
+
   tie my %report_financial, 'Tie::IxHash', 
     'Sales, Credits and Receipts' => [ $fsurl.'graph/report_money_time.html', 'Sales, credits and receipts summary graph' ],
     'Sales Report' => [ $fsurl.'graph/report_cust_bill_pkg.html', 'Sales report and graph (by agent, package class and/or date range)' ],
@@ -108,20 +117,23 @@
   ;
 
   tie my %report_menu, 'Tie::IxHash';
-  $report_menu{'Customers'} = [ \%report_customers, 'Customer reports'  ]
+  $report_menu{'Customers'}   = [ \%report_customers, 'Customer reports'  ]
     if $curuser->access_right('List customers');
-  $report_menu{'Invoices'} =  [ \%report_invoices,  'Invoice reports'   ]
+  $report_menu{'Invoices'}    =  [ \%report_invoices,  'Invoice reports'   ]
     if $curuser->access_right('List invoices');
-  $report_menu{'Packages'} =  [ \%report_packages,  'Package reports'   ]
+  $report_menu{'Packages'}    =  [ \%report_packages,  'Package reports'   ]
     if $curuser->access_right('List packages');
-  $report_menu{'Services'} =  [ \%report_services,  'Services reports'  ]
+  $report_menu{'Services'}    =  [ \%report_services,  'Services reports'  ]
     if $curuser->access_right('List services');
-  $report_menu{'Financial'} = [ \%report_financial, 'Financial reports' ]
+  $report_menu{'Rating data'} =  [ \%report_rating,    'Rating reports'  ]
+    if $curuser->access_right('List rating data');
+  $report_menu{'Financial'}  = [ \%report_financial, 'Financial reports' ]
     if $curuser->access_right('Financial reports');
 
   tie my %tools_importing, 'Tie::IxHash',
     'Import customers from CSV file' => [ $fsurl.'misc/cust_main-import.cgi', '' ],
     'Import one-time charges from CSV file' => [ $fsurl.'misc/cust_main-import_charges.cgi', '' ],
+    'Import Call Detail Records (CDRs) from CSV file' => [ $fsurl.'misc/cdr-import.html', '' ],
   ;
 
   tie my %tools_exporting, 'Tie::IxHash',
diff --git a/httemplate/misc/cdr-import.html b/httemplate/misc/cdr-import.html
index dc1733249..93de6e43f 100644
--- a/httemplate/misc/cdr-import.html
+++ b/httemplate/misc/cdr-import.html
@@ -2,8 +2,9 @@
 <FORM ACTION="process/cdr-import.html" METHOD="POST" ENCTYPE="multipart/form-data">
 Import a CSV file containing Call Detail Records (CDRs).<BR><BR>
 CDR Format: <SELECT NAME="format">
-<!-- <OPTION VALUE="asterisk">Asterisk</OPTION> -->
+<OPTION VALUE="asterisk">Asterisk (untested)</OPTION>
 <OPTION VALUE="unitel">Unitel/RSLCOM</OPTION>
+<OPTION VALUE="ams">AMS</OPTION>
 </SELECT><BR><BR>
 
 Filename: <INPUT TYPE="file" NAME="csvfile"><BR><BR>
diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html
index ec847e41f..e3d6043e8 100644
--- a/httemplate/search/cdr.html
+++ b/httemplate/search/cdr.html
@@ -11,13 +11,15 @@ if ( $cgi->param('freesidestatus') eq 'NULL' ) {
 
   my $title = "Unprocessed $title";
   $hashref->{'freesidestatus'} = ''; # Record.pm will take care of it
-  $count_query .= " AND ( freesidestatus IS NULL OR freesidestatus = '' )";
+  #$count_query .= " AND ( freesidestatus IS NULL OR freesidestatus = '' )";
+  $count_query .= " WHERE ( freesidestatus IS NULL OR freesidestatus = '' )";
 
 } elsif ( $cgi->param('freesidestatus') =~ /^([\w ]+)$/ ) {
 
   my $title = "Processed $title";
   $hashref->{'freesidestatus'} = $1;
-  $count_query .= " AND freesidestatus = '$1'";
+  #$count_query .= " AND freesidestatus = '$1'";
+  $count_query .= " WHERE freesidestatus = '$1'";
 
 }
 
diff --git a/httemplate/search/report_cdr.html b/httemplate/search/report_cdr.html
index 924e28bd7..6febe6c4a 100644
--- a/httemplate/search/report_cdr.html
+++ b/httemplate/search/report_cdr.html
@@ -4,7 +4,7 @@
 Status: <SELECT NAME="freesidestatus">
   <OPTION VALUE="">(all)
   <OPTION VALUE="NULL">unprocessed
-  <OPTION VALUE="done"">processed
+  <OPTION VALUE="done">processed
 </SELECT><BR>
 <INPUT TYPE="submit" VALUE="Search Call Detail Records">
 
diff --git a/httemplate/search/svc_phone.cgi b/httemplate/search/svc_phone.cgi
new file mode 100644
index 000000000..a68a13e39
--- /dev/null
+++ b/httemplate/search/svc_phone.cgi
@@ -0,0 +1,94 @@
+<%
+
+my $conf = new FS::Conf;
+
+my($query)=$cgi->keywords;
+$query ||= ''; #to avoid use of unitialized value errors
+
+my $orderby = 'ORDER BY svcnum';
+my %svc_phone = ();
+my @extra_sql = ();
+if ( $query eq 'svcnum' ) {
+  #$orderby = 'ORDER BY svcnum';
+} elsif ( $query eq 'phonenum' ) {
+  $orderby = 'ORDER BY phonenum';
+} elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
+  #$orderby = 'ORDER BY svcnum';
+  push @extra_sql, "svcpart = $1";
+} else {
+  $cgi->param('phonenum') =~ /^([\d\- ]+)$/; 
+  ( $svc_phone{'phonenum'} = $1 ) =~ s/\D//g;
+}
+
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
+#here is the agent virtualization
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+my $extra_sql = '';
+if ( @extra_sql ) {
+  $extra_sql = ( keys(%svc_phone) ? ' AND ' : ' WHERE ' ).
+               join(' AND ', @extra_sql );
+}
+
+my $count_query = "SELECT COUNT(*) FROM svc_phone $addl_from ";
+if ( keys %svc_phone ) {
+  $count_query .= ' WHERE '.
+                    join(' AND ', map "$_ = ". dbh->quote($svc_phone{$_}),
+                                      keys %svc_phone
+                        );
+}
+$count_query .= $extra_sql;
+
+my $sql_query = {
+  'table'     => 'svc_phone',
+  'hashref'   => \%svc_phone,
+  'select'    => join(', ',
+                   'svc_phone.*',
+                   'part_svc.svc',
+                    'cust_main.custnum',
+                    FS::UI::Web::cust_sql_fields(),
+                 ),
+  'extra_sql' => "$extra_sql $orderby",
+  'addl_from' => $addl_from,
+};
+
+my $link = [ "${p}view/svc_phone.cgi?", 'svcnum' ];
+
+#smaller false laziness w/svc_*.cgi here
+my $link_cust = sub {
+  my $svc_x = shift;
+  $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
+};
+
+%><%= include( 'elements/search.html',
+                 'title'             => "Phone number search results",
+                 'name'              => 'phone numbers',
+                 'query'             => $sql_query,
+                 'count_query'       => $count_query,
+                 'redirect'          => $link,
+                 'header'            => [ '#',
+                                          'Service',
+                                          'Country code',
+                                          'Phone number',
+                                          FS::UI::Web::cust_header(),
+                                        ],
+                 'fields'            => [ 'svcnum',
+                                          'svc',
+                                          'countrycode',
+                                          'phonenum',
+                                          \&FS::UI::Web::cust_fields,
+                                        ],
+                 'links'             => [ $link,
+                                          $link,
+                                          $link,
+                                          $link,
+                                          ( map { $link_cust }
+                                                FS::UI::Web::cust_header()
+                                          ),
+                                        ],
+              )
+%>
diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
new file mode 100644
index 000000000..0f103e3e0
--- /dev/null
+++ b/httemplate/view/elements/svc_Common.html
@@ -0,0 +1,116 @@
+<%
+
+  # options example...
+  #
+  # 'table' => 'svc_something'
+  #
+  # 'labels' => {
+  #               'column' => 'Label',
+  #             },
+  #
+  # listref - each item is a literal column name (or method) or (notyet) coderef
+  # if not specified all columns (except for the primary key) will be viewable
+  # 'fields' => [
+  #             ]
+
+  my(%opt) = @_;
+
+  my $table = $opt{'table'};
+
+  my $fields = $opt{'fields'}
+               #|| [ grep { $_ ne 'svcnum' } dbdef->table($table)->columns ];
+               || [ grep { $_ ne 'svcnum' } fields($table) ];
+
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  my $svcnum = $1;
+  my $svc_x = qsearchs( $opt{'table'}, { 'svcnum' => $svcnum } )
+    or die "Unknown svcnum $svcnum in ". $opt{'table'}. " table\n";
+
+  my $cust_svc = $svc_x->cust_svc;
+  my($label, $value, $svcdb) = $cust_svc->label;
+
+  my $pkgnum = $cust_svc->pkgnum;
+
+  my($cust_pkg, $custnum);
+  if ($pkgnum) {
+    $cust_pkg = $cust_svc->cust_pkg;
+    $custnum = $cust_pkg->custnum;
+  } else {
+    $cust_pkg = '';
+    $custnum = '';
+  }
+
+%>
+
+<% if ( $custnum ) { %>
+
+  <%= include("/elements/header.html","View $label: $value", menubar(
+    "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+  )) %>
+
+  <%= include( '/elements/small_custview.html', $custnum, '', 1 ) %>
+  <BR>
+
+<% } else { %>
+
+  <SCRIPT>
+  function areyousure(href) {
+      if (confirm("Permanently delete this <%= $label %>?") == true)
+          window.location.href = href;
+  }
+  </SCRIPT>
+
+  <%= include("/elements/header.html","View $label: $value", menubar(
+      "Cancel this (unaudited) $label" =>
+            "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')"
+  )) %>
+
+<% } %>
+
+Service #<B><%= $svcnum %></B>
+| <A HREF="<%=$p%>edit/<%= $opt{'table'} %>.cgi?<%=$svcnum%>">Edit this <%= $label %></A>
+<BR>
+
+<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
+
+<% foreach my $f ( @$fields ) {
+
+     my( $field, $type);
+     if ( ref($f) ) {
+       $field = $f->{'field'},
+       $type  = $f->{'type'} || 'text',
+     } else {
+       $field = $f;
+       $type = 'text';
+     }
+%>
+
+  <TR>
+    <TD ALIGN="right">
+      <%= ( $opt{labels} && exists $opt{labels}->{$field} )
+              ? $opt{labels}->{$field}
+              : $field
+      %>
+    </TD>
+
+    <%
+      #eventually more options for <SELECT>, etc. fields
+    %>
+
+    <TD BGCOLOR="#ffffff"><%= $svc_x->$field %><TD>
+
+  </TR>
+
+<% } %>
+
+<% foreach (sort { $a cmp $b } $svc_x->virtual_fields) { %>
+  <%= $svc_x->pvf($_)->widget('HTML', 'view', $svc_x->getfield($_)) %>
+<% } %>
+
+</TABLE></TD></TR></TABLE>
+
+<BR>
+<%= joblisting({'svcnum'=>$svcnum}, 1) %>
+
+<%= include('/elements/footer.html') %>
diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
new file mode 100644
index 000000000..8de7cc8e7
--- /dev/null
+++ b/httemplate/view/svc_phone.cgi
@@ -0,0 +1,10 @@
+<%= include('elements/svc_Common.html',
+              'table'  => 'svc_phone',
+              'fields' => [qw( countrycode phonenum )], #pin
+              'labels' => {
+                            'countrycode' => 'Country code',
+                            'phonenum'    => 'Phone number',
+                            'pin'         => 'PIN',
+                          },
+           )
+%>
-- 
cgit v1.2.1


From e5742a8ccfca16427631a45fc8895d6fc1a493dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Jul 2006 23:33:56 +0000
Subject: add acl bootstrapping - should be installable again now

---
 FS/FS/Setup.pm        | 33 +++++++++++++++++++++++++++++++++
 FS/bin/freeside-setup |  2 ++
 2 files changed, 35 insertions(+)

diff --git a/FS/FS/Setup.pm b/FS/FS/Setup.pm
index 8e89be5eb..c53fe65b4 100644
--- a/FS/FS/Setup.pm
+++ b/FS/FS/Setup.pm
@@ -48,6 +48,8 @@ sub create_initial_data {
   #initial_data data
   populate_initial_data(%opt);
 
+  populate_access();
+
   populate_msgcat();
   
   if ( $oldAutoCommit ) {
@@ -131,6 +133,11 @@ sub initial_data {
   #tie my %hash, 'Tie::DxHash', 
   tie my %hash, 'Tie::IxHash', 
 
+    #superuser group
+    'access_group' => [
+      { 'groupname' => 'Superuser' },
+    ],
+
     #billing events
     'part_bill_event' => [
       { 'payby'     => 'CARD',
@@ -282,6 +289,32 @@ sub initial_data {
 
 }
 
+sub populate_access {
+
+  use FS::AccessRight;
+  use FS::access_right;
+
+  foreach my $rightname ( FS::AccessRight->rights ) {
+    my $access_right = new FS::access_right {
+      'righttype'   => 'FS::access_group',
+      'rightobjnum' => 1, #$supergroup->groupnum,
+      'rightname'   => $rightname,
+    };
+    my $ar_error = $access_right->insert;
+    die $ar_error if $ar_error;
+  }
+
+  #foreach my $agent ( qsearch('agent', {} ) ) {
+    my $access_groupagent = new FS::access_groupagent {
+      'groupnum' => $supergroup->groupnum,
+      'agentnum' => 1, #$agent->agentnum,
+    };
+    my $aga_error = $access_groupagent->insert;
+    die $aga_error if $aga_error;
+  #}
+
+}
+
 sub populate_msgcat {
 
   use FS::Record qw(qsearch);
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 9f87f10b7..138011430 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -7,6 +7,7 @@ use strict;
 use vars qw($opt_s $opt_d $opt_v);
 use Getopt::Std;
 use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
+use FS::CurrentUser;
 use FS::Schema qw( dbdef_dist reload_dbdef );
 use FS::Record;
 #use FS::raddb;
@@ -85,6 +86,7 @@ $dbdef->save($dbdef_file);
 # create 'em
 ###
 
+$FS::CurrentUser::upgrade_hack = 1;
 my $dbh = adminsuidsetup $user;
 
 #create tables
-- 
cgit v1.2.1


From 779ca0263837bebf7f0ab6f45cb8381706049658 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Jul 2006 03:54:07 +0000
Subject: fix multiple-agent virtualization properly for these reports

---
 FS/FS/Report/Table/Monthly.pm            | 10 +++++++++-
 httemplate/search/cust_credit.html       |  7 ++++---
 httemplate/search/cust_pay.cgi           | 16 +++++++++-------
 httemplate/search/report_receivables.cgi |  3 +++
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index 1b7e93aba..145f2a85c 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA $expenses_kludge );
 use Time::Local;
 use FS::UID qw( dbh );
 use FS::Report::Table;
+use FS::CurrentUser;
 
 @ISA = qw( FS::Report::Table );
 
@@ -215,7 +216,7 @@ sub credits {
   );
 }
 
-#these should be auto-generated
+#these should be auto-generated or $AUTOLOADed or something
 sub invoiced_12mo {
   my( $self, $speriod, $eperiod, $agentnum ) = @_;
   $speriod = $self->_subtract_11mo($speriod);
@@ -330,9 +331,16 @@ sub suspended { #suspended
 sub in_time_period_and_agent {
   my( $self, $speriod, $eperiod, $agentnum ) = splice(@_, 0, 4);
   my $table = @_ ? shift().'.' : '';
+
   my $sql = "${table}_date >= $speriod AND ${table}_date < $eperiod";
+
+  #agent selection
   $sql .= " AND agentnum = $agentnum"
     if $agentnum;
+
+  #agent virtualization
+  $sql .= ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql;
+
   $sql;
 }
 
diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index 279d682cd..eb78db5cd 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -36,9 +36,10 @@
      push @search, " _date < $1 ";
    }
 
-   my $where = scalar(@search)
-                 ? 'WHERE '. join(' AND ', @search)
-                 : '';
+   #here is the agent virtualization
+   push @search, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+   my $where = 'WHERE '. join(' AND ', @search);
 
    my $count_query = 'SELECT COUNT(*), SUM(amount) '.
                      'FROM cust_credit LEFT JOIN cust_main USING ( custnum ) '.
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 99ffc3d20..0247b0b0d 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -96,10 +96,10 @@
        die "unknown search magic: ". $cgi->param('magic');
      }
 
-     my $search = '';
-     if ( @search ) {
-       $search = ' WHERE '. join(' AND ', @search);
-     }
+     #here is the agent virtualization
+     push @search, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+     my $search = ' WHERE '. join(' AND ', @search);
   
      $count_query = "SELECT COUNT(*), SUM(paid) ".
                     "FROM cust_pay LEFT JOIN cust_main USING ( custnum )".
@@ -125,14 +125,16 @@
      $cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
      my $payby = $1;
    
-     $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
-                    "WHERE payinfo = '$payinfo' AND payby = '$payby'";
+     $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay".
+                    "  WHERE payinfo = '$payinfo' AND payby = '$payby'".
+                    "  AND ". $FS::CurrentUser::CurrentUser->agentnums_sql;
    
      $sql_query = {
        'table'     => 'cust_pay',
        'hashref'   => { 'payinfo' => $payinfo,
                         'payby'   => $payby    },
-       'extra_sql' => "ORDER BY _date",
+       'extra_sql' => $FS::CurrentUser::CurrentUser->agentnums_sql.
+                      " ORDER BY _date",
      };
    
    }
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index ac94e1a5c..c1a239fd2 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -92,6 +92,9 @@ END
     $where .= " AND agentnum = '$agentnum' ";
   }
 
+  #here is the agent virtualization
+  $where .= ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql;
+
   my $count_sql = "select count(*) from cust_main $where";
 
   my $sql_query = {
-- 
cgit v1.2.1


From f140958fe1464e629e763d6613a6e481068d17ff Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Jul 2006 23:45:38 +0000
Subject: mapsecrets file shouldn't be necessary at all...

---
 FS/FS/UID.pm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 21df9441b..45701edb8 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -267,11 +267,18 @@ sub getsecrets {
   $user = $setuser if $setuser;
   die "No user!" unless $user;
   my($conf) = new FS::Conf $conf_dir;
-  my($line) = grep /^\s*($user|\*)\s/, $conf->config('mapsecrets');
-  die "User $user not found in mapsecrets!" unless $line;
-  $line =~ /^\s*($user|\*)\s+(.*)$/;
-  $secrets = $2;
-  die "Illegal mapsecrets line for user?!" unless $secrets;
+
+  if ( $conf->exists('mapsecrets') ) {
+    my($line) = grep /^\s*($user|\*)\s/, $conf->config('mapsecrets');
+    die "User $user not found in mapsecrets!" unless $line;
+    $line =~ /^\s*($user|\*)\s+(.*)$/;
+    $secrets = $2;
+    die "Illegal mapsecrets line for user?!" unless $secrets;
+  } else {
+    # no mapsecrets file at all, so do the default thing
+    $secrets = 'secrets';
+  }
+
   ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
     or die "Can't get secrets: $secrets: $!\n";
   $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
-- 
cgit v1.2.1


From 9bc0e873966642f415795525f8a2a57381afb080 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jul 2006 00:32:12 +0000
Subject: should be able to freeside-setup without a username now

---
 FS/FS/UID.pm          | 13 +++++++++----
 FS/bin/freeside-setup |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 45701edb8..1f51ca69c 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -72,10 +72,15 @@ sub adminsuidsetup {
 
 sub forksuidsetup {
   $user = shift;
-  croak "fatal: adminsuidsetup called without arguements" unless $user;
 
-  $user =~ /^([\w\-\.]+)$/ or croak "fatal: illegal user $user";
-  $user = $1;
+  if ( $FS::CurrentUser::upgrade_hack ) {
+    $user = '';
+  } else {
+    croak "fatal: adminsuidsetup called without arguements" unless $user;
+
+    $user =~ /^([\w\-\.]+)$/ or croak "fatal: illegal user $user";
+    $user = $1;
+  }
 
   $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
   $ENV{'SHELL'} = '/bin/sh';
@@ -265,10 +270,10 @@ the `/usr/local/etc/freeside/mapsecrets' file.
 sub getsecrets {
   my($setuser) = shift;
   $user = $setuser if $setuser;
-  die "No user!" unless $user;
   my($conf) = new FS::Conf $conf_dir;
 
   if ( $conf->exists('mapsecrets') ) {
+    die "No user!" unless $user;
     my($line) = grep /^\s*($user|\*)\s/, $conf->config('mapsecrets');
     die "User $user not found in mapsecrets!" unless $line;
     $line =~ /^\s*($user|\*)\s+(.*)$/;
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 138011430..2ba717cb3 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -19,8 +19,8 @@ die "Not running uid freeside!" unless checkeuid();
 #  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
 
 getopts("svd:");
-my $user = shift or die &usage;
-getsecrets($user);
+#my $user = shift or die &usage;
+getsecrets(); #$user);
 
 #needs to match FS::Record
 my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
@@ -87,7 +87,7 @@ $dbdef->save($dbdef_file);
 ###
 
 $FS::CurrentUser::upgrade_hack = 1;
-my $dbh = adminsuidsetup $user;
+my $dbh = adminsuidsetup; #$user;
 
 #create tables
 $|=1;
-- 
cgit v1.2.1


From 484fa24446f613b3371770fb3c3212fd115154f1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jul 2006 00:42:56 +0000
Subject: fix acl bootstrapping

---
 FS/FS/Setup.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/Setup.pm b/FS/FS/Setup.pm
index c53fe65b4..7475d3782 100644
--- a/FS/FS/Setup.pm
+++ b/FS/FS/Setup.pm
@@ -306,7 +306,7 @@ sub populate_access {
 
   #foreach my $agent ( qsearch('agent', {} ) ) {
     my $access_groupagent = new FS::access_groupagent {
-      'groupnum' => $supergroup->groupnum,
+      'groupnum' => 1, #$supergroup->groupnum,
       'agentnum' => 1, #$agent->agentnum,
     };
     my $aga_error = $access_groupagent->insert;
-- 
cgit v1.2.1


From 22beb7aa1be0c71984c87fed7982299c315ce254 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jul 2006 01:42:42 +0000
Subject: add the small FS::CurrentUser::BootstrapUser class for... surprise...
 bootstrapping

---
 FS/FS/CurrentUser.pm | 15 ++++++++++++++-
 FS/FS/UID.pm         |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/FS/FS/CurrentUser.pm b/FS/FS/CurrentUser.pm
index 37ed3592a..a2dfd714c 100644
--- a/FS/FS/CurrentUser.pm
+++ b/FS/FS/CurrentUser.pm
@@ -21,7 +21,9 @@ FS::CurrentUser - Package representing the current user
 sub load_user {
   my( $class, $user ) = @_; #, $pass
 
-  return "" if $upgrade_hack;
+  if ( $upgrade_hack ) {
+    return new FS::CurrentUser::BootstrapUser;
+  }
 
   #return "" if $user =~ /^fs_(queue|selfservice)$/;
 
@@ -49,5 +51,16 @@ Creepy crawlies
 
 =cut
 
+package FS::CurrentUser::BootstrapUser;
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  bless ($self, $class);
+}
+
+sub AUTOLOAD { 1 };
+
 1;
 
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 1f51ca69c..0d32002b2 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -74,7 +74,7 @@ sub forksuidsetup {
   $user = shift;
 
   if ( $FS::CurrentUser::upgrade_hack ) {
-    $user = '';
+    $user = 'fs_bootstrap';
   } else {
     croak "fatal: adminsuidsetup called without arguements" unless $user;
 
-- 
cgit v1.2.1


From 596ce42ffa369fe9b6ab7cc27765e69fa3d8da73 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jul 2006 03:17:41 +0000
Subject: this should fix the bootstrapping

---
 FS/FS/CurrentUser.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/CurrentUser.pm b/FS/FS/CurrentUser.pm
index a2dfd714c..9f2c93f4f 100644
--- a/FS/FS/CurrentUser.pm
+++ b/FS/FS/CurrentUser.pm
@@ -22,7 +22,7 @@ sub load_user {
   my( $class, $user ) = @_; #, $pass
 
   if ( $upgrade_hack ) {
-    return new FS::CurrentUser::BootstrapUser;
+    return $CurrentUser = new FS::CurrentUser::BootstrapUser;
   }
 
   #return "" if $user =~ /^fs_(queue|selfservice)$/;
-- 
cgit v1.2.1


From 283be8eddb1cb0d1af79822a36914e56f861d44d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jul 2006 03:27:48 +0000
Subject: this should fix radius group editing and the "Reference found where
 even-sized list expected at /usr/local/share/perl/5.8.4/FS/svc_Common.pm line
 473" error

---
 FS/FS/svc_Common.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index f2e1b9adb..c1c482d72 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -470,7 +470,7 @@ sub setx {
   my $self = shift;
   my $x = shift;
   my @x = ref($x) ? @$x : ($x);
-  my %coderef = @_ ? shift : {};
+  my $coderef = scalar(@_) ? shift : {};
 
   my $error =
     $self->ut_numbern('svcnum')
@@ -490,8 +490,8 @@ sub setx {
     my $columnname  = $part_svc_column->columnname;
     my $columnvalue = $part_svc_column->columnvalue;
 
-    if ( exists( $coderef{columnname} ) ) {
-      &{ $coderef{$columnname} }( $self, $columnvalue);
+    if ( exists( $coderef->{$columnname} ) ) {
+      &{ $coderef->{$columnname} }( $self, $columnvalue);
     } else {
       $self->setfield( $columnname, $columnvalue );
     }
-- 
cgit v1.2.1


From 11f98403d0c7bf158ad0f71120e15c0bdf3d792c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 Jul 2006 04:20:21 +0000
Subject: don't send cancellation emails on package changes

---
 FS/FS/cust_pkg.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index ed9f2cbc6..45128e966 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1365,7 +1365,7 @@ sub order {
       $dbh->rollback if $oldAutoCommit;
       return "Unable to transfer all services from package ".$old_pkg->pkgnum;
     }
-    $error = $old_pkg->cancel;
+    $error = $old_pkg->cancel( quiet=>1 );
     if ($error) {
       $dbh->rollback;
       return $error;
-- 
cgit v1.2.1


From 580330233cbf32c58d9f29dc391bd2ebd83e16d5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 16 Jul 2006 00:55:06 +0000
Subject: odds and ends

---
 FS/FS/Conf.pm                                      |   4 +-
 FS/FS/agent.pm                                     |  25 +-
 FS/FS/cust_bill.pm                                 |  11 +-
 FS/FS/inventory_item.pm                            |   3 +-
 SCHEMA_CHANGE                                      |   2 +-
 .../FS-SelfService/freeside-selfservice-clientd    |   5 +-
 httemplate/autohandler                             |  15 +-
 httemplate/browse/cust_pay_batch.cgi               |   2 +-
 httemplate/edit/cust_credit.cgi                    |   4 +-
 httemplate/elements/overlibmws.js                  | 328 ++++++++++-----------
 httemplate/elements/overlibmws_draggable.js        |   4 +-
 httemplate/elements/phonenumber.html               |   8 +-
 httemplate/search/cust_bill.html                   |   9 +-
 httemplate/search/svc_acct.cgi                     |   1 +
 httemplate/search/svc_domain.cgi                   |   5 +-
 httemplate/search/svc_forward.cgi                  |   5 +-
 httemplate/search/svc_www.cgi                      |   4 +
 httemplate/view/svc_external.cgi                   |   1 -
 18 files changed, 231 insertions(+), 205 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 57c18e678..8b3cd1aa6 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1363,8 +1363,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'users-allow_comp',
-    'section'     => '',
-    'description' => 'Usernames (Freeside users, created with <a href="../docs/man/bin/freeside-adduser.html">freeside-adduser</a>) which can create complimentary customers, one per line.  If no usernames are entered, all users can create complimentary accounts.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, enable the <i>Complimentary customer</i> access right instead.  Was: Usernames (Freeside users, created with <a href="../docs/man/bin/freeside-adduser.html">freeside-adduser</a>) which can create complimentary customers, one per line.  If no usernames are entered, all users can create complimentary accounts.',
     'type'        => 'textarea',
   },
 
diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index 849dafa2a..4158341e4 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -221,7 +221,8 @@ sub cust_main_sql {
 
 =item num_active_cust_main
 
-Returns the number of active customers for this agent.
+Returns the number of active customers for this agent (customers with active
+recurring packages).
 
 =cut
 
@@ -239,6 +240,28 @@ sub active_cust_main {
   shift->cust_main_sql(FS::cust_main->active_sql);
 }
 
+=item num_inactive_cust_main
+
+Returns the number of inactive customers for this agent (customers with no
+active recurring packages, but otherwise unsuspended/uncancelled).
+
+=cut
+
+sub num_inactive_cust_main {
+  shift->num_sql(FS::cust_main->inactive_sql);
+}
+
+=item inactive_cust_main
+
+Returns the inactive customers for this agent, as cust_main objects.
+
+=cut
+
+sub inactive_cust_main {
+  shift->cust_main_sql(FS::cust_main->inactive_sql);
+}
+
+
 =item num_susp_cust_main
 
 Returns the number of suspended customers for this agent.
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 8a05fcf31..def84f91a 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -21,6 +21,7 @@ use FS::cust_credit;
 use FS::cust_pay;
 use FS::cust_pkg;
 use FS::cust_credit_bill;
+use FS::pay_batch;
 use FS::cust_pay_batch;
 use FS::cust_bill_event;
 use FS::part_pkg;
@@ -1282,17 +1283,19 @@ L<FS::cust_pay_batch>).
 sub batch_card {
   my $self = shift;
   my $cust_main = $self->cust_main;
+
   my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
   my $pay_batch = qsearchs('pay_batch', {'status' => 'O'});
 
-  unless ($pay_batch) {
+  unless ( $pay_batch ) {
     $pay_batch = new FS::pay_batch;
     $pay_batch->setfield('status' => 'O');
     my $error = $pay_batch->insert;
     if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
       die "error creating new batch: $error\n";
     }
   }
@@ -1315,10 +1318,12 @@ sub batch_card {
     'amount'   => $self->owed,
   } );
   my $error = $cust_pay_batch->insert;
-  die $error if $error;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    die $error;
+  }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
   '';
 }
 
diff --git a/FS/FS/inventory_item.pm b/FS/FS/inventory_item.pm
index 23bacf040..7fa350f2a 100644
--- a/FS/FS/inventory_item.pm
+++ b/FS/FS/inventory_item.pm
@@ -3,10 +3,11 @@ package FS::inventory_item;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( dbh qsearch qsearchs );
+use FS::cust_main_Mixin;
 use FS::inventory_class;
 use FS::cust_svc;
 
-@ISA = qw(FS::Record);
+@ISA = qw( FS::cust_main_Mixin FS::Record );
 
 =head1 NAME
 
diff --git a/SCHEMA_CHANGE b/SCHEMA_CHANGE
index db39c28d9..b3d77aaf8 100644
--- a/SCHEMA_CHANGE
+++ b/SCHEMA_CHANGE
@@ -3,7 +3,7 @@ primarily:
 
 if the changes are something other than table and/or column additions:
 - httemplate/docs/upgrade10.html
-- README.1.5.X
+- README.1.7.X
 
 for new tables:
 - make sure the new tables are added to FS/FS/Schema.pm and run make install-perl-modules
diff --git a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
index ededfa6e9..bdc8e1547 100644
--- a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@ -57,8 +57,9 @@ if ( -e $pid_file ) {
   open(PIDFILE,"<$pid_file");
   my $old_pid = <PIDFILE>;
   close PIDFILE;
-  $old_pid =~ /^(\d+)$/;
-  kill 'TERM', $1;
+  if ( $old_pid =~ /^(\d+)$/ ) {
+    kill 'TERM', $1;
+  }
 }
 open(PIDFILE,">$pid_file");
 print PIDFILE "$$\n";
diff --git a/httemplate/autohandler b/httemplate/autohandler
index ad0ab8ba6..a017eccb7 100644
--- a/httemplate/autohandler
+++ b/httemplate/autohandler
@@ -9,15 +9,18 @@ if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
 
   if ( lc($r->content_type) eq 'text/html' ) {
 
-    # barely worth it, just in case someone tries to use profiling on a
-    # non-RT install
-    eval "use Text::Wrapper;";
-    die $@ if $@;
+    ## barely worth it, just in case someone tries to use profiling on a
+    ## non-RT install
+    #eval "use Text::Wrapper;";
+    #die $@ if $@;
 
     my $wrapper = new Text::Wrapper( columns => 80 );
-
+    my $text = dbh->sprintProfile();
+    #my $text = $wrapper->wrap( dbh->sprintProfile() );
+    $text =~ s/^/                                                          /mg;
+    
     $profile = '<PRE>'.
-               encode_entities( $wrapper->wrap( dbh->sprintProfile() ) ).
+               encode_entities( $text ).
                #"\n\n". &sprintAutoProfile(). '</PRE>';
                "\n\n".                        '</PRE>';
   } 
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 6ee983ab4..c7f0afe76 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -15,7 +15,7 @@ Filename <INPUT TYPE="file" NAME="batch_results"><BR>
 Format <SELECT NAME="format">
 <OPTION VALUE="">Default batch mode</OPTION>
 <OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV results from TD Canada Trust Merchant PC Batch</OPTION>
-<OPTION VALUE="BoM">Bank of Montreal ECA results</OPTION>
+<OPTION VALUE="BoM">Bank of Montreal ECA batch</OPTION>
 </SELECT><BR>
 <INPUT TYPE="submit" VALUE="Upload"></FORM>
 <BR>
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 946b1087b..d19f0e4b3 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -24,9 +24,7 @@ my $otaker = getotaker;
 
 my $p1 = popurl(1);
 
-%>
-
-<%= header("Post Credit", '') %>
+%><%= include('/elements/header-popup.html', 'Post Credit') %>
 
 <% if ( $cgi->param('error') ) { %>
   <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
diff --git a/httemplate/elements/overlibmws.js b/httemplate/elements/overlibmws.js
index fba1105b5..5ef50d68f 100644
--- a/httemplate/elements/overlibmws.js
+++ b/httemplate/elements/overlibmws.js
@@ -1,7 +1,7 @@
 /*
  Do not remove or change this notice.
  overlibmws.js core module - Copyright Foteos Macrides 2002-2005. All rights reserved.
-   Initial: August 18, 2002 - Last Revised: February 10, 2005
+   Initial: August 18, 2002 - Last Revised: May 30, 2006
  This module is subject to the same terms of usage as for Erik Bosrup's overLIB,
  though only a minority of the code and API now correspond with Erik's version.
  See the overlibmws Change History and Command Reference via:
@@ -14,30 +14,30 @@
 */
 
 // PRE-INIT -- Ignore these lines, configuration is below.
-var OLloaded=0,pmCnt=1,pMtr=new Array(),OLv,OLudf,OLrefXY;
-var OLpct=new Array("83%","67%","83%","100%","117%","150%","200%","267%");
-var OLbubblePI=0,OLcrossframePI=0,OLdebugPI=0,OLdraggablePI=0,OLexclusivePI=0,OLfilterPI=0;
-var OLfunctionPI=0,OLhidePI=0,OLiframePI=0,OLovertwoPI=0,OLscrollPI=0,OLshadowPI=0;
+var OLloaded=0,pmCnt=1,pMtr=new Array(),OLcmdLine=new Array(),OLrunTime=new Array(),OLv,OLudf,
+OLpct=new Array("83%","67%","83%","100%","117%","150%","200%","267%"),OLrefXY,
+OLbubblePI=0,OLcrossframePI=0,OLdebugPI=0,OLdraggablePI=0,OLexclusivePI=0,OLfilterPI=0,
+OLfunctionPI=0,OLhidePI=0,OLiframePI=0,OLovertwoPI=0,OLscrollPI=0,OLshadowPI=0,OLprintPI=0;
 if(typeof OLgateOK=='undefined')var OLgateOK=1;
-OLregCmds(
- 'inarray,caparray,caption,sticky,nofollow,background,noclose,mouseoff,offdelay,right,left,'
-+'center,offsetx,offsety,fgcolor,bgcolor,cgcolor,textcolor,capcolor,closecolor,width,wrap,'
-+'wrapmax,height,border,base,status,autostatus,autostatuscap,snapx,snapy,fixx,fixy,relx,rely,'
-+'midx,midy,ref,refc,refp,refx,refy,fgbackground,bgbackground,cgbackground,padx,pady,fullhtml,'
-+'below,above,vcenter,capicon,textfont,captionfont,closefont,textsize,captionsize,closesize,'
-+'timeout,delay,hauto,vauto,nojustx,nojusty,closetext,closeclick,closetitle,fgclass,bgclass,'
-+'cgclass,capbelow,textpadding,textfontclass,captionpadding,captionfontclass,closefontclass,'
-+'label,donothing');
-
+var OLp1or2c='inarray,caparray,caption,closetext,right,left,center,autostatuscap,padx,pady,'
++'below,above,vcenter,donothing',OLp1or2co='nofollow,background,offsetx,offsety,fgcolor,'
++'bgcolor,cgcolor,textcolor,capcolor,width,wrap,wrapmax,height,border,base,status,autostatus,'
++'snapx,snapy,fixx,fixy,relx,rely,midx,midy,ref,refc,refp,refx,refy,fgbackground,bgbackground,'
++'cgbackground,fullhtml,capicon,textfont,captionfont,textsize,captionsize,timeout,delay,hauto,'
++'vauto,nojustx,nojusty,fgclass,bgclass,cgclass,capbelow,textpadding,textfontclass,'
++'captionpadding,captionfontclass,sticky,noclose,mouseoff,offdelay,closecolor,closefont,'
++'closesize,closeclick,closetitle,closefontclass,decode',OLp1or2o='text,cap,close,hpos,vpos,'
++'padxl,padxr,padyt,padyb',OLp1co='label',OLp1or2=OLp1or2co+','+OLp1or2o,OLp1=OLp1co+','+'frame';
+OLregCmds(OLp1or2c+','+OLp1or2co+','+OLp1co);
 function OLud(v){return eval('typeof ol_'+v+'=="undefined"')?1:0;}
 
-// DEFAULT CONFIGURATION -- See overlibConfig.txt for descriptions.
-if(OLud('fgcolor'))var ol_fgcolor="#CCCCFF";
+// DEFAULT CONFIGURATION -- See overlibConfig.txt for descriptions
+if(OLud('fgcolor'))var ol_fgcolor="#ccccff";
 if(OLud('bgcolor'))var ol_bgcolor="#333399";
 if(OLud('cgcolor'))var ol_cgcolor="#333399";
 if(OLud('textcolor'))var ol_textcolor="#000000";
-if(OLud('capcolor'))var ol_capcolor="#FFFFFF";
-if(OLud('closecolor'))var ol_closecolor="#EEEEFF";
+if(OLud('capcolor'))var ol_capcolor="#ffffff";
+if(OLud('closecolor'))var ol_closecolor="#eeeeff";
 if(OLud('textfont'))var ol_textfont="Verdana,Arial,Helvetica";
 if(OLud('captionfont'))var ol_captionfont="Verdana,Arial,Helvetica";
 if(OLud('closefont'))var ol_closefont="Verdana,Arial,Helvetica";
@@ -106,43 +106,41 @@ if(OLud('vauto'))var ol_vauto=0;
 if(OLud('nojustx'))var ol_nojustx=0;
 if(OLud('nojusty'))var ol_nojusty=0;
 if(OLud('label'))var ol_label="";
+if(OLud('decode'))var ol_decode=0;
 // ARRAY CONFIGURATION - See overlibConfig.txt for descriptions.
 if(OLud('texts'))var ol_texts=new Array("Text 0","Text 1");
 if(OLud('caps'))var ol_caps=new Array("Caption 0","Caption 1");
 // END CONFIGURATION -- Don't change anything below, all configuration is above.
 
 // INIT -- Runtime variables.
-var o3_text="",o3_cap="",o3_sticky=0,o3_nofollow=0,o3_background="",o3_noclose=0,o3_mouseoff=0;
-var o3_offdelay=300,o3_hpos=RIGHT,o3_offsetx=10,o3_offsety=10,o3_fgcolor="",o3_bgcolor="";
-var o3_cgcolor="",o3_textcolor="",o3_capcolor="",o3_closecolor="",o3_width=200,o3_wrap=0;
-var o3_wrapmax=0,o3_height= -1,o3_border=1,o3_base=0,o3_status="",o3_autostatus=0,o3_snapx=0;
-var o3_snapy=0,o3_fixx= -1,o3_fixy= -1,o3_relx=null,o3_rely=null,o3_midx=null,o3_midy=null;
-var o3_ref="",o3_refc='UL',o3_refp='UL',o3_refx=0,o3_refy=0,o3_fgbackground="";
-var o3_bgbackground="",o3_cgbackground="",o3_padxl=0,o3_padxr=0,o3_padyt=0,o3_padyb=0;
-var o3_fullhtml=0,o3_vpos=BELOW,o3_capicon="",o3_textfont="Verdana,Arial,Helvetica";
-var o3_captionfont="Verdana,Arial,Helvetica",o3_closefont="Verdana,Arial,Helvetica";
-var o3_textsize=1,o3_captionsize=1,o3_closesize=1,o3_frame=self,o3_timeout=0,o3_delay=0;
-var o3_hauto=0,o3_vauto=0,o3_nojustx=0,o3_nojusty=0,o3_close="Close",o3_closeclick=0;
-var o3_closetitle="",o3_fgclass="",o3_bgclass="",o3_cgclass="",o3_textpadding=2;
-var o3_textfontclass="",o3_captionpadding=2,o3_captionfontclass="",o3_closefontclass="";
-var o3_capbelow=0,o3_label="",CSSOFF=DONOTHING,CSSCLASS=DONOTHING;
-var OLx=0,OLy=0,OLshowingsticky=0,OLallowmove=0,OLremovecounter=0;
-var OLdelayid=0,OLtimerid=0,OLshowid=0,OLndt=0;
-var over=null,OLfnRef="",OLhover=0;
-var OLua=navigator.userAgent.toLowerCase();
-var OLns4=(navigator.appName=='Netscape'&&parseInt(navigator.appVersion)==4);
-var OLns6=(document.getElementById)?1:0;
-var OLie4=(document.all)?1:0;
-var OLgek=(OLv=OLua.match(/gecko\/(\d{8})/i))?parseInt(OLv[1]):0;
-var OLmac=(OLua.indexOf('mac')>=0)?1:0;
-var OLsaf=(OLua.indexOf('safari')>=0)?1:0;
-var OLkon=(OLua.indexOf('konqueror')>=0)?1:0;
-var OLkht=(OLsaf||OLkon)?1:0;
-var OLopr=(OLua.indexOf('opera')>=0)?1:0;
-var OLop7=(OLopr&&document.createTextNode)?1:0;
+var o3_text="",o3_cap="",o3_sticky=0,o3_nofollow=0,o3_background="",o3_noclose=0,o3_mouseoff=0,
+o3_offdelay=300,o3_hpos=RIGHT,o3_offsetx=10,o3_offsety=10,o3_fgcolor="",o3_bgcolor="",
+o3_cgcolor="",o3_textcolor="",o3_capcolor="",o3_closecolor="",o3_width=200,o3_wrap=0,
+o3_wrapmax=0,o3_height= -1,o3_border=1,o3_base=0,o3_status="",o3_autostatus=0,o3_snapx=0,
+o3_snapy=0,o3_fixx= -1,o3_fixy= -1,o3_relx=null,o3_rely=null,o3_midx=null,o3_midy=null,o3_ref="",
+o3_refc='UL',o3_refp='UL',o3_refx=0,o3_refy=0,o3_fgbackground="",o3_bgbackground="",
+o3_cgbackground="",o3_padxl=0,o3_padxr=0,o3_padyt=0,o3_padyb=0,o3_fullhtml=0,o3_vpos=BELOW,
+o3_capicon="",o3_textfont="Verdana,Arial,Helvetica",o3_captionfont="",o3_closefont="",
+o3_textsize=1,o3_captionsize=1,o3_closesize=1,o3_frame=self,o3_timeout=0,o3_delay=0,o3_hauto=0,
+o3_vauto=0,o3_nojustx=0,o3_nojusty=0,o3_close="",o3_closeclick=0,o3_closetitle="",o3_fgclass="",
+o3_bgclass="",o3_cgclass="",o3_textpadding=2,o3_textfontclass="",o3_captionpadding=2,
+o3_captionfontclass="",o3_closefontclass="",o3_capbelow=0,o3_label="",o3_decode=0,
+CSSOFF=DONOTHING,CSSCLASS=DONOTHING,OLdelayid=0,OLtimerid=0,OLshowid=0,OLndt=0,over=null,
+OLfnRef="",OLhover=0,OLx=0,OLy=0,OLshowingsticky=0,OLallowmove=0,OLcC=null,
+OLua=navigator.userAgent.toLowerCase(),
+OLns4=(navigator.appName=='Netscape'&&parseInt(navigator.appVersion)==4),
+OLns6=(document.getElementById)?1:0,
+OLie4=(document.all)?1:0,
+OLgek=(OLv=OLua.match(/gecko\/(\d{8})/i))?parseInt(OLv[1]):0,
+OLmac=(OLua.indexOf('mac')>=0)?1:0,
+OLsaf=(OLua.indexOf('safari')>=0)?1:0,
+OLkon=(OLua.indexOf('konqueror')>=0)?1:0,
+OLkht=(OLsaf||OLkon)?1:0,
+OLopr=(OLua.indexOf('opera')>=0)?1:0,
+OLop7=(OLopr&&document.createTextNode)?1:0;
 if(OLopr){OLns4=OLns6=0;if(!OLop7)OLie4=0;}
-var OLieM=((OLie4&&OLmac)&&!(OLkht||OLopr))?1:0;
-var OLie5=0,OLie55=0;if(OLie4&&!OLop7){
+var OLieM=((OLie4&&OLmac)&&!(OLkht||OLopr))?1:0,
+OLie5=0,OLie55=0;if(OLie4&&!OLop7){
 if((OLv=OLua.match(/msie (\d\.\d+)\.*/i))&&(OLv=parseFloat(OLv[1]))>=5.0){
 OLie5=1;OLns6=0;if(OLv>=5.5)OLie55=1;}if(OLns6)OLie4=0;}
 if(OLns4)window.onresize=function(){location.reload();}
@@ -156,14 +154,16 @@ else{overlib=nd=cClick=OLpageDefaults=no_overlib;}
 // Loads defaults then args into runtime variables.
 function overlib(){
 if(!(OLloaded&&OLgateOK))return;
-if((OLexclusivePI)&&OLisExclusive(overlib.arguments))return true;
+if((OLexclusivePI)&&OLisExclusive(arguments))return true;
 if(OLchkMh)OLmh();
 if(OLndt&&!OLtimerid)OLndt=0;if(over)cClick();
-OLloadP1or2();OLload('close,closeclick,closetitle,noclose,mouseoff,offdelay,sticky,'
-+'closecolor,closefont,closesize,closefontclass,frame,label');OLfnRef="";OLhover=0;
+OLload(OLp1or2);OLload(OLp1);
+OLfnRef="";OLhover=0;
 OLsetRunTimeVar();
-OLparseTokens('o3_',overlib.arguments);
+OLparseTokens('o3_',arguments);
 if(!(over=OLmkLyr()))return false;
+if(o3_decode)OLdecode();
+if(OLprintPI)OLchkPrint();
 if(OLbubblePI)OLchkForBubbleEffect();
 if(OLdebugPI)OLsetDebugCanShow();
 if(OLshadowPI)OLinitShadow();
@@ -172,7 +172,7 @@ if(OLfilterPI)OLinitFilterLyr();
 if(OLexclusivePI&&o3_exclusive&&o3_exclusivestatus!="")o3_status=o3_exclusivestatus;
 else if(o3_autostatus==2&&o3_cap!="")o3_status=o3_cap;
 else if(o3_autostatus==1&&o3_text!="")o3_status=o3_text;
-if(o3_delay==0){return OLmain();
+if(!o3_delay){return OLmain();
 }else{OLdelayid=setTimeout("OLmain()",o3_delay);
 if(o3_status!=""){self.status=o3_status;return true;}
 else if(!(OLop7&&event&&event.type=='mouseover'))return false;}
@@ -180,25 +180,24 @@ else if(!(OLop7&&event&&event.type=='mouseover'))return false;}
 
 // Clears popups if appropriate
 function nd(time){
-if(!(OLloaded&&OLgateOK))return;
-if((OLexclusivePI)&&OLisExclusive())return true;
+if(OLloaded&&OLgateOK){if(!((OLexclusivePI)&&OLisExclusive())){
 if(time&&over&&!o3_delay){if(OLtimerid>0)clearTimeout(OLtimerid);
 OLtimerid=(OLhover&&o3_frame==self&&!OLcursorOff())?0:
-setTimeout("cClick()",(o3_timeout=OLndt=time));
-}else{if(OLremovecounter>=1)OLshowingsticky=0;if(!OLshowingsticky){
-OLallowmove=0;if(over)OLhideObject(over);}else{OLremovecounter++;}}
-return true;
+setTimeout("cClick()",(o3_timeout=OLndt=time));}else{
+if(!OLshowingsticky){OLallowmove=0;if(over)OLhideObject(over);}}}}
+return false;
 }
 
 // Close function for stickies
 function cClick(){
-if(OLloaded&&OLgateOK){OLhover=0;if(over)OLhideObject(over);OLshowingsticky=0;}
+if(OLloaded&&OLgateOK){OLhover=0;if(over){
+if(OLovertwoPI&&over==over2)cClick2();OLhideObject(over);OLshowingsticky=0;}}
 return false;
 }
 
 // Sets page-specific defaults.
 function OLpageDefaults(){
-OLparseTokens('ol_',OLpageDefaults.arguments);
+OLparseTokens('ol_',arguments);
 }
 
 // For unsupported browsers.
@@ -210,24 +209,14 @@ function no_overlib(){return false;}
 function OLmain(){
 o3_delay=0;
 if(o3_frame==self){if(o3_noclose)OLoptMOUSEOFF(0);else if(o3_mouseoff)OLoptMOUSEOFF(1);}
-OLdoLyr();
-OLallowmove=0;if(o3_timeout>0){
+if(o3_sticky)OLshowingsticky=1;OLdoLyr();OLallowmove=0;if(o3_timeout>0){
 if(OLtimerid>0)clearTimeout(OLtimerid);OLtimerid=setTimeout("cClick()",o3_timeout);}
 if(o3_ref){OLrefXY=OLgetRefXY(o3_ref);if(OLrefXY[0]==null){o3_ref="";o3_midx=0;o3_midy=0;}}
-OLdisp(o3_status);
-if(OLdraggablePI)OLcheckDrag();
+OLdisp(o3_status);if(OLdraggablePI)OLcheckDrag();
 if(o3_status!="")return true;else if(!(OLop7&&event&&event.type=='mouseover'))return false;
 }
 
-// Loads defaults for primaries or secondaries
-function OLloadP1or2(){
-OLload('text,cap,capbelow,textpadding,captionpadding,border,base,status,autostatus,nofollow,'
-+'width,wrap,wrapmax,height,hpos,vpos,offsetx,offsety,snapx,snapy,relx,rely,midx,midy,ref,'
-+'refc,refp,refx,refy,fixx,fixy,nojustx,nojusty,hauto,vauto,timeout,delay,fgcolor,bgcolor,'
-+'cgcolor,textcolor,capcolor,textfont,captionfont,textsize,captionsize,fgbackground,'
-+'bgbackground,cgbackground,capicon,background,padxl,padxr,padyt,padyb,fullhtml,fgclass,'
-+'bgclass,cgclass,textfontclass,captionfontclass');
-}
+// Loads o3_ variables
 function OLload(c){var i,m=c.split(',');for(i=0;i<m.length;i++)eval('o3_'+m[i]+'=ol_'+m[i]);}
 
 // Chooses LGF 
@@ -258,8 +247,7 @@ if(o3_bgcolor!='')o3_bgcolor=' bgcolor="'+o3_bgcolor+'"';
 if(o3_cgcolor!='')o3_cgcolor=' bgcolor="'+o3_cgcolor+'"';
 if(o3_height>0)o3_height=' height="'+o3_height+'"';else o3_height='';}
 if(!OLns4)OLrepositionTo(over,(OLns6?20:0),0);var lyrHtml=OLdoLGF();
-if(o3_sticky){if(OLtimerid>0){clearTimeout(OLtimerid);OLtimerid=0;}
-OLshowingsticky=1;OLremovecounter=0;}
+if(o3_sticky&&OLtimerid>0){clearTimeout(OLtimerid);OLtimerid=0;}
 if(o3_wrap&&!o3_fullhtml){OLlayerWrite(lyrHtml);
 o3_width=(OLns4?over.clip.width:over.offsetWidth);
 if(OLns4&&o3_wrapmax<1)o3_wrapmax=o3_frame.innerWidth-40;
@@ -279,19 +267,19 @@ OLsetBackground('');return t;
 
 // Makes table with caption and optional close link
 function OLcontentCaption(txt,title,close){
-var closing='',closeevent='onmouseover',caption,t;
-if(o3_closeclick==1)closeevent=(o3_closetitle?'title="'+o3_closetitle+'" ':'')+'onclick';
+var closing=(OLprintPI?OLprintCapLGF():''),closeevent='onmouseover',caption,t,
+cC='javascript:return '+OLfnRef+(OLovertwoPI&&over==over2?'cClick2();':'cClick();');
+if(o3_closeclick)closeevent=(o3_closetitle?'title="'+o3_closetitle+'" ':'')+'onclick';
 if(o3_capicon!='')o3_capicon='<img src="'+o3_capicon+'" /> ';
-if(close!=''){closing='<td align="right"><a href="javascript:return '+OLfnRef+'cClick();" '
-+closeevent+'="return '+OLfnRef+'cClick();"'+(o3_closefontclass?' class="'+o3_closefontclass
-+'">':'>'+OLlgfUtil(0,'','span',o3_closecolor,o3_closefont,o3_closesize))+close
-+(o3_closefontclass?'':OLlgfUtil(1,'','span'))+'</a></td>';}
+if(close){closing+='<td align="right"><a href="'+cC+'" '
++closeevent+'="'+cC+'"'+(o3_closefontclass?' class="'+o3_closefontclass
++'">':'>'+OLlgfUtil(0,0,'','span',o3_closecolor,o3_closefont,o3_closesize))+close
++(o3_closefontclass?'':OLlgfUtil(1,0,'','span'))+'</a></td>';}
 caption='<table'+OLwd(0)+' border="0" cellpadding="'+o3_captionpadding+'" cellspacing="0"'
 +(o3_cgclass?' class="'+o3_cgclass+'"':o3_cgcolor+o3_cgbackground)+'><tr><td'+OLwd(0)
 +(o3_cgclass?' class="'+o3_cgclass+'">':'>')+(o3_captionfontclass?'<div class="'
-+o3_captionfontclass+'">':'<strong>'
-+OLlgfUtil(0,'','div',o3_capcolor,o3_captionfont,o3_captionsize))+o3_capicon+title
-+OLlgfUtil(1,'','div')+(o3_captionfontclass?'':'</strong>')+'</td>'+closing+'</tr></table>';
++o3_captionfontclass+'">':OLlgfUtil(0,1,'','div',o3_capcolor,o3_captionfont,
+o3_captionsize))+o3_capicon+title+OLlgfUtil(1,1,'','div')+'</td>'+closing+'</tr></table>';
 t=OLbgLGF()+(o3_capbelow?OLfgLGF(txt)+caption:caption+OLfgLGF(txt))+OLbaseLGF();
 OLsetBackground('');return t;
 }
@@ -302,8 +290,8 @@ var t;if(hasfullhtml){t=txt;}else{t='<table'+OLwd(1)
 +' border="0" cellpadding="0" cellspacing="0" '+'height="'+o3_height
 +'"><tr><td colspan="3" height="'+o3_padyt+'"></td></tr><tr><td width="'
 +o3_padxl+'"></td><td valign="top"'+OLwd(2)+'>'
-+OLlgfUtil(0,o3_textfontclass,'div',o3_textcolor,o3_textfont,o3_textsize)+txt+
-OLlgfUtil(1,'','div')+'</td><td width="'+o3_padxr+'"></td></tr><tr><td colspan="3" height="'
++OLlgfUtil(0,0,o3_textfontclass,'div',o3_textcolor,o3_textfont,o3_textsize)+txt+
+OLlgfUtil(1,0,'','div')+'</td><td width="'+o3_padxr+'"></td></tr><tr><td colspan="3" height="'
 +o3_padyb+'"></td></tr></table>';}
 OLsetBackground(image);return t;
 }
@@ -317,14 +305,15 @@ function OLfgLGF(t){
 return '<table'+OLwd(0)+o3_height+' border="0" cellpadding="'+o3_textpadding
 +'" cellspacing="0"'+(o3_fgclass?' class="'+o3_fgclass+'"':o3_fgcolor+o3_fgbackground)
 +'><tr><td valign="top"'+(o3_fgclass?' class="'+o3_fgclass+'"':'')+'>'
-+OLlgfUtil(0,o3_textfontclass,'div',o3_textcolor,o3_textfont,o3_textsize)+t
-+OLlgfUtil(1,'','div')+'</td></tr></table>';
++OLlgfUtil(0,0,o3_textfontclass,'div',o3_textcolor,o3_textfont,o3_textsize)+t
++(OLprintPI?OLprintFgLGF():'')+OLlgfUtil(1,0,'','div')+'</td></tr></table>';
 }
-function OLlgfUtil(end,tfc,ele,col,fac,siz){
-if(end)return ('</'+(OLns4?'font':ele)+'>');else return (tfc?'<div class="'+tfc+'">':
-('<'+(OLns4?'font color="'+col+'" face="'+OLquoteMultiNameFonts(fac)+'" size="'+siz:ele
-+' style="color:'+col+';font-family:'+OLquoteMultiNameFonts(fac)+';font-size:'+siz+';'
-+(ele=='span'?'text-decoration:underline;':''))+'">'));
+function OLlgfUtil(end,stg,tfc,ele,col,fac,siz){
+if(end)return ('</'+(OLns4?'font'+(stg?'></strong':''):ele)+'>');else return (tfc?'<div '
++'class="' +tfc +'">':('<'+(OLns4?(stg?'strong><':'')+'font color="'+col+'" face="'
++OLquoteMultiNameFonts(fac)+'" size="'+siz:ele+' style="color:'+col
++(stg?';font-weight:bold':'')+';font-family:'+OLquoteMultiNameFonts(fac)+';font-size:'
++siz+';'+(ele=='span'?'text-decoration:underline;':''))+'">'));
 }
 function OLquoteMultiNameFonts(f){
 var i,v,pM=f.split(',');
@@ -354,34 +343,33 @@ else{if(OLns6)over.style.width=o3_width+'px';over.style.backgroundImage='url('+i
 */
 // Displays layer
 function OLdisp(s){
-if(OLallowmove==0){if(OLshadowPI)OLdispShadow();if(OLiframePI)OLdispIfs();OLplaceLayer();
+if(!OLallowmove){if(OLshadowPI)OLdispShadow();if(OLiframePI)OLdispIfs();OLplaceLayer();
 if(OLndt)OLshowObject(over);else OLshowid=setTimeout("OLshowObject(over)",1);
 OLallowmove=(o3_sticky||o3_nofollow)?0:1;}OLndt=0;if(s!="")self.status=s;
 }
 
 // Decides placement of layer.
 function OLplaceLayer(){
-var snp,X,Y,pgLeft,pgTop,pWd=o3_width,pHt,iWd=100,iHt=100,SB=0,LM=0,CX=0,TM=0,BM=0,CY=0;
-var o=OLfd(),nsb=(OLgek>=20010505&&!o3_frame.scrollbars.visible)?1:0;
+var snp,X,Y,pgLeft,pgTop,pWd=o3_width,pHt,iWd=100,iHt=100,SB=0,LM=0,CX=0,TM=0,BM=0,CY=0,
+o=OLfd(),nsb=(OLgek>=20010505&&!o3_frame.scrollbars.visible)?1:0;
 if(!OLkht&&o&&o.clientWidth)iWd=o.clientWidth;
 else if(o3_frame.innerWidth){SB=Math.ceil(1.4*(o3_frame.outerWidth-o3_frame.innerWidth));
 if(SB>20)SB=20;iWd=o3_frame.innerWidth;}
 pgLeft=(OLie4)?o.scrollLeft:o3_frame.pageXOffset;
-if(OLie55&&OLfilterPI&&o3_filtershadow)SB=CX=5;else
+if(OLie55&&OLfilterPI&&o3_filter&&o3_filtershadow)SB=CX=5;else
 if((OLshadowPI)&&bkdrop&&o3_shadow&&o3_shadowx){SB+=((o3_shadowx>0)?o3_shadowx:0);
 LM=((o3_shadowx<0)?Math.abs(o3_shadowx):0);CX=Math.abs(o3_shadowx);}
 if(o3_ref!=""||o3_fixx> -1||o3_relx!=null||o3_midx!=null){
-if(o3_ref!=""){
-X=OLrefXY[0];if(OLie55&&OLfilterPI&&o3_filtershadow){if(o3_refp=='UR'||o3_refp=='LR')X -= 5;}
-else if((OLshadowPI)&&bkdrop&&o3_shadow&&o3_shadowx){  
-if(o3_shadowx<0&&(o3_refp=='UL'||o3_refp=='LL'))X += o3_shadowx;
-else if(o3_shadowx>0&&(o3_refp=='UR'||o3_refp=='LR'))X -= o3_shadowx;}
+if(o3_ref!=""){X=OLrefXY[0];if(OLie55&&OLfilterPI&&o3_filter&&o3_filtershadow){
+if(o3_refp=='UR'||o3_refp=='LR')X-=5;}
+else if((OLshadowPI)&&bkdrop&&o3_shadow&&o3_shadowx){
+if(o3_shadowx<0&&(o3_refp=='UL'||o3_refp=='LL'))X-=o3_shadowx;else
+if(o3_shadowx>0&&(o3_refp=='UR'||o3_refp=='LR'))X-=o3_shadowx;}
 }else{if(o3_midx!=null){
 X=parseInt(pgLeft+((iWd-pWd-SB-LM)/2)+o3_midx);
 }else{if(o3_relx!=null){
 if(o3_relx>=0)X=pgLeft+o3_relx+LM;else X=pgLeft+o3_relx+iWd-pWd-SB;
-}else{
-X=o3_fixx+LM;}}}
+}else{X=o3_fixx+LM;}}}
 }else{
 if(o3_hauto){
 if(o3_hpos==LEFT&&OLx-pgLeft<iWd/2&&OLx-pWd-o3_offsetx<pgLeft+LM)o3_hpos=RIGHT;else
@@ -398,13 +386,12 @@ if(!OLkht&&!nsb&&o&&o.clientHeight)iHt=o.clientHeight;
 else if(o3_frame.innerHeight)iHt=o3_frame.innerHeight;
 if(OLbubblePI&&o3_bubble)pHt=OLbubbleHt;else pHt=OLns4?over.clip.height:over.offsetHeight;
 if((OLshadowPI)&&bkdrop&&o3_shadow&&o3_shadowy){TM=(o3_shadowy<0)?Math.abs(o3_shadowy):0;
-if(OLie55&&OLfilterPI&&o3_filtershadow)BM=CY=5;else
+if(OLie55&&OLfilterPI&&o3_filter&&o3_filtershadow)BM=CY=5;else
 BM=(o3_shadowy>0)?o3_shadowy:0;CY=Math.abs(o3_shadowy);}
 if(o3_ref!=""||o3_fixy> -1||o3_rely!=null||o3_midy!=null){
-if(o3_ref!=""){
-Y=OLrefXY[1];if(OLie55&&OLfilterPI&&o3_filtershadow){if(o3_refp=='LL'||o3_refp=='LR')Y -= 5;}
-else if((OLshadowPI)&&bkdrop&&o3_shadow&&o3_shadowy){
-if(o3_shadowy<0&&(o3_refp=='UL'||o3_refp=='UR'))Y+=o3_shadowy;else
+if(o3_ref!=""){Y=OLrefXY[1];if(OLie55&&OLfilterPI&&o3_filter&&o3_filtershadow){
+if(o3_refp=='LL'||o3_refp=='LR')Y-=5;}else if((OLshadowPI)&&bkdrop&&o3_shadow&&o3_shadowy){
+if(o3_shadowy<0&&(o3_refp=='UL'||o3_refp=='UR'))Y-=o3_shadowy;else
 if(o3_shadowy>0&&(o3_refp=='LL'||o3_refp=='LR'))Y-=o3_shadowy;}
 }else{if(o3_midy!=null){
 Y=parseInt(pgTop+((iHt-pHt-CY)/2)+o3_midy);
@@ -434,54 +421,56 @@ return (!OLop7&&fdc&&fdc!='BackCompat'&&fdd&&fdd.clientWidth)?fd.documentElement
 }
 
 // Gets location of REFerence object
-function OLgetRefXY(r){
-var mn=r,mr=OLgetRef(mn),o,of,rXY;
-if(!mr)return [null,null];
-o=mr;rXY=[o3_refx,o3_refy];
-if(OLns4){if(typeof mr.length!='undefined'&&mr.length>1){
-o=mr[0];rXY[0]+=mr[0].x+mr[1].pageX;rXY[1]+=mr[0].y+mr[1].pageY;
-}else{if((mr.toString().indexOf('Image')!= -1)||(mr.toString().indexOf('Anchor')!= -1)){
-rXY[0]+=mr.x;rXY[1]+=mr.y;}else{rXY[0]+=mr.pageX;rXY[1]+=mr.pageY;}}
-}else{rXY[0]+=OLpageLoc(mr,'Left');rXY[1]+=OLpageLoc(mr,'Top');}
-of=OLgetRefOffsets(o);rXY[0]+=of[0];rXY[1]+=of[1];
+function OLgetRefXY(r,d){
+var o=OLgetRef(r,d),ob=o,rXY=[o3_refx,o3_refy],of;
+if(!o)return [null,null];
+if(OLns4){if(typeof o.length!='undefined'&&o.length>1){
+ob=o[0];rXY[0]+=o[0].x+o[1].pageX;rXY[1]+=o[0].y+o[1].pageY;
+}else{if((o.toString().indexOf('Image')!= -1)||(o.toString().indexOf('Anchor')!= -1)){
+rXY[0]+=o.x;rXY[1]+=o.y;}else{rXY[0]+=o.pageX;rXY[1]+=o.pageY;}}
+}else{rXY[0]+=OLpageLoc(o,'Left');rXY[1]+=OLpageLoc(o,'Top');}
+of=OLgetRefOffsets(ob);rXY[0]+=of[0];rXY[1]+=of[1];
 return rXY;
 }
-function OLgetRef(l){var r=OLgetRefById(l);return (r)?r:OLgetRefByName(l);}
+function OLgetRef(l,d){var r=OLgetRefById(l,d);return (r)?r:OLgetRefByName(l,d);}
 
 // Seeks REFerence by id
 function OLgetRefById(l,d){
-var r="",j;l=(l||'overDiv');d=(d||o3_frame.document);
-if(OLie4&&d.all){return d.all[l];}else if(d.getElementById){return d.getElementById(l);
-}else if(d.layers&&d.layers.length>0){if(d.layers[l])return d.layers[l];
+l=(l||'overDiv');d=(d||o3_frame.document);var j,r;
+if(OLie4&&d.all)return d.all[l];if(d.getElementById)return d.getElementById(l);
+if(d.layers&&d.layers.length>0){if(d.layers[l])return d.layers[l];
 for(j=0;j<d.layers.length;j++){r=OLgetRefById(l,d.layers[j].document);if(r)return r;}}
 return null;
 }
 
-// Seeks REFerence by name (for img and a)
+// Seeks REFerence by name
 function OLgetRefByName(l,d){
-var r=null,j;d=(d||o3_frame.document);
-if(typeof d.images[l]!='undefined'&&d.images[l]){return d.images[l];
-}else if(typeof d.anchors[l]!='undefined'&&d.anchors[l]){return d.anchors[l];
-}else if(d.layers&&d.layers.length>0){
-for(j=0;j<d.layers.length;j++){r=OLgetRefByName(l,d.layers[j].document);
-if(r&&r.length>0)return r;else if(r)return [r,d.layers[j]];}}
+d=(d||o3_frame.document);var j,r,v=OLie4?d.all.tags('iframe'):
+OLns6?d.getElementsByTagName('iframe'):null;
+if(typeof d.images!='undefined'&&d.images[l])return d.images[l];
+if(typeof d.anchors!='undefined'&&d.anchors[l])return d.anchors[l];
+if(v)for(j=0;j<v.length;j++)if(v[j].name==l)return v[j];
+if(d.layers&&d.layers.length>0)for(j=0;j<d.layers.length;j++){
+r=OLgetRefByName(l,d.layers[j].document);
+if(r&&r.length>0)return r;else if(r)return [r,d.layers[j]];}
 return null;
 }
 
 // Gets layer vs REFerence offsets
 function OLgetRefOffsets(o){
-var mc=o3_refc.toUpperCase(),mp=o3_refp.toUpperCase(),mW=0,mH=0,pW=0,pH=0,off=[0,0];
+var c=o3_refc.toUpperCase(),p=o3_refp.toUpperCase(),W=0,H=0,pW=0,pH=0,of=[0,0];
 pW=(OLbubblePI&&o3_bubble)?o3_width:OLns4?over.clip.width:over.offsetWidth;
 pH=(OLbubblePI&&o3_bubble)?OLbubbleHt:OLns4?over.clip.height:over.offsetHeight;
-if((!OLop7)&&o.toString().indexOf('Image')!= -1){mW=o.width;mH=o.height;
-}else if((!OLop7)&&o.toString().indexOf('Anchor')!= -1){mc=o3_refc='UL';}else{
-mW=(OLns4)?o.clip.width:o.offsetWidth;mH=(OLns4)?o.clip.height:o.offsetHeight;}
-if(mc=='UL'){off=(mp=='UR')?[-pW,0]:(mp=='LL')?[0,-pH]:(mp=='LR')?[-pW,-pH]:[0,0];
-}else if(mc=='UR'){off=(mp=='UR')?[mW-pW,0]:(mp=='LL')?[mW,-pH]:(mp=='LR')?[mW-pW,-pH]:[mW,0];
-}else if(mc=='LL'){off=(mp=='UR')?[-pW,mH]:(mp=='LL')?[0,mH-pH]:(mp=='LR')?[-pW,mH-pH]:[0,mH];
-}else if(mc=='LR'){off=(mp=='UR')?[mW-pW,mH]:(mp=='LL')?[mW,mH-pH]:(mp=='LR')?[mW-pW,mH-pH]:
-[mW,mH];}
-return off;
+if((!OLop7)&&o.toString().indexOf('Image')!= -1){W=o.width;H=o.height;
+}else if((!OLop7)&&o.toString().indexOf('Anchor')!= -1){c=o3_refc='UL';}else{
+W=(OLns4)?o.clip.width:o.offsetWidth;H=(OLns4)?o.clip.height:o.offsetHeight;}
+if((OLns4||(OLns6&&OLgek))&&o.border){W+=2*parseInt(o.border);H+=2*parseInt(o.border);}
+if(c=='UL'){of=(p=='UR')?[-pW,0]:(p=='LL')?[0,-pH]:(p=='LR')?[-pW,-pH]:[0,0];
+}else if(c=='UR'){of=(p=='UR')?[W-pW,0]:(p=='LL')?[W,-pH]:(p=='LR')?[W-pW,-pH]:[W,0];
+}else if(c=='LL'){of=(p=='UR')?[-pW,H]:(p=='LL')?[0,H-pH]:(p=='LR')?[-pW,H-pH]:[0,H];
+}else if(c=='LR'){of=(p=='UR')?[W-pW,H]:(p=='LL')?[W,H-pH]:(p=='LR')?[W-pW,H-pH]:
+[W,H];}
+return of;
 }
 
 // Gets x or y location of object
@@ -494,11 +483,13 @@ return l;
 // Moves layer
 function OLmouseMove(e){
 var e=(e||event);
+OLcC=(OLovertwoPI&&over2&&over==over2?cClick2:cClick);
 OLx=(e.pageX||e.clientX+OLfd().scrollLeft);OLy=(e.pageY||e.clientY+OLfd().scrollTop);
-if((OLallowmove&&over)&&(o3_frame==self||over==OLgetRefById())){
+if((OLallowmove&&over)&&(o3_frame==self||over==OLgetRefById()
+||(OLovertwoPI&&over2==over&&over==OLgetRefById('overDiv2')))){
 OLplaceLayer();if(OLhidePI)OLhideUtil(0,1,1,0,0,0);}
-if(OLhover&&over&&o3_frame==self&&OLcursorOff())if(o3_offdelay<1)cClick();else
-{if(OLtimerid>0)clearTimeout(OLtimerid);OLtimerid=setTimeout("cClick()",o3_offdelay);}
+if(OLhover&&over&&o3_frame==self&&OLcursorOff())if(o3_offdelay<1)OLcC();else
+{if(OLtimerid>0)clearTimeout(OLtimerid);OLtimerid=setTimeout("OLcC()",o3_offdelay);}
 }
 
 // Capture mouse and chain other scripts.
@@ -515,12 +506,12 @@ OLdw.onmousemove=mh;if(OLns4)OLdw.captureEvents(Event.MOUSEMOVE);
  PARSING
 */
 function OLparseTokens(pf,ar){
-var i,v,md= -1,par=(pf!='ol_'),e=eval,p=OLpar,q=OLparQuo,t=OLtoggle;OLudf=(par&&!ar.length?1:0);
+var i,v,md= -1,par=(pf!='ol_'),p=OLpar,q=OLparQuo,t=OLtoggle;OLudf=(par&&!ar.length?1:0);
 for(i=0;i< ar.length;i++){if(md<0){if(typeof ar[i]=='number'){OLudf=(par?1:0);i--;}
 else{switch(pf){case 'ol_':ol_text=ar[i];break;default:o3_text=ar[i];}}md=0;
 }else{
-if(ar[i]==INARRAY){OLudf=0;e(pf+'text=ol_texts['+ar[++i]+']');continue;}
-if(ar[i]==CAPARRAY){e(pf+'cap=ol_caps['+ar[++i]+']');continue;}
+if(ar[i]==INARRAY){OLudf=0;eval(pf+'text=ol_texts['+ar[++i]+']');continue;}
+if(ar[i]==CAPARRAY){eval(pf+'cap=ol_caps['+ar[++i]+']');continue;}
 if(ar[i]==CAPTION){q(ar[++i],pf+'cap');continue;}
 if(Math.abs(ar[i])==STICKY){t(ar[i],pf+'sticky');continue;}
 if(Math.abs(ar[i])==NOFOLLOW){t(ar[i],pf+'nofollow');continue;}
@@ -545,9 +536,9 @@ if(ar[i]==BORDER){p(ar[++i],pf+'border');continue;}
 if(ar[i]==BASE){p(ar[++i],pf+'base');continue;}
 if(ar[i]==STATUS){q(ar[++i],pf+'status');continue;}
 if(Math.abs(ar[i])==AUTOSTATUS){v=pf+'autostatus';
-e(v+'=('+ar[i]+'<0)?('+v+'==2?2:0):('+v+'==1?0:1)');continue;}
+eval(v+'=('+ar[i]+'<0)?('+v+'==2?2:0):('+v+'==1?0:1)');continue;}
 if(Math.abs(ar[i])==AUTOSTATUSCAP){v=pf+'autostatus';
-e(v+'=('+ar[i]+'<0)?('+v+'==1?1:0):('+v+'==2?0:2)');continue;}
+eval(v+'=('+ar[i]+'<0)?('+v+'==1?1:0):('+v+'==2?0:2)');continue;}
 if(ar[i]==CLOSETEXT){q(ar[++i],pf+'close');continue;}
 if(ar[i]==SNAPX){p(ar[++i],pf+'snapx');continue;}
 if(ar[i]==SNAPY){p(ar[++i],pf+'snapy');continue;}
@@ -594,6 +585,7 @@ if(ar[i]==CAPTIONFONTCLASS){q(ar[++i],pf+'captionfontclass');continue;}
 if(ar[i]==CLOSEFONTCLASS){q(ar[++i],pf+'closefontclass');continue;}
 if(Math.abs(ar[i])==CAPBELOW){t(ar[i],pf+'capbelow');continue;}
 if(ar[i]==LABEL){q(ar[++i],pf+'label');continue;}
+if(Math.abs(ar[i])==DECODE){t(ar[i],pf+'decode');continue;}
 if(ar[i]==DONOTHING){continue;}
 i=OLparseCmdLine(pf,i,ar);}}
 if((OLfunctionPI)&&OLudf&&o3_function)o3_text=o3_function();
@@ -611,6 +603,14 @@ if(OLhasDims(o3_captionsize)){if(OLns4)o3_captionsize="2";}else
 if(!OLns4){i=parseInt(o3_captionsize);o3_captionsize=(i>0&&i<8)?OLpct[i]:OLpct[0];}
 if(OLhasDims(o3_closesize)){if(OLns4)o3_closesize="2";}else
 if(!OLns4){i=parseInt(o3_closesize);o3_closesize=(i>0&&i<8)?OLpct[i]:OLpct[0];}
+if(OLprintPI)OLprintDims();
+}
+function OLdecode(){
+var re=/%[0-9A-Fa-f]{2,}/,t=o3_text,c=o3_cap,u=unescape,d=!OLns4&&(!OLgek||OLgek>=20020826)
+&&typeof decodeURIComponent?decodeURIComponent:u;if(typeof(window.TypeError)=='function'){
+if(re.test(t)){eval(new Array('try{','o3_text=d(t);','}catch(e){','o3_text=u(t);',
+'}').join('\n'))};if(c&&re.test(c)){eval(new Array('try{','o3_cap=d(c);','}catch(e){',
+'o3_cap=u(c);','}').join('\n'))}}else{if(re.test(t))o3_text=u(t);if(c&&re.test(c))o3_cap=u(c);}
 }
 
 /*
@@ -625,6 +625,7 @@ if(OLns4){over.document.write(t);over.document.close();
 domfrag=range.createContextualFragment(t);
 while(over.hasChildNodes()){over.removeChild(over.lastChild);}
 over.appendChild(domfrag);}
+if(OLprintPI)over.print=o3_print?t:null;
 }
 
 // Makes object visible
@@ -661,10 +662,9 @@ if(!c)o3_close="";
 over.onmouseover=function(){OLhover=1;if(OLtimerid>0){clearTimeout(OLtimerid);OLtimerid=0;}}
 }
 function OLcursorOff(){
-if(OLovertwoPI&&over==over2)return false;
-var o=(OLns4?over:over.style),pHt=OLns4?over.clip.height:over.offsetHeight;
-var left=parseInt(o.left),top=parseInt(o.top);
-var right=left+o3_width,bottom=top+((OLbubblePI&&o3_bubble)?OLbubbleHt:pHt);
+var o=(OLns4?over:over.style),pHt=OLns4?over.clip.height:over.offsetHeight,
+left=parseInt(o.left),top=parseInt(o.top),
+right=left+o3_width,bottom=top+((OLbubblePI&&o3_bubble)?OLbubbleHt:pHt);
 if(OLx<left||OLx>right||OLy<top||OLy>bottom)return true;
 return false;
 }
@@ -672,38 +672,26 @@ return false;
 /*
  REGISTRATION
 */
-var OLcmdLine=null,OLrunTime=null;
 function OLsetRunTimeVar(){
-if(OLrunTime&&OLrunTime.length)for(var k=0;k<OLrunTime.length;k++)OLrunTime[k]();
+if(OLrunTime.length)for(var k=0;k<OLrunTime.length;k++)OLrunTime[k]();
 }
 function OLparseCmdLine(pf,i,ar){
-if(OLcmdLine&&OLcmdLine.length){for(var k=0;k<OLcmdLine.length;k++){
+if(OLcmdLine.length){for(var k=0;k<OLcmdLine.length;k++){
 var j=OLcmdLine[k](pf,i,ar);if(j>-1){i=j;break;}}}
 return i;
 }
-function OLisFunc(f){
-var r=1;
-if(typeof f=='object'){for(var i=0;i<f.length;i++){
-if(typeof f[i]=='function')continue;r=0;break;}
-}else if(typeof f!='function')r=0;
-return r;
-}
 function OLregCmds(c){
 if(typeof c!='string')return;
 var pM=c.split(',');pMtr=pMtr.concat(pM);
 for(var i=0;i<pM.length;i++)eval(pM[i].toUpperCase()+'='+pmCnt++);
 }
 function OLregRunTimeFunc(f){
-if(OLisFunc(f)){
-if(!OLrunTime)OLrunTime=new Array();
 if(typeof f=='object')OLrunTime=OLrunTime.concat(f);
-else OLrunTime[OLrunTime.length++]=f;}
+else OLrunTime[OLrunTime.length++]=f;
 }
 function OLregCmdLineFunc(f){
-if(OLisFunc(f)){
-if(!OLcmdLine)OLcmdLine=new Array();
 if(typeof f=='object')OLcmdLine=OLcmdLine.concat(f);
-else OLcmdLine[OLcmdLine.length++]=f;}
+else OLcmdLine[OLcmdLine.length++]=f;
 }
 
 OLloaded=1;
diff --git a/httemplate/elements/overlibmws_draggable.js b/httemplate/elements/overlibmws_draggable.js
index 14e4a6062..0d25f842e 100644
--- a/httemplate/elements/overlibmws_draggable.js
+++ b/httemplate/elements/overlibmws_draggable.js
@@ -1,7 +1,7 @@
 /*
  overlibmws_draggable.js plug-in module - Copyright Foteos Macrides 2002=2005
    For support of the DRAGGABLE feature.
-   Initial: August 24, 2002 - Last Revised: January 12, 2005
+   Initial: August 24, 2002 - Last Revised: March 2, 2006
  See the Change History and Command Reference for overlibmws via:
 
 	http://www.macridesweb.com/oltest/
@@ -37,7 +37,7 @@ function OLsetDrgCur(d){if(!OLns4)over.style.cursor=(d?'move':'auto');}
 
 function OLgrabEl(e){
 var e=(e||event);
-var cKy=(OLns4?e.modifiers&Event.ALT_MASK:(!OLop7?e.altKey:e.ctrlKey));o3_dragging=1;
+var cKy=(OLns4?e.modifiers&Event.ALT_MASK:(e.altKey||(OLop7&&e.ctrlKey)));o3_dragging=1;
 if(cKy){OLsetDrgCur(0);document.onmouseup=function(){OLsetDrgCur(1);o3_dragging=0;}
 return(OLns4?routeEvent(e):true);}
 OLx=(e.pageX||e.clientX+OLfd().scrollLeft);OLy=(e.pageY||e.clientY+OLfd().scrollTop);
diff --git a/httemplate/elements/phonenumber.html b/httemplate/elements/phonenumber.html
index 1330ca109..6e16ec0ad 100644
--- a/httemplate/elements/phonenumber.html
+++ b/httemplate/elements/phonenumber.html
@@ -6,13 +6,7 @@
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript">
-function OLiframeContent(src, width, height, name) {
-  return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
-   +(name?' name="'+name+'" id="'+name+'"':'')+' scrolling="auto">'
-   +'<div>[iframe not supported]</div></iframe>');
-}
-</SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/iframecontentmws.js"></SCRIPT>
 <% if ( length($number) ) { %>
   <%= $number %>
   <% if ( $opt{'callable'} && $conf->config('vonage-username') ) { %>
diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 16128d5c8..79c05dc42 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -37,7 +37,7 @@
        $begin = str2time($1);
        push @where, "cust_bill._date >= $begin";
      }
-     if (  $cgi->param('ending')
+     if ( $cgi->param('ending')
            && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
        $end = str2time($1) + 86399;
        push @where, "cust_bill._date < $end";
@@ -52,6 +52,13 @@
        push @where, "cust_bill._date < $end";
      }
 
+     if ( $cgi->param('invnum_min') =~ /^\s*(\d+)\s*$/ ) {
+       push @where, "cust_bill.invnum >= $1";
+     }
+     if ( $cgi->param('invnum_max') =~ /^\s*(\d+)\s*$/ ) {
+       push @where, "cust_bill.invnum <= $1";
+     }
+
      if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
        $agentnum = $1;
        push @where, "cust_main.agentnum = $agentnum";
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index ef68ba05e..0f2f3ef45 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -95,6 +95,7 @@ my $sql_query = {
   'hashref'   => {}, # \%svc_acct,
   'select'    => join(', ',
                     'svc_acct.*',
+                    'part_svc.svc',
                     'cust_main.custnum',
                     FS::UI::Web::cust_sql_fields(),
                   ),
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 1eda3733c..ecb77792f 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -56,8 +56,9 @@ my $sql_query = {
   'hashref'   => \%svc_domain,
   'select'    => join(', ',
                    'svc_domain.*',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
+                   'part_svc.svc',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
   'addl_from' => $addl_from,
diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
index 4961967d7..d391a1834 100755
--- a/httemplate/search/svc_forward.cgi
+++ b/httemplate/search/svc_forward.cgi
@@ -39,8 +39,9 @@ my $sql_query = {
   'hashref'   => {},
   'select'    => join(', ',
                    'svc_forward.*',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
+                   'part_svc.svc',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
   'addl_from' => $addl_from,
diff --git a/httemplate/search/svc_www.cgi b/httemplate/search/svc_www.cgi
index ae51c61fc..ef4045cf9 100755
--- a/httemplate/search/svc_www.cgi
+++ b/httemplate/search/svc_www.cgi
@@ -17,6 +17,7 @@ my $sql_query = {
   'hashref'   => {},
   'select'    => join(', ',
                    'svc_www.*',
+                   'part_svc.svc',
                    'cust_main.custnum',
                    FS::UI::Web::cust_sql_fields(),
                  ),
@@ -43,11 +44,13 @@ my $link_cust = sub {
                  'count_query' => $count_query,
                  'redirect'    => $link,
                  'header'      => [ '#',
+                                    'Service',
                                     'Zone',
                                     'User',
                                     FS::UI::Web::cust_header(),
                                   ],
                  'fields'      => [ 'svcnum',
+                                    'svc',
                                     sub { $_[0]->domain_record->zone },
                                     sub {
                                           my $svc_www = shift;
@@ -59,6 +62,7 @@ my $link_cust = sub {
                                     \&FS::UI::Web::cust_fields,
                                   ],
                  'links'       => [ $link,
+                                    $link,
                                     '',
                                     $ulink,
                                     ( map { $link_cust }
diff --git a/httemplate/view/svc_external.cgi b/httemplate/view/svc_external.cgi
index 2acc3f9cf..7816d88dc 100644
--- a/httemplate/view/svc_external.cgi
+++ b/httemplate/view/svc_external.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my($query) = $cgi->keywords;
-- 
cgit v1.2.1


From e75070ffcf15e537036e4685d2aabb0415eec6d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jul 2006 14:07:33 +0000
Subject: more work towards adding an "inactive" status - add it to the A/R
 report

---
 FS/FS/cust_main.pm                       | 21 +++++----
 httemplate/search/report_receivables.cgi | 80 ++++++++++++++------------------
 2 files changed, 46 insertions(+), 55 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index cbcf6cc51..2b9564442 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3670,18 +3670,17 @@ Returns a hex triplet color string for this customer's status.
 
 =cut
 
+use vars qw(%statuscolor);
+%statuscolor = (
+  'prospect'  => '7e0079', #'000000', #black?  naw, purple
+  'active'    => '00CC00', #green
+  'inactive'  => '0000CC', #blue
+  'suspended' => 'FF9900', #yellow
+  'cancelled' => 'FF0000', #red
+);
 
 sub statuscolor {
   my $self = shift;
-
-  my %statuscolor = (
-    'prospect'  => '7e0079', #'000000', #black?  naw, purple
-    'active'    => '00CC00', #green
-    'inactive'  => '0000CC', #blue
-    'suspended' => 'FF9900', #yellow
-    'cancelled' => 'FF0000', #red
-  );
-
   $statuscolor{$self->status};
 }
 
@@ -3703,6 +3702,10 @@ $select_count_pkgs =
   "SELECT COUNT(*) FROM cust_pkg
     WHERE cust_pkg.custnum = cust_main.custnum";
 
+sub select_count_pkgs_sql {
+  $select_count_pkgs;
+}
+
 sub prospect_sql { "
   0 = ( $select_count_pkgs )
 "; }
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index c1a239fd2..f42d8af7f 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -62,26 +62,19 @@ END
 
   my $owed_cols = join(',', map owed( @$_, 'cust'=>1 ), @ranges );
 
-  my $recurring = <<END;
-        '0' != ( select freq from part_pkg
-                   where cust_pkg.pkgpart = part_pkg.pkgpart )
-END
-
-  my $packages_cols = <<END;
+  my $select_count_pkgs = FS::cust_main->select_count_pkgs_sql;
 
-       ( select count(*) from cust_pkg
-           where cust_main.custnum = cust_pkg.custnum
-             and $recurring
-             and ( cancel = 0 or cancel is null )
-       ) as uncancelled_pkgs,
-
-       ( select count(*) from cust_pkg
-           where cust_main.custnum = cust_pkg.custnum
-             and $recurring
-             and ( cancel = 0 or cancel is null )
-             and ( susp = 0 or susp is null )
-       ) as active_pkgs
+  my $active_sql    = FS::cust_pkg->active_sql;
+  my $inactive_sql  = FS::cust_pkg->inactive_sql;
+  my $suspended_sql = FS::cust_pkg->inactive_sql;
+  my $cancelled_sql = FS::cust_pkg->inactive_sql;
 
+  my $packages_cols = <<END;
+       ( $select_count_pkgs                    ) AS num_pkgs,
+       ( $select_count_pkgs AND $active_sql    ) AS active_pkgs,
+       ( $select_count_pkgs AND $inactive_sql  ) AS inactive_pkgs,
+       ( $select_count_pkgs AND $suspended_sql ) AS suspended_pkgs,
+       ( $select_count_pkgs AND $cancelled_sql ) AS cancelled_pkgs
 END
 
   my $where = "where ". owed(0, 0, 'cust'=>1, 'noas'=>1). " > 0";
@@ -119,6 +112,27 @@ END
 
   my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
 
+  my $status_statuscol = sub {
+    #conceptual false laziness with cust_main::status...
+    my $row = shift;
+
+    my $status = 'unknown';
+    if ( $self->num_pkgs == 0 ) {
+      $status = 'prospect';
+    } elsif ( $self->active_pkgs) > 0 ) {
+      $status = 'active';
+    } elsif ( $self->inactive_pkgs > 0 ) {
+      $status = 'inactive';
+    } elsif ( $self->suspended_pkgs > 0 ) {
+      $status = 'suspended';
+    } elsif ( $self->cancelled_pkgs > 0 ) {
+      $status = 'cancelled'
+    }
+
+    ( ucfirst($status), $FS::cust_main::statuscolor{$status} );
+  };
+
+
 %><%= include( 'elements/search.html',
                  'title'       => 'Accounts Receivable Aging Summary',
                  'name'        => 'customers',
@@ -156,20 +170,7 @@ END
                                   ],
                  'fields'      => [
                                     \&FS::UI::Web::cust_fields,
-                                    sub {
-                                          my $row = shift;
-                                          my $status = 'Cancelled';
-                                          my $statuscol = 'FF0000';
-                                          if ( $row->uncancelled_pkgs ) {
-                                            $status = 'Suspended';
-                                            $statuscol = 'FF9900';
-                                            if ( $row->active_pkgs ) {
-                                              $status = 'Active';
-                                              $statuscol = '00CC00';
-                                            }
-                                          }
-                                          $status;
-                                        },
+                                    sub { (shift->status_statuscol)[0] },
                                     #sub { ucfirst(shift->status) },
                                     sub { sprintf( $money_char.'%.2f',
                                                    shift->get('owed_0_30') ) },
@@ -202,20 +203,7 @@ END
                                     'b', '', '', '', '', 'b', ],
                  'color'       => [
                                     ( map '', FS::UI::Web::cust_header() ),
-                                    sub {  
-                                          my $row = shift;
-                                          my $status = 'Cancelled';
-                                          my $statuscol = 'FF0000';
-                                          if ( $row->uncancelled_pkgs ) {
-                                            $status = 'Suspended';
-                                            $statuscol = 'FF9900';
-                                            if ( $row->active_pkgs ) {
-                                              $status = 'Active';
-                                              $statuscol = '00CC00';
-                                            }
-                                          }
-                                           $statuscol;
-                                        },
+                                    sub { (shift->status_statuscol)[1] },
                                     #sub { shift->statuscolor; },
                                     '',
                                     '',
-- 
cgit v1.2.1


From 8e498d1159f4e6756239839def94200c3154a494 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jul 2006 14:16:48 +0000
Subject:  i should go to sleep

---
 httemplate/search/report_receivables.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index f42d8af7f..c3dc9902c 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -119,13 +119,13 @@ END
     my $status = 'unknown';
     if ( $self->num_pkgs == 0 ) {
       $status = 'prospect';
-    } elsif ( $self->active_pkgs) > 0 ) {
+    } elsif ( $row->active_pkgs    > 0 ) {
       $status = 'active';
-    } elsif ( $self->inactive_pkgs > 0 ) {
+    } elsif ( $row->inactive_pkgs  > 0 ) {
       $status = 'inactive';
-    } elsif ( $self->suspended_pkgs > 0 ) {
+    } elsif ( $row->suspended_pkgs > 0 ) {
       $status = 'suspended';
-    } elsif ( $self->cancelled_pkgs > 0 ) {
+    } elsif ( $row->cancelled_pkgs > 0 ) {
       $status = 'cancelled'
     }
 
-- 
cgit v1.2.1


From c1a7b9da2c7817a09e683b79b3cd49787f5e38db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jul 2006 14:17:56 +0000
Subject:  i should REALLY go to sleep

---
 httemplate/search/report_receivables.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index c3dc9902c..061febc10 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -117,7 +117,7 @@ END
     my $row = shift;
 
     my $status = 'unknown';
-    if ( $self->num_pkgs == 0 ) {
+    if ( $row->num_pkgs == 0 ) {
       $status = 'prospect';
     } elsif ( $row->active_pkgs    > 0 ) {
       $status = 'active';
-- 
cgit v1.2.1


From 9397849cb897ebc82a8c30846ce5556382b06920 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jul 2006 14:20:10 +0000
Subject: hopefully fix the statuses here

---
 httemplate/search/report_receivables.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 061febc10..4c31f2afa 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -170,7 +170,7 @@ END
                                   ],
                  'fields'      => [
                                     \&FS::UI::Web::cust_fields,
-                                    sub { (shift->status_statuscol)[0] },
+                                    sub { ( &{$status_statuscol}($row) )[0] },
                                     #sub { ucfirst(shift->status) },
                                     sub { sprintf( $money_char.'%.2f',
                                                    shift->get('owed_0_30') ) },
@@ -203,7 +203,7 @@ END
                                     'b', '', '', '', '', 'b', ],
                  'color'       => [
                                     ( map '', FS::UI::Web::cust_header() ),
-                                    sub { (shift->status_statuscol)[1] },
+                                    sub { ( &{$status_statuscol}($row) )[1] },
                                     #sub { shift->statuscolor; },
                                     '',
                                     '',
-- 
cgit v1.2.1


From 29e7e361910ee76e9d487b2df88710af78997c8f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jul 2006 14:21:37 +0000
Subject: ugh, really fix the statuses here

---
 httemplate/search/report_receivables.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 4c31f2afa..b08fc8143 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -170,7 +170,7 @@ END
                                   ],
                  'fields'      => [
                                     \&FS::UI::Web::cust_fields,
-                                    sub { ( &{$status_statuscol}($row) )[0] },
+                                    sub { ( &{$status_statuscol}(shift) )[0] },
                                     #sub { ucfirst(shift->status) },
                                     sub { sprintf( $money_char.'%.2f',
                                                    shift->get('owed_0_30') ) },
@@ -203,7 +203,7 @@ END
                                     'b', '', '', '', '', 'b', ],
                  'color'       => [
                                     ( map '', FS::UI::Web::cust_header() ),
-                                    sub { ( &{$status_statuscol}($row) )[1] },
+                                    sub { ( &{$status_statuscol}(shift) )[1] },
                                     #sub { shift->statuscolor; },
                                     '',
                                     '',
-- 
cgit v1.2.1


From 79f6314575d140a09b362129e5ee580468059e99 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jul 2006 14:23:39 +0000
Subject: sql num_pkgs conflicting with method...

---
 httemplate/search/report_receivables.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index b08fc8143..3052ea93c 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -70,7 +70,7 @@ END
   my $cancelled_sql = FS::cust_pkg->inactive_sql;
 
   my $packages_cols = <<END;
-       ( $select_count_pkgs                    ) AS num_pkgs,
+       ( $select_count_pkgs                    ) AS num_pkgs_sql,
        ( $select_count_pkgs AND $active_sql    ) AS active_pkgs,
        ( $select_count_pkgs AND $inactive_sql  ) AS inactive_pkgs,
        ( $select_count_pkgs AND $suspended_sql ) AS suspended_pkgs,
@@ -117,7 +117,7 @@ END
     my $row = shift;
 
     my $status = 'unknown';
-    if ( $row->num_pkgs == 0 ) {
+    if ( $row->num_pkgs_sql == 0 ) {
       $status = 'prospect';
     } elsif ( $row->active_pkgs    > 0 ) {
       $status = 'active';
-- 
cgit v1.2.1


From c4dd2593a5cf5c4463a9180fbc5aef1f2c76f6e2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Jul 2006 22:40:37 +0000
Subject: fix up smart searching to make the quick payment entry behave better

---
 FS/FS/cust_main.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2b9564442..f4568a8a0 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3866,6 +3866,11 @@ sub smart_search {
   } elsif ( $search =~ /^\s*(\S.*\S)\s*$/ ) { #value search
 
     my $value = lc($1);
+
+    # remove "(Last, First)" in "Company (Last, First"), otherwise the
+    # full strings the browser remembers won't work
+    $value =~ s/\([\w \,\.\-\']*\)$//; #false laziness w/Record::ut_name
+    
     my $q_value = dbh->quote($value);
 
     #exact
@@ -3938,6 +3943,10 @@ sub smart_search {
 
     }
 
+    #eliminate duplicates
+    my %saw = ();
+    @cust_main = grep { !$saw{$_->custnum}++ } @cust_main;
+
   }
 
   @cust_main;
-- 
cgit v1.2.1


From 4f056133e2a2bd84d8d789acf24aba695a6e3688 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Jul 2006 07:27:32 +0000
Subject: quick script to convert rt links from one database name to another

---
 bin/rt-update-links | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 bin/rt-update-links

diff --git a/bin/rt-update-links b/bin/rt-update-links
new file mode 100644
index 000000000..75d554f48
--- /dev/null
+++ b/bin/rt-update-links
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+
+use FS::UID qw(adminsuidsetup);
+
+my( $olddb, $newdb ) = ( shift, shift );
+
+$FS::CurrentUser::upgrade_hack = 1;
+my $dbh = adminsuidsetup;
+
+my $statement = "select * from links where base like 'fsck.com-rt://$olddb/%' OR target like 'fsck.com-rt://$olddb/%'";
+
+my $sth = $dbh->prepare($statement) or die $dbh->errstr;
+$sth->execute or die $sth->errstr;
+
+while ( my $row = $sth->fetchrow_hashref ) {
+
+  ( my $base = $row->{'base'} )
+    =~ s(^fsck\.com-rt://$olddb/)(fsck.com-rt://$newdb/);
+
+  ( my $target = $row->{'target'} )
+    =~ s(^fsck\.com-rt://$olddb/)(fsck.com-rt://$newdb/);
+
+  if ( $row->{'base'} ne $base || $row->{'target'} ne $target ) {
+
+    my $update = 'UPDATE links SET base = ?, target = ? where id = ?';
+    my @param = ( $base, $target, $row->{'id'} );
+
+    warn "$update : ". join(', ', @param). "\n";
+    $dbh->do($update, {}, @param );
+
+  }
+
+}
+
+$dbh->commit;
+
-- 
cgit v1.2.1


From a0732f52fdcc2bca7c399d1249ccceb191de51cd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Jul 2006 08:33:46 +0000
Subject: this should finish adding the "inactive" status, i think?

---
 FS/FS/agent.pm                      |  11 ++++
 httemplate/browse/agent.cgi         | 114 +++++++++++++++++++++++++++---------
 httemplate/elements/table-grid.html |   6 ++
 httemplate/search/cust_main.cgi     | 111 ++++++++++++++++++++++-------------
 httemplate/search/cust_pkg.cgi      |  13 +++-
 5 files changed, 185 insertions(+), 70 deletions(-)

diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index 4158341e4..e40ef09db 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -322,6 +322,17 @@ sub num_pkg_sql {
   $sth->fetchrow_arrayref->[0];
 }
 
+=item num_inactive_cust_pkg
+
+Returns the number of inactive customer packages (one-time packages otherwise
+unsuspended/uncancelled) for this agent.
+
+=cut
+
+sub num_inactive_cust_pkg {
+  shift->num_pkg_sql(FS::cust_pkg->inactive_sql);
+}
+
 =item num_susp_cust_pkg
 
 Returns the number of suspended customer packages for this agent.
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 17cc8bd40..f5157d9b7 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -29,21 +29,27 @@ full offerings (via their type).<BR><BR>
   %>
 <% } %>
 
-<%= table() %>
+<%= include('/elements/table-grid.html') %>
+
+<% my $bgcolor1 = '#eeeeee';
+   my $bgcolor2 = '#ffffff';
+   my $bgcolor = '';
+%>
+
 <TR>
-  <TH COLSPAN=<%= ( $cgi->param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent</TH>
-  <TH>Type</TH>
-  <TH>Customers</TH>
-  <TH><FONT SIZE=-1>Customer<BR>packages</FONT></TH>
-  <TH>Reports</TH>
-  <TH>Registration codes</TH>
-  <TH>Prepaid cards</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=<%= ( $cgi->param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Type</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Customers</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Customer<BR>packages</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Reports</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Registration codes</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Prepaid cards</TH>
   <% if ( $conf->config('ticket_system') ) { %>
-    <TH>Ticketing</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Ticketing</TH>
   <% } %>
-  <TH><FONT SIZE=-1>Payment Gateway Overrides</FONT></TH>
-  <TH><FONT SIZE=-1>Freq.</FONT></TH>
-  <TH><FONT SIZE=-1>Prog.</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Payment Gateway Overrides</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Freq.</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Prog.</FONT></TH>
 </TR>
 <% 
 #        <TH><FONT SIZE=-1>Agent #</FONT></TH>
@@ -58,107 +64,157 @@ foreach my $agent ( sort {
                        'agentnum='. $agent->agentnum;
 
   my $cust_pkg_link = $p. 'search/cust_pkg.cgi?agentnum='. $agent->agentnum;
+  
+  if ( $bgcolor eq $bgcolor1 ) {
+    $bgcolor = $bgcolor2;
+  } else {
+    $bgcolor = $bgcolor1;
+  }
 
 %>
 
       <TR>
-        <TD><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
           <%= $agent->agentnum %></A></TD>
 <% if ( dbdef->table('agent')->column('disabled')
         && !$cgi->param('showdisabled')           ) { %>
-        <TD><%= $agent->disabled ? 'DISABLED' : '' %></TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $agent->disabled ? 'DISABLED' : '' %></TD>
 <% } %>
 
-        <TD><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
           <%= $agent->agent %></A></TD>
-        <TD><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD>
+
+        <TD CLASS="inv" BGCOLOR="<%= $bgcolor %>">
+          <TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0>
 
-        <TD>
-          <TABLE CELLSPACING=0 CELLPADDING=0>
             <TR>
               <TH ALIGN="right" WIDTH="40%">
-                <%= my $num_prospect = $agent->num_prospect_cust_main %>&nbsp;
+                <FONT COLOR="#7e0079">
+                  <%= my $num_prospect = $agent->num_prospect_cust_main %>&nbsp;
+                </FONT>
               </TH>
+
               <TD>
                 <% if ( $num_prospect ) { %>
                   <A HREF="<%= $cust_main_link %>&prospect=1"><% } %>prospects<% if ($num_prospect ) { %></A><% } %>
               <TD>
             </TR>
+
+            <TR>
+              <TH ALIGN="right" WIDTH="40%">
+                <FONT COLOR="#0000CC">
+                  <%= my $num_inactive = $agent->num_inactive_cust_main %>&nbsp;
+                </FONT>
+              </TH>
+
+              <TD>
+                <% if ( $num_inactive ) { %>
+                  <A HREF="<%= $cust_main_link %>&inactive=1"><% } %>inactive<% if ( $num_inactive ) { %></A><% } %>
+              </TD>
+            </TR>
+
             <TR>
               <TH ALIGN="right" WIDTH="40%">
                 <FONT COLOR="#00CC00">
                   <%= my $num_active = $agent->num_active_cust_main %>&nbsp;
                 </FONT>
               </TH>
+
               <TD>
                 <% if ( $num_active ) { %>
                   <A HREF="<%= $cust_main_link %>&active=1"><% } %>active<% if ( $num_active ) { %></A><% } %>
               </TD>
             </TR>
+
             <TR>
               <TH ALIGN="right" WIDTH="40%">
                 <FONT COLOR="#FF9900">
                   <%= my $num_susp = $agent->num_susp_cust_main %>&nbsp;
                 </FONT>
               </TH>
+
               <TD>
                 <% if ( $num_susp ) { %>
                   <A HREF="<%= $cust_main_link %>&suspended=1"><% } %>suspended<% if ( $num_susp ) { %></A><% } %>
               </TD>
             </TR>
+
             <TR>
               <TH ALIGN="right" WIDTH="40%">
                 <FONT COLOR="#FF0000">
                   <%= my $num_cancel = $agent->num_cancel_cust_main %>&nbsp;
                 </FONT>
               </TH>
+
               <TD>
                 <% if ( $num_cancel ) { %>
                   <A HREF="<%= $cust_main_link %>&showcancelledcustomers=1&cancelled=1"><% } %>cancelled<% if ( $num_cancel ) { %></A><% } %>
               </TD>
             </TR>
+
           </TABLE>
         </TD>
 
-        <TD>
-          <TABLE CELLSPACING=0 CELLPADDING=0>
+        <TD CLASS="inv" BGCOLOR="<%= $bgcolor %>" VALIGN="bottom">
+          <TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0>
+
+            <TR>
+              <TH ALIGN="right" WIDTH="40%">
+                <FONT COLOR="#0000CC">
+                  <%= my $num_inactive_pkg = $agent->num_inactive_cust_pkg %>&nbsp;
+                </FONT>
+              </TH>
+
+              <TD>
+                <% if ( $num_inactive_pkg ) { %>
+                  <A HREF="<%= $cust_pkg_link %>&magic=inactive"><% } %>inactive<% if ( $num_inactive_pkg ) { %></A><% } %>
+              </TD>
+            </TR>
+
             <TR>
               <TH ALIGN="right" WIDTH="40%">
                 <FONT COLOR="#00CC00">
                   <%= my $num_active_pkg = $agent->num_active_cust_pkg %>&nbsp;
                 </FONT>
               </TH>
+
               <TD>
                 <% if ( $num_active_pkg ) { %>
                   <A HREF="<%= $cust_pkg_link %>&magic=active"><% } %>active<% if ( $num_active_pkg ) { %></A><% } %>
               </TD>
             </TR>
+
             <TR>
               <TH ALIGN="right" WIDTH="40%">
                 <FONT COLOR="#FF9900">
                   <%= my $num_susp_pkg = $agent->num_susp_cust_pkg %>&nbsp;
                 </FONT>
+
               </TH>
               <TD>
                 <% if ( $num_susp_pkg ) { %>
                   <A HREF="<%= $cust_pkg_link %>&magic=suspended"><% } %>suspended<% if ( $num_susp_pkg ) { %></A><% } %>
               </TD>
             </TR>
+            
             <TR>
               <TH ALIGN="right" WIDTH="40%">
                 <FONT COLOR="#FF0000">
                   <%= my $num_cancel_pkg = $agent->num_cancel_cust_pkg %>&nbsp;
                 </FONT>
               </TH>
+
               <TD>
                 <% if ( $num_cancel_pkg ) { %>
                   <A HREF="<%= $cust_pkg_link %>&magic=cancelled"><% } %>cancelled<% if ( $num_cancel_pkg ) { %></A><% } %>
               </TD>
             </TR>
+
           </TABLE>
         </TD>
 
-        <TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
           <A HREF="<%= $p %>search/report_cust_pay.html?agentnum=<%= $agent->agentnum %>">Payments</A>
           <BR><A HREF="<%= $p %>search/report_cust_credit.html?agentnum=<%= $agent->agentnum %>">Credits</A>
           <BR><A HREF="<%= $p %>search/report_receivables.cgi?agentnum=<%= $agent->agentnum %>">A/R Aging</A>
@@ -166,14 +222,14 @@ foreach my $agent ( sort {
 
         </TD>
 
-        <TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
           <%= my $num_reg_code = $agent->num_reg_code %>
           <% if ( $num_reg_code ) { %>
             <A HREF="<%=$p%>search/reg_code.html?agentnum=<%= $agent->agentnum %>"><% } %>Unused<% if ( $num_reg_code ) { %></A><% } %>
           <BR><A HREF="<%=$p%>edit/reg_code.cgi?agentnum=<%= $agent->agentnum %>">Generate codes</A>
         </TD>
 
-        <TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
           <%= my $num_prepay_credit = $agent->num_prepay_credit %>
           <% if ( $num_prepay_credit ) { %>
             <A HREF="<%=$p%>search/prepay_credit.html?agentnum=<%= $agent->agentnum %>"><% } %>Unused<% if ( $num_prepay_credit ) { %></A><% } %>
@@ -182,7 +238,7 @@ foreach my $agent ( sort {
 
         <% if ( $conf->config('ticket_system') ) { %>
 
-          <TD>
+          <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
             <% if ( $agent->ticketing_queueid ) { %>
               Queue: <%= $agent->ticketing_queueid %>: <%= $agent->ticketing_queue %><BR>
             <% } %>
@@ -190,7 +246,7 @@ foreach my $agent ( sort {
 
         <% } %>
 
-        <TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
           <TABLE CELLSPACING=0 CELLPADDING=0>
             <% foreach my $override (
                  # sort { }  want taxclass-full stuff first?  and default cards (empty cardtype)
@@ -214,8 +270,10 @@ foreach my $agent ( sort {
           </TABLE>
         </TD>
 
-        <TD><%= $agent->freq %></TD>
-        <TD><%= $agent->prog %></TD>
+<!--
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $agent->freq %></TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $agent->prog %></TD>
+-->
 
       </TR>
 
diff --git a/httemplate/elements/table-grid.html b/httemplate/elements/table-grid.html
index 17eafdf1a..fd1cb9113 100644
--- a/httemplate/elements/table-grid.html
+++ b/httemplate/elements/table-grid.html
@@ -5,9 +5,15 @@
 
 %>
 <STYLE TYPE="text/css">
+
 .grid table { border: solid; empty-cells: show }
 .grid TH { padding-left: 3px; padding-right: 3px; border: 1px solid #dddddd; border-bottom: dashed 1px black; border-right: none }
 .grid TD { padding-left: 3px; padding-right: 3px; empty-cells: show; border: 1px solid #cccccc; border-bottom: none; border-right: none }
+
+.inv table { border: none }
+.inv TH { border: none }
+.inv TD { border: none }
+
 </STYLE>
 
 <TABLE CLASS="grid" CELLSPACING=<%= $opt{cellspacing} %> CELLPADDING=<%= $opt{cellpadding} %> BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 7d5941a16..c72ab44df 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -109,6 +109,7 @@ if ( $cgi->param('browse')
   push @qual, FS::cust_main->cancel_sql   if $cgi->param('cancelled');
   push @qual, FS::cust_main->prospect_sql if $cgi->param('prospect');
   push @qual, FS::cust_main->active_sql   if $cgi->param('active');
+  push @qual, FS::cust_main->inactive_sql if $cgi->param('inactive');
   push @qual, FS::cust_main->susp_sql     if $cgi->param('suspended');
 
   #EWWWWWW
@@ -415,48 +416,78 @@ END
 
     foreach my $addl_col ( @addl_cols ) { %>
 
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
-
-      <% if ( $addl_col eq 'tickets' ) {
-        if ( @custom_priorities ) {
-          print &itable('', 0);
-          foreach my $priority ( @custom_priorities, '' ) {
-          
-            my $num =
-              FS::TicketSystem->num_customer_tickets($custnum,$priority);
-            my $ahref = '';
-            $ahref= '<A HREF="'.
-                    FS::TicketSystem->href_customer_tickets($custnum,$priority).
-                    '">'
-              if $num;
-
-            print '<TR>'.
-                  "  <TD ALIGN=right><FONT SIZE=-1>$ahref$num</A></FONT></TD>".
-                  "<TD ALIGN=left><FONT SIZE=-1>$ahref".
-                  ( $priority || '<i>(none)</i>' ).
-                  "</A></FONT></TD></TR>";
-
-          }
-          print '<TR><TD BGCOLOR="#000000" COLSPAN=2></TD></TR>'.
-                '<TR><TD ALIGN=right><FONT SIZE=-1>';
-        }
-
-        my $ahref = '';
-        $ahref = '<A HREF="'.
-                    FS::TicketSystem->href_customer_tickets($custnum).
-                    '">'
-          if $cust_main->get($addl_col);
-
-        print $ahref. $cust_main->get($addl_col). '</A>';
-        print "</FONT></TD><TD ALIGN=left>".
-              "<FONT SIZE=-1>${ahref}Total</A><FONT>".
-              "</TD></TR></TABLE>"
-          if @custom_priorities;
+      <% if ( $addl_col eq 'tickets' ) { %>
 
-      } else {
-        print $cust_main->get($addl_col);
+        <% if ( @custom_priorities ) { %>
+
+             <TD CLASS="inv" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
+
+               <TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0>
+
+               <% foreach my $priority ( @custom_priorities, '' ) { %>
+
+                 <%
+                    my $num =
+                      FS::TicketSystem->num_customer_tickets($custnum,$priority);
+                    my $ahref = '';
+                    $ahref= '<A HREF="'.
+                            FS::TicketSystem->href_customer_tickets($custnum,$priority).
+                            '">'
+                      if $num;
+                 %>
+        
+                 <TR>
+                   <TD ALIGN=right>
+                     <FONT SIZE=-1><%= $ahref.$num %></A></FONT>
+                   </TD>
+                   <TD ALIGN=left>
+                     <FONT SIZE=-1><%= $ahref %><%= $priority || '<i>(none)</i>' %></A></FONT>
+                   </TD>
+                 </TR>
+   
+               <% } %>
+
+             <TR>
+               <TH ALIGN=right STYLE="border-top: dashed 1px black">
+               <FONT SIZE=-1>
+
+        <% } else { %>
+
+          <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
+
+        <% } %>
+
+        <%
+           my $ahref = '';
+           $ahref = '<A HREF="'.
+                       FS::TicketSystem->href_customer_tickets($custnum).
+                       '">'
+             if $cust_main->get($addl_col);
+        %>
+
+        <%= $ahref %><%= $cust_main->get($addl_col) %></A>
+
+        <% if ( @custom_priorities ) { %>
+
+          </FONT></TH>
+            <TH ALIGN=left STYLE="border-top: dashed 1px black">
+              <FONT SIZE=-1><%= ${ahref} %>Total</A><FONT>
+            </TH>
+          </TR>
+          </TABLE>
+
+        <% } %>
+
+        </FONT></TD>
+
+      } else { %>
+
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
+          <%= $cust_main->get($addl_col) %>
+        </FONT></TD>
+
+<%
       }
-      print "</FONT></TD>";
     }
 
     my($n1)='';
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index e8b3f490d..614e9b509 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -24,6 +24,12 @@ if (    $cgi->param('magic')  eq 'active'
 
   push @where, FS::cust_pkg->active_sql();
 
+} elsif (    $cgi->param('magic')  eq 'inactive'
+          || $cgi->param('status') eq 'inactive' ) {
+
+  push @where, FS::cust_pkg->inactive_sql();
+
+
 } elsif (    $cgi->param('magic')  eq 'suspended'
           || $cgi->param('status') eq 'suspended'  ) {
 
@@ -47,7 +53,10 @@ if (    $cgi->param('magic')  eq 'active'
 #false lazinessish w/graph/cust_bill_pkg.cgi
 my $classnum = 0;
 my @pkg_class = ();
-if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
+if ( exists($cgi->Vars->{'classnum'})
+     && $cgi->param('classnum') =~ /^(\d*)$/
+   )
+{
   $classnum = $1;
   if ( $classnum ) { #a specific class
     push @where, "classnum = $classnum";
@@ -90,7 +99,7 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 } else {
 
   if ( $cgi->param('magic') &&
-       $cgi->param('magic') =~ /^(active|suspended|cancell?ed)$/
+       $cgi->param('magic') =~ /^(active|inactive|suspended|cancell?ed)$/
   ) {
 
     $orderby = 'ORDER BY pkgnum';
-- 
cgit v1.2.1


From 2a866b4696e28f963841e493368320fcf8048953 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Jul 2006 08:39:28 +0000
Subject: oops, extra else

---
 httemplate/search/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index c72ab44df..f6841a099 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -480,7 +480,7 @@ END
 
         </FONT></TD>
 
-      } else { %>
+      <% } else { %>
 
         <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
           <%= $cust_main->get($addl_col) %>
-- 
cgit v1.2.1


From d201bed3c90f0a8b80541c3216c265405117694d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jul 2006 04:18:01 +0000
Subject: ugh, fixup bootstrapping

---
 FS/FS/UID.pm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 0d32002b2..eb703d352 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -10,7 +10,7 @@ use subs qw(
   getsecrets cgisetotaker
 );
 use Exporter;
-use Carp qw(carp croak cluck);
+use Carp qw(carp croak cluck confess);
 use DBI;
 use FS::Conf;
 use FS::CurrentUser;
@@ -72,6 +72,7 @@ sub adminsuidsetup {
 
 sub forksuidsetup {
   $user = shift;
+  my $olduser = $user;
 
   if ( $FS::CurrentUser::upgrade_hack ) {
     $user = 'fs_bootstrap';
@@ -91,7 +92,11 @@ sub forksuidsetup {
 
   croak "Not running uid freeside!" unless checkeuid();
 
-  $dbh = &myconnect;
+  if ( $FS::CurrentUser::upgrade_hack && $olduser ) {
+    $dbh = &myconnect($olduser);
+  } else {
+    $dbh = &myconnect();
+  }
 
   use FS::Schema qw(reload_dbdef);
   reload_dbdef("/usr/local/etc/freeside/dbdef.$datasrc")
@@ -110,10 +115,10 @@ sub forksuidsetup {
 }
 
 sub myconnect {
-  DBI->connect( getsecrets, { 'AutoCommit'         => 0,
-                              'ChopBlanks'         => 1,
-                              'ShowErrorStatement' => 1,
-                            }
+  DBI->connect( getsecrets(@_), { 'AutoCommit'         => 0,
+                                  'ChopBlanks'         => 1,
+                                  'ShowErrorStatement' => 1,
+                                }
               )
     or die "DBI->connect error: $DBI::errstr\n";
 }
@@ -275,7 +280,7 @@ sub getsecrets {
   if ( $conf->exists('mapsecrets') ) {
     die "No user!" unless $user;
     my($line) = grep /^\s*($user|\*)\s/, $conf->config('mapsecrets');
-    die "User $user not found in mapsecrets!" unless $line;
+    confess "User $user not found in mapsecrets!" unless $line;
     $line =~ /^\s*($user|\*)\s+(.*)$/;
     $secrets = $2;
     die "Illegal mapsecrets line for user?!" unless $secrets;
-- 
cgit v1.2.1


From f06035669a617339ae5e424db5b8f8dda92a425c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Jul 2006 08:08:46 +0000
Subject: svc_phone.t

---
 FS/t/svc_phone.t | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 FS/t/svc_phone.t

diff --git a/FS/t/svc_phone.t b/FS/t/svc_phone.t
new file mode 100644
index 000000000..15b9ca275
--- /dev/null
+++ b/FS/t/svc_phone.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_phone;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From e39b961f3da26df319c9f116094d2386b2fa2050 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Jul 2006 00:33:33 +0000
Subject: htpasswd workaround no longer necessary - closes: #1351

---
 FS/FS/access_user.pm | 109 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 105 insertions(+), 4 deletions(-)

diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index e3bf2cb9f..d325dd6cc 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -1,13 +1,16 @@
 package FS::access_user;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $htpasswd_file );
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::m2m_Common;
 use FS::access_usergroup;
 
 @ISA = qw( FS::m2m_Common FS::Record );
 
+#kludge htpasswd for now
+$htpasswd_file = '/usr/local/etc/freeside/htpasswd';
+
 =head1 NAME
 
 FS::access_user - Object methods for access_user records
@@ -70,7 +73,51 @@ otherwise returns false.
 
 =cut
 
-# the insert method can be inherited from FS::Record
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error =
+       $self->SUPER::insert(@_)
+    || $self->htpasswd_kludge()
+  ;
+
+  if ( $error ) {
+    $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+    return $error;
+  } else {
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+    '';
+  }
+
+}
+
+sub htpasswd_kludge {
+  my $self = shift;
+  if ( 
+       system('htpasswd', '-b', @_,
+                          $htpasswd_file,
+                          $self->username,
+                          $self->_password,
+             ) == 0
+     )
+  {
+    return '';
+  } else {
+    return 'htpasswd exited unsucessfully';
+  }
+}
+
 
 =item delete
 
@@ -78,7 +125,34 @@ Delete this record from the database.
 
 =cut
 
-# the delete method can be inherited from FS::Record
+sub delete {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error =
+       $self->SUPER::delete(@_)
+    || $self->htpasswd_kludge('-D')
+  ;
+
+  if ( $error ) {
+    $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+    return $error;
+  } else {
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+    '';
+  }
+
+}
 
 =item replace OLD_RECORD
 
@@ -87,7 +161,34 @@ returns the error, otherwise returns false.
 
 =cut
 
-# the replace method can be inherited from FS::Record
+sub replace {
+  my($new, $old) = ( shift, shift );
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error =
+       $new->SUPER::replace($old, @_)
+    || $new->htpasswd_kludge()
+  ;
+
+  if ( $error ) {
+    $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+    return $error;
+  } else {
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+    '';
+  }
+
+}
 
 =item check
 
-- 
cgit v1.2.1


From e55f806e5ba30a82c0c03dc1fc53f6e13fffb1bb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Aug 2006 08:10:36 +0000
Subject: add confession here to diagnose etxrn's problem better

---
 FS/FS/svc_acct.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index aa3e592a3..572a00853 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1416,6 +1416,8 @@ Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
 sub radius_groups {
   my $self = shift;
   if ( $self->usergroup ) {
+    confess "specified usergroup is not an arrayref: ". $self->usergroup
+      unless ref($self->usergroup) eq 'ARRAY';
     #when provisioning records, export callback runs in svc_Common.pm before
     #radius_usergroup records can be inserted...
     @{$self->usergroup};
-- 
cgit v1.2.1


From 486a0cedc8fc8010e4867516d901beb4cd631d27 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Aug 2006 08:11:22 +0000
Subject: add confession here to diagnose etxrn's problem better

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 572a00853..65dcf915f 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1416,7 +1416,7 @@ Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
 sub radius_groups {
   my $self = shift;
   if ( $self->usergroup ) {
-    confess "specified usergroup is not an arrayref: ". $self->usergroup
+    confess "explicitly specified usergroup not an arrayref: ". $self->usergroup
       unless ref($self->usergroup) eq 'ARRAY';
     #when provisioning records, export callback runs in svc_Common.pm before
     #radius_usergroup records can be inserted...
-- 
cgit v1.2.1


From 7fc8c3c193c3d673a58566569a0e82609212a087 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Aug 2006 08:43:40 +0000
Subject: add debugging to track down RADIUS group problem

---
 FS/FS/svc_acct.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 65dcf915f..ad8d9a152 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -17,6 +17,7 @@ use Carp;
 use Fcntl qw(:flock);
 use Date::Format;
 use Crypt::PasswdMD5 1.2;
+use Data::Dumper;
 use FS::UID qw( datasrc );
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs fields dbh dbdef );
@@ -221,7 +222,11 @@ jobnum(s) (they will not run until the specific job(s) complete(s)).
 sub insert {
   my $self = shift;
   my %options = @_;
-  my $error;
+
+  if ( $DEBUG ) {
+    warn "[$me] insert called on $self: ". Dumper($self).
+         "\nwith options: ". Dumper(%options);
+  }
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -234,7 +239,7 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  $error = $self->check;
+  my $error = $self->check;
   return $error if $error;
 
   if ( $self->svcnum && qsearchs('cust_svc',{'svcnum'=>$self->svcnum}) ) {
-- 
cgit v1.2.1


From 936038efe0b75ad037619167f62db7fe16c25255 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Aug 2006 09:10:07 +0000
Subject: this should process default usergroup as well as fixed now

---
 FS/FS/svc_Common.pm          | 15 +++++++++------
 FS/FS/svc_acct.pm            | 14 ++++++++++++++
 httemplate/edit/svc_acct.cgi |  6 +++++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index c1c482d72..fdb4132c4 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -51,7 +51,9 @@ sub new {
   #$self->{'Hash'} = shift;
   my $newhash = shift;
   $self->{'Hash'} = { map { $_ => $newhash->{$_} } qw(svcnum svcpart) };
-  $self->setdefault;
+
+  $self->setdefault( $self->_fieldhandlers );
+
   $self->{'Hash'}{$_} = $newhash->{$_}
     foreach grep { defined($newhash->{$_}) && length($newhash->{$_}) }
                  keys %$newhash;
@@ -69,6 +71,9 @@ sub new {
   $self;
 }
 
+#empty default
+sub _fieldhandlers { (); }
+
 sub virtual_fields {
 
   # This restricts the fields based on part_svc_column and the svcpart of 
@@ -490,11 +495,9 @@ sub setx {
     my $columnname  = $part_svc_column->columnname;
     my $columnvalue = $part_svc_column->columnvalue;
 
-    if ( exists( $coderef->{$columnname} ) ) {
-      &{ $coderef->{$columnname} }( $self, $columnvalue);
-    } else {
-      $self->setfield( $columnname, $columnvalue );
-    }
+    $columnvalue = &{ $coderef->{$columnname} }( $self, $columnvalue )
+      if exists( $coderef->{$columnname} );
+    $self->setfield( $columnname, $columnvalue );
 
   }
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index ad8d9a152..c4dbb00c9 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -188,6 +188,20 @@ Creates a new account.  To add the account to the database, see L<"insert">.
 
 sub table { 'svc_acct'; }
 
+sub _fieldhandlers {
+  #false laziness with edit/svc_acct.cgi
+  'usergroup' => sub { 
+                       my $usergroup = shift;
+                       if ( ref($usergroup) eq 'ARRAY' ) {
+                         $usergroup;
+                       } elsif ( length($usergroup) ) {
+                         [ split(/\s*,\s*/, $usergroup) ];
+                       } else {
+                         [];
+                       }
+                     },
+}
+
 =item insert [ , OPTION => VALUE ... ]
 
 Adds this account to the database.  If there is an error, returns the error,
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 4b324a501..8d50aeda0 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -69,7 +69,11 @@ unless ( $svcnum || $cgi->param('error') ) { #adding
   }
 
   $svc_acct->set_default_and_fixed( {
-    'usergroup' => sub { @groups = split(',', shift ); },
+    #false laziness w/svc-acct::_fieldhandlers
+    'usergroup' => sub { return $_[0] if ref($_[0]) eq 'ARRAY';
+                         @groups = split(/\s*,\s*/, shift );
+                         \@groups;
+                       },
   } );
 
 }
-- 
cgit v1.2.1


From 86102d2ff550b869f09dcfaa30bbdc98e5580d56 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Aug 2006 09:14:04 +0000
Subject: this just needs to be a hashref and we should be all set with radius
 groups then

---
 FS/FS/svc_acct.pm | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c4dbb00c9..2606c1453 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -189,17 +189,19 @@ Creates a new account.  To add the account to the database, see L<"insert">.
 sub table { 'svc_acct'; }
 
 sub _fieldhandlers {
-  #false laziness with edit/svc_acct.cgi
-  'usergroup' => sub { 
-                       my $usergroup = shift;
-                       if ( ref($usergroup) eq 'ARRAY' ) {
-                         $usergroup;
-                       } elsif ( length($usergroup) ) {
-                         [ split(/\s*,\s*/, $usergroup) ];
-                       } else {
-                         [];
-                       }
-                     },
+  {
+    #false laziness with edit/svc_acct.cgi
+    'usergroup' => sub { 
+                         my $usergroup = shift;
+                         if ( ref($usergroup) eq 'ARRAY' ) {
+                           $usergroup;
+                         } elsif ( length($usergroup) ) {
+                           [ split(/\s*,\s*/, $usergroup) ];
+                         } else {
+                           [];
+                         }
+                       },
+  };
 }
 
 =item insert [ , OPTION => VALUE ... ]
-- 
cgit v1.2.1


From ad18fd616d98b80945b455ca170ba02089723873 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Aug 2006 20:07:13 +0000
Subject: this should fix the barfing about default radius groups on the new
 customer screen...

---
 FS/FS/svc_acct.pm                     | 2 +-
 httemplate/edit/process/cust_main.cgi | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 2606c1453..e7d2b37b6 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -703,7 +703,7 @@ sub check {
 
   my($recref) = $self->hashref;
 
-  my $x = $self->setfixed;
+  my $x = $self->setfixed( $self->_fieldhandlers );
   return $x unless ref($x);
   my $part_svc = $x;
 
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 09a42544c..4ba30c435 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -103,8 +103,6 @@ if ( $new->custnum eq '' ) {
                                      'popnum'    => $cgi->param('popnum'),
                                    } );
 
-    my $y = $svc_acct->setdefault; # arguably should be in new method
-    $error ||= $y unless ref($y);
     #and just in case you were silly
     $svc_acct->svcpart($svcpart);
     $svc_acct->username($cgi->param('username'));
-- 
cgit v1.2.1


From 08dc9fe500cf44346e409fb8c75eda541300d64d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Aug 2006 20:21:32 +0000
Subject: yow.  fix up group handling

---
 FS/FS/svc_Common.pm          |  4 ++--
 FS/FS/svc_acct.pm            | 10 +++++-----
 httemplate/edit/svc_acct.cgi | 19 ++++++++++++++-----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index fdb4132c4..17942c7ec 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -72,7 +72,7 @@ sub new {
 }
 
 #empty default
-sub _fieldhandlers { (); }
+sub _fieldhandlers { {}; }
 
 sub virtual_fields {
 
@@ -475,7 +475,7 @@ sub setx {
   my $self = shift;
   my $x = shift;
   my @x = ref($x) ? @$x : ($x);
-  my $coderef = scalar(@_) ? shift : {};
+  my $coderef = scalar(@_) ? shift : $self->_fieldhandlers;
 
   my $error =
     $self->ut_numbern('svcnum')
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e7d2b37b6..c50dfd540 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -192,11 +192,11 @@ sub _fieldhandlers {
   {
     #false laziness with edit/svc_acct.cgi
     'usergroup' => sub { 
-                         my $usergroup = shift;
-                         if ( ref($usergroup) eq 'ARRAY' ) {
-                           $usergroup;
-                         } elsif ( length($usergroup) ) {
-                           [ split(/\s*,\s*/, $usergroup) ];
+                         my( $self, $groups ) = @_;
+                         if ( ref($groups) eq 'ARRAY' ) {
+                           $groups;
+                         } elsif ( length($groups) ) {
+                           [ split(/\s*,\s*/, $groups) ];
                          } else {
                            [];
                          }
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 8d50aeda0..14d6759dc 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -70,11 +70,20 @@ unless ( $svcnum || $cgi->param('error') ) { #adding
 
   $svc_acct->set_default_and_fixed( {
     #false laziness w/svc-acct::_fieldhandlers
-    'usergroup' => sub { return $_[0] if ref($_[0]) eq 'ARRAY';
-                         @groups = split(/\s*,\s*/, shift );
-                         \@groups;
-                       },
-  } );
+    'usergroup' => sub { 
+                         my( $self, $groups ) = @_;
+                         if ( ref($groups) eq 'ARRAY' ) {
+                           @groups = @$groups;
+                           $groups;
+                         } elsif ( length($groups) ) {
+                           @groups = split(/\s*,\s*/, $groups);
+                           [ @groups ];
+                         } else {
+                           @groups = ();
+                           [];
+                         }
+    }
+  );
 
 }
 
-- 
cgit v1.2.1


From 924a1bde45d6fbe134ecd502cd3ba072f5d73195 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Aug 2006 20:23:04 +0000
Subject: silly closing }

---
 httemplate/edit/svc_acct.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 14d6759dc..71b324d99 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -82,8 +82,8 @@ unless ( $svcnum || $cgi->param('error') ) { #adding
                            @groups = ();
                            [];
                          }
-    }
-  );
+                       }
+  } );
 
 }
 
-- 
cgit v1.2.1


From 81676223e719782d4197841b78434df977457865 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Aug 2006 21:37:57 +0000
Subject: make sure default RADIUS groups don't override ones for existing
 records

---
 FS/FS/svc_Common.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 17942c7ec..907f35fa0 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -52,7 +52,8 @@ sub new {
   my $newhash = shift;
   $self->{'Hash'} = { map { $_ => $newhash->{$_} } qw(svcnum svcpart) };
 
-  $self->setdefault( $self->_fieldhandlers );
+  $self->setdefault( $self->_fieldhandlers )
+    unless $self->svcnum;
 
   $self->{'Hash'}{$_} = $newhash->{$_}
     foreach grep { defined($newhash->{$_}) && length($newhash->{$_}) }
-- 
cgit v1.2.1


From 65fc97717e093e8ff35d6f4c0efd04e3af334c8d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Aug 2006 23:39:02 +0000
Subject: slightly better bootstrapping for htpasswd kludge... hopefully that
 will go away in 1.7.1

---
 FS/FS/access_user.pm    |  1 +
 FS/bin/freeside-adduser | 33 ++++++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index d325dd6cc..37b3b2f37 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -104,6 +104,7 @@ sub insert {
 
 sub htpasswd_kludge {
   my $self = shift;
+  unshift @_, '-c' unless -e $htpasswd_file;
   if ( 
        system('htpasswd', '-b', @_,
                           $htpasswd_file,
diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 0d8b454bf..3976caece 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw($opt_h $opt_b $opt_c $opt_g);
+use vars qw($opt_s $opt_h $opt_b $opt_c $opt_g $opt_n);
 use Fcntl qw(:flock);
 use Getopt::Std;
 
 my $FREESIDE_CONF = "/usr/local/etc/freeside";
 
-getopts("bch:g:");
+getopts("s:bch:g:n");
 die &usage if $opt_c && ! $opt_h;
 my $user = shift or die &usage;
 
@@ -27,16 +27,21 @@ if ( $opt_h ) {
   push @args, '-c' if $opt_c;
   push @args, $opt_h, $user;
   push @args, shift if $opt_b;
+  warn join(', ', 'htpasswd', @args)."\n";
   system(@args) == 0 or die "htpasswd failed: $?";
 }
 
-#my $secretfile = $opt_s || 'secrets';
-#
-#open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
-#  and flock(MAPSECRETS,LOCK_EX)
-#    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-#print MAPSECRETS "$user $secretfile\n";
-#close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
+if ( $opt_s ) {
+  open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
+    and flock(MAPSECRETS,LOCK_EX)
+      or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+  print MAPSECRETS "$user $opt_s\n";
+  close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
+}
+
+###
+
+exit if $opt_n;
 
 ###
 
@@ -72,7 +77,7 @@ if ( $opt_g ) {
 ###
 
 sub usage {
-  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -g groupnum ] username"
+  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -g groupnum ] username [ password ]"
 }
 
 =head1 NAME
@@ -81,7 +86,7 @@ freeside-adduser - Command line interface to add (freeside) users.
 
 =head1 SYNOPSIS
 
-  freeside-adduser [ -h htpasswd_file [ -c ] ] -g 1 username
+  freeside-adduser [ -n ] [ -h htpasswd_file [ -c ] [ -b ] ] [ -g groupnum ] username [ password ]
 
 =head1 DESCRIPTION
 
@@ -96,6 +101,12 @@ sales/tech folks) to the web interface, not for adding customer accounts.
 
   -g: initial groupnum
 
+  Development/multi-DB options:
+
+  -s: alternate secrets file
+
+  -n: no ACL added, for bootstrapping
+
 =head1 SEE ALSO
 
 L<htpasswd>(1), base Freeside documentation
-- 
cgit v1.2.1


From 786b78c646f892e1ae80006fb7870960780ea5db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 7 Aug 2006 02:19:28 +0000
Subject: get rid of the extra border in nested tables

---
 httemplate/search/elements/search.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 6cf574164..3e689eba1 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -380,8 +380,7 @@
 
                                   my $tableref = $_;
 
-                                  '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0'.
-                                  ' STYLE="border:none">'.
+                                  '<TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0>'.
 
                                   join('', map {
 
@@ -393,7 +392,7 @@
 
                                       my $element = $_;
 
-                                      '<TD STYLE="border:none"'.
+                                      '<TD'.
                                       ( $element->{'align'}
                                           ? ' ALIGN="'. $element->{'align'}. '"'
                                           : ''
@@ -432,6 +431,8 @@
 
                         ) {
 
+                          my $class = ( $field =~ /^<TABLE/i ) ? 'inv' : 'grid';
+
                           my $align = $aligns ? shift @$aligns : '';
                           $align = " ALIGN=$align" if $align;
 
@@ -471,7 +472,7 @@
                           }
 
                        %>
-                       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"<%= $align %>><%= $font %><%= $a %><%= $s %><%= $field %><%= $es %><%= $a ? '</A>' : '' %><%= $font ? '</FONT>' : '' %></TD>
+                       <TD CLASS="<%= $class %>" BGCOLOR="<%= $bgcolor %>"<%= $align %>><%= $font %><%= $a %><%= $s %><%= $field %><%= $es %><%= $a ? '</A>' : '' %><%= $font ? '</FONT>' : '' %></TD>
                      <% } %>
                    <% } else { %>
                      <% foreach ( @$row ) { %>
-- 
cgit v1.2.1


From 7aae40398f1c8ed42424f1694640c9796a580d22 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 7 Aug 2006 02:44:29 +0000
Subject: add internal user disable-ing

---
 FS/FS/CurrentUser.pm               |  1 +
 FS/FS/Schema.pm                    |  1 +
 FS/FS/access_user.pm               |  3 ++
 httemplate/browse/access_user.html | 87 ++++++++++++++++++++++++++------------
 httemplate/browse/part_pkg.cgi     |  2 +
 httemplate/edit/access_user.html   |  2 +
 httemplate/edit/elements/edit.html | 15 ++++---
 7 files changed, 80 insertions(+), 31 deletions(-)

diff --git a/FS/FS/CurrentUser.pm b/FS/FS/CurrentUser.pm
index 9f2c93f4f..bcd337d2c 100644
--- a/FS/FS/CurrentUser.pm
+++ b/FS/FS/CurrentUser.pm
@@ -36,6 +36,7 @@ sub load_user {
   $CurrentUser = qsearchs('access_user', {
     'username' => $user,
     #'_password' =>
+    'disabled' => '',
   } );
 
   die "unknown user: $user" unless $CurrentUser; # or bad password
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 3e1d68f1b..04dcb8245 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1476,6 +1476,7 @@ sub tables_hashref {
         '_password', 'varchar', '', $char_d, '', '',
         'last',      'varchar', '', $char_d, '', '', 
         'first',     'varchar', '', $char_d, '', '', 
+        'disabled',     'char', 'NULL',   1, '', '', 
       ],
       'primary_key' => 'usernum',
       'unique' => [ [ 'username' ] ],
diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index 37b3b2f37..5d1e183e7 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -47,6 +47,8 @@ FS::Record.  The following fields are currently supported:
 
 =item first -
 
+=item disabled - empty or 'Y'
+
 =back
 
 =head1 METHODS
@@ -211,6 +213,7 @@ sub check {
     || $self->ut_text('_password')
     || $self->ut_text('last')
     || $self->ut_text('first')
+    || $self->ut_enum('disabled', [ '', 'Y' ] )
   ;
   return $error if $error;
 
diff --git a/httemplate/browse/access_user.html b/httemplate/browse/access_user.html
index be11bf82a..5b787977d 100644
--- a/httemplate/browse/access_user.html
+++ b/httemplate/browse/access_user.html
@@ -4,6 +4,14 @@ my $html_init =
   "Internal users have access to the back-office interface.  Typically, this is your employees and contractors, but in a VISP setup, you can also add accounts for your reseller's employees.  It is <B>highly recommended</B> to add a <B>separate account for each person</B> rather than using role accounts.<BR><BR>".
   qq!<A HREF="${p}edit/access_user.html"><I>Add an internal user</I></A><BR><BR>!;
 
+#false laziness w/part_pkg.cgi
+my %search = ();
+my $search = '';
+unless ( $cgi->param('showdisabled') ) {
+  %search = ( 'disabled' => '' );
+  $search = "( disabled = '' OR disabled IS NULL )";
+}
+
 #false laziness w/access_group.html & agent_type.cgi
 my $groups_sub = sub {
   my $access_user = shift;
@@ -28,36 +36,63 @@ my $groups_sub = sub {
 
 };
 
+my $posttotal;
+if ( $cgi->param('showdisabled') ) {
+  $cgi->param('showdisabled', 0);
+  $posttotal = '( <a href="'. $cgi->self_url. '">hide disabled users</a> )';
+  $cgi->param('showdisabled', 1);
+} else {
+  $cgi->param('showdisabled', 1);
+  $posttotal = '( <a href="'. $cgi->self_url. '">show disabled users</a> )';
+  $cgi->param('showdisabled', 0);
+}
+
 my $count_query = 'SELECT COUNT(*) FROM access_user';
+$count_query .= " WHERE $search"
+  if $search;
 
 my $link = [ $p.'edit/access_user.html?', 'usernum' ];
 
+my @header = ( '#', 'Username' );
+my @fields = ( 'usernum', 'username' );
+my $align = 'rl';
+my @links = ( $link, $link );
+my @style = ( '', '' );
+
+#false laziness w/part_pkg.cgi
+#unless ( $cgi->param('showdisabled') ) { #its been reversed already
+if ( $cgi->param('showdisabled') ) { #its been reversed already
+  push @header, 'Status';
+  push @fields, sub { shift->disabled
+                        ? '<FONT COLOR="#FF0000">DISABLED</FONT>'
+                        : '<FONT COLOR="#00CC00">Active</FONT>'
+                    };
+  push @links, '';
+  $align .= 'c';
+  push @style, 'b';
+}
+
+push @header, 'Full name', 'Groups';
+push @fields, 'name',      $groups_sub;
+push @links,  $link,       '';
+$align .= 'll';
+
 %><%= include( 'elements/browse.html',
-                 'title'       => 'Internal Users',
-                 'menubar'     => [ #'Main menu' => $p,
-                                    'Internal access groups' => $p.'browse/access_group.html',
-                                  ],
-                 'html_init'   => $html_init,
-                 'name'        => 'internal users',
-                 'query'       => { 'table'     => 'access_user',
-                                    'hashref'   => {},
-                                    'extra_sql' => 'ORDER BY last, first',
-                                  },
-                 'count_query' => $count_query,
-                 'header'      => [ '#',
-                                    'Username',
-                                    'Full name',
-                                    'Groups'
-                                  ],
-                 'fields'      => [ 'usernum',
-                                    'username',
-                                    'name', # sub { shift->name },
-                                    $groups_sub,
-                                  ],
-                 'links'       => [ $link,
-                                    $link,
-                                    $link,
-                                    ''
-                                  ],
+                 'title'          => 'Internal Users',
+                 'menubar'        => [ #'Main menu' => $p,
+                                       'Internal access groups' => $p.'browse/access_group.html',
+                                     ],
+                 'html_init'      => $html_init,
+                 'html_posttotal' => $posttotal,
+                 'name'           => 'internal users',
+                 'query'          => { 'table'     => 'access_user',
+                                       'hashref'   => \%search,
+                                       'extra_sql' => 'ORDER BY last, first',
+                                     },
+                 'count_query'    => $count_query,
+                 'header'         => \@header,
+                 'fields'         => \@fields,
+                 'links'          => \@links,
+                 'style'          => \@style,
              )
 %>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index b67a5e55f..a5e212d17 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,5 +1,6 @@
 <%
 
+#false laziness w/access_user.html
 my %search = ();
 my $search = '';
 unless ( $cgi->param('showdisabled') ) {
@@ -71,6 +72,7 @@ my $align = 'rll';
 my @links = ( $link, $link, '' );
 my @style = ( '', '', '' );
 
+#false laziness w/access_user.html
 #unless ( $cgi->param('showdisabled') ) { #its been reversed already
 if ( $cgi->param('showdisabled') ) { #its been reversed already
   push @header, 'Status';
diff --git a/httemplate/edit/access_user.html b/httemplate/edit/access_user.html
index 2b19dbf7b..fb2a97196 100644
--- a/httemplate/edit/access_user.html
+++ b/httemplate/edit/access_user.html
@@ -6,6 +6,7 @@
                                { field=>'_password', type=>'password' },
                                'last',
                                'first',
+                               { field=>'disabled', type=>'checkbox', value=>'Y' },
                              ],
                  'labels' => { 
                                'usernum'   => 'User number',
@@ -13,6 +14,7 @@
                                '_password' => 'Password',
                                'last'      => 'Last name',
                                'first'     => 'First name',
+                               'disabled'  => 'Disable employee',
                              },
                  'viewall_dir' => 'browse',
                  'html_bottom' =>
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index f79cc0b24..c40a00492 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -15,7 +15,9 @@
   # 'fields' => [
   #               'columname',
   #               { 'field' => 'another_columname',
-  #                 'type' => 'text', #text, fixed, hidden
+  #                 'type'  => 'text', #text, fixed, hidden, checkbox
+  #                                    #eventually more for <SELECT>, etc.
+  #                 'value' => 'Y', #only for checkbox
   #               },
   #             ]
   #
@@ -150,14 +152,17 @@
       %>
     </TD>
 
-    <%
-      #eventually more options for <SELECT>, etc. fields
-      if ( $type eq 'fixed' ) {
-    %>
+    <% if ( $type eq 'fixed' ) { %>
 
       <TD BGCOLOR="#dddddd"><%= $f->{'value'} %></TD>
       <INPUT TYPE="hidden" NAME="<%= $field %>" VALUE="<%= $f->{'value'} %>">
 
+    <% } elsif ( $type eq 'checkbox' ) { %>
+
+      <TD>
+        <INPUT TYPE="checkbox" NAME="<%= $field %>" VALUE="<%= $f->{'value'} %>" <%= $object->$field() eq $f->{'value'} ? ' CHECKED' : '' %>>
+      </TD>
+
     <% } else { %>
 
       <TD>
-- 
cgit v1.2.1


From 5d133672add54fb6bdd6690cdd9ca386d7a44a10 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Aug 2006 03:45:00 +0000
Subject: please bleeding-edge debian perl, would you put it in
 /usr/local/sbin?  thanks.

---
 fs_selfservice/FS-SelfService/Makefile.PL | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs_selfservice/FS-SelfService/Makefile.PL b/fs_selfservice/FS-SelfService/Makefile.PL
index 0b7fc4606..85c92b4fb 100644
--- a/fs_selfservice/FS-SelfService/Makefile.PL
+++ b/fs_selfservice/FS-SelfService/Makefile.PL
@@ -9,6 +9,7 @@ WriteMakefile(
                            ],
     'INSTALLSCRIPT'     => '/usr/local/sbin',
     'INSTALLSITEBIN'    => '/usr/local/sbin',
+    'INSTALLSITESCRIPT' => '/usr/local/sbin', #recent deb users this...
     'PERM_RWX'          => '750',
     'PREREQ_PM'		=> {
                              'Storable' => 2.09,
-- 
cgit v1.2.1


From b58e61ac7df612f606c3e68371265e790e0be585 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Aug 2006 06:34:26 +0000
Subject: self-service interface: move from text to html invoices

---
 FS/FS/ClientAPI/MyAccount.pm                       | 27 ++++++++++++++++++++++
 fs_selfservice/FS-SelfService/SelfService.pm       |  1 +
 .../FS-SelfService/cgi/cust_bill-logo.cgi          | 18 +++++++++++++++
 .../FS-SelfService/cgi/view_invoice.html           |  4 +---
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 4b67f53af..163718e13 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -414,10 +414,37 @@ sub invoice {
   return { 'error'        => '',
            'invnum'       => $invnum,
            'invoice_text' => join('', $cust_bill->print_text ),
+           'invoice_html' => $cust_bill->print_html,
          };
 
 }
 
+sub invoice_logo {
+  my $p = shift;
+
+  #sessioning for this?  how do we get the session id to the backend invoice
+  # template so it can add it to the link, blah
+
+  my $templatename = $p->{'templatename'};
+
+  #false laziness-ish w/view/cust_bill-logo.cgi
+
+  my $conf = new FS::Conf;
+  if ( $templatename =~ /^([^\.\/]*)$/ && $conf->exists("logo_$1.png") ) {
+    $templatename = "_$1";
+  } else {
+    $templatename = '';
+  }
+
+  my $filename = "logo$templatename.png";
+
+  return { 'error'        => '',
+           'logo'         => $conf->config_binary($filename),
+           'content_type' => 'image/png', #should allow gif, jpg too
+         };
+}
+
+
 sub list_invoices {
   my $p = shift;
   my $session = _cache->get($p->{'session_id'})
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index bfce1287b..16ca48ec8 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -27,6 +27,7 @@ $socket .= '.'.$tag if defined $tag && length($tag);
   'customer_info'        => 'MyAccount/customer_info',
   'edit_info'            => 'MyAccount/edit_info',     #add to ss cgi!
   'invoice'              => 'MyAccount/invoice',
+  'invoice_logo'         => 'MyAccount/invoice_logo',
   'list_invoices'        => 'MyAccount/list_invoices', #?
   'cancel'               => 'MyAccount/cancel',        #add to ss cgi!
   'payment_info'         => 'MyAccount/payment_info',
diff --git a/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi b/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi
new file mode 100644
index 000000000..bf82a87e8
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi
@@ -0,0 +1,18 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use CGI;
+use FS::SelfService qw( invoice_logo );
+
+$cgi = new CGI;
+
+my($query) = $cgi->keywords;
+$query =~ /^([^\.\/]*)$/ or '' =~ /^()$/;
+my $templatename = $1;
+invoice_logo($templatename);
+
+print $cgi->header( '-type'    => $content_type,
+                    '-expires' => 'now',
+                  ).
+      $logo;
+
diff --git a/fs_selfservice/FS-SelfService/cgi/view_invoice.html b/fs_selfservice/FS-SelfService/cgi/view_invoice.html
index 72d061980..ad2f4f419 100644
--- a/fs_selfservice/FS-SelfService/cgi/view_invoice.html
+++ b/fs_selfservice/FS-SelfService/cgi/view_invoice.html
@@ -4,9 +4,7 @@
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 
-<FONT SIZE="-1"><PRE>
-<%= $invoice_text %>
-</FONT></PRE>
+<%= $invoice_html %>
 
 </TD></TR></TABLE>
 <HR>
-- 
cgit v1.2.1


From 6c375156081be5d2023001ed8eaac9b6db568e95 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 9 Aug 2006 06:43:02 +0000
Subject: batch refactor

---
 FS/FS/Schema.pm                      |   8 +-
 FS/FS/Setup.pm                       |   7 ++
 FS/FS/cust_bill.pm                   |  25 ++++-
 FS/FS/cust_main.pm                   |  30 ++++-
 FS/FS/cust_pay_batch.pm              | 207 ++++++++++++++++++++++++++++++-----
 FS/FS/part_bill_event.pm             |   2 +-
 FS/FS/pay_batch.pm                   |   8 +-
 FS/FS/payby.pm                       |   5 +
 README.1.7.0                         |   2 +
 httemplate/browse/cust_pay_batch.cgi |  33 ++++--
 httemplate/browse/pay_batch.cgi      |  54 +++++++++
 httemplate/docs/schema.html          |   4 +
 httemplate/misc/download-batch.cgi   |  37 ++++++-
 13 files changed, 370 insertions(+), 52 deletions(-)
 create mode 100755 httemplate/browse/pay_batch.cgi

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 04dcb8245..5dac26600 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -542,7 +542,9 @@ sub tables_hashref {
     'pay_batch' => { #batches of payments to an external processor
       'columns' => [
         'batchnum',   'serial',    '',   '', '', '', 
-        'status',  'char', 'NULL',     1, '', '', 
+        'status',     'char', 'NULL',     1, '', '', 
+        'download',   @date_type, 'NULL', '', 
+        'upload',     @date_type, 'NULL', '', 
       ],
       'primary_key' => 'batchnum',
       'unique' => [],
@@ -565,11 +567,13 @@ sub tables_hashref {
         'zip',      'varchar', 'NULL', 10, '', '', 
         'country',  'char', '',     2, '', '', 
         #        'trancode', 'int', '', '', '', ''
+        'payby',    'char',   '',     4, '', '', # CARD/BILL/COMP, should be
         'payinfo',  'varchar', '',     512, '', '', 
         #'exp',      @date_type, '', ''
-        'exp',      'varchar', '',     11, '', '', 
+        'exp',      'varchar', 'NULL',     11, '', '', 
         'payname',  'varchar', 'NULL', $char_d, '', '', 
         'amount',   @money_type, '', '', 
+        'status',   'varchar', 'NULL',     $char_d, '', '', 
       ],
       'primary_key' => 'paybatchnum',
       'unique' => [],
diff --git a/FS/FS/Setup.pm b/FS/FS/Setup.pm
index 7475d3782..90f6f1011 100644
--- a/FS/FS/Setup.pm
+++ b/FS/FS/Setup.pm
@@ -168,6 +168,13 @@ sub initial_data {
         'weight'    => 50,
         'plan'      => 'send',
       },
+      { 'payby'     => 'DCLN',
+        'event'     => 'Suspend',
+        'seconds'   => 0,
+        'eventcode' => '$cust_bill->suspend();',
+        'weight'    => 40,
+        'plan'      => 'suspend',
+      },
     ],
     
     #you must create a service definition. An example of a service definition
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index def84f91a..d45b66faf 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1284,6 +1284,9 @@ sub batch_card {
   my $self = shift;
   my $cust_main = $self->cust_main;
 
+  my $amount = sprintf("%.2f", $cust_main->balance - $cust_main->in_transit_payments);
+  return '' unless $amount > 0;
+  
   my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
@@ -1300,9 +1303,14 @@ sub batch_card {
     }
   }
 
+  my $old_cust_pay_batch = qsearchs('cust_pay_batch', {
+      'batchnum' => $pay_batch->getfield('batchnum'),
+      'custnum'  => $cust_main->getfield('custnum'),
+  } );
+
   my $cust_pay_batch = new FS::cust_pay_batch ( {
     'batchnum' => $pay_batch->getfield('batchnum'),
-    'invnum'   => $self->getfield('invnum'),
+    'invnum'   => $self->getfield('invnum'),       # is there a better value?
     'custnum'  => $cust_main->getfield('custnum'),
     'last'     => $cust_main->getfield('last'),
     'first'    => $cust_main->getfield('first'),
@@ -1312,12 +1320,23 @@ sub batch_card {
     'state'    => $cust_main->getfield('state'),
     'zip'      => $cust_main->getfield('zip'),
     'country'  => $cust_main->getfield('country'),
+    'payby'    => $cust_main->payby,
     'payinfo'  => $cust_main->payinfo,
     'exp'      => $cust_main->getfield('paydate'),
     'payname'  => $cust_main->getfield('payname'),
-    'amount'   => $self->owed,
+    'amount'   => $amount,                          # consolidating
   } );
-  my $error = $cust_pay_batch->insert;
+  
+  $cust_pay_batch->paybatchnum($old_cust_pay_batch->paybatchnum)
+    if $old_cust_pay_batch;
+
+  my $error;
+  if ($old_cust_pay_batch) {
+    $error = $cust_pay_batch->replace($old_cust_pay_batch)
+  } else {
+    $error = $cust_pay_batch->insert;
+  }
+
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     die $error;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index f4568a8a0..f1d969cd1 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2046,6 +2046,8 @@ quiet - set true to surpress email card/ACH decline notices.
 freq - "1d" for the traditional, daily events (the default), or "1m" for the
 new monthly events
 
+payby - allows for one time override of normal customer billing method
+
 =cut
 
 sub collect {
@@ -2116,7 +2118,10 @@ sub collect {
              }
           qsearch( {
             'table'     => 'part_bill_event',
-            'hashref'   => { 'payby'    => $self->payby,
+            'hashref'   => { 'payby'    => (exists($options{'payby'})
+	                                     ? $options{'payby'}
+					     : $self->payby
+					   ),
                              'disabled' => '',           },
             'extra_sql' => $extra_sql,
           } )
@@ -3143,6 +3148,29 @@ sub balance_date {
   );
 }
 
+=item in_transit_payments
+
+Returns the total of requests for payments for this customer pending in 
+batches in transit to the bank.  See L<FS::pay_batch> and L<FS::cust_pay_batch>
+
+=cut
+
+sub in_transit_payments {
+  my $self = shift;
+  my $in_transit_payments = 0;
+  foreach my $pay_batch ( qsearch('pay_batch', {
+    'status' => 'I',
+  } ) ) {
+    foreach my $cust_pay_batch ( qsearch('cust_pay_batch', {
+      'batchnum' => $pay_batch->batchnum,
+      'custnum' => $self->custnum,
+    } ) ) {
+      $in_transit_payments += $cust_pay_batch->amount;
+    }
+  }
+  sprintf( "%.2f", $in_transit_payments );
+}
+
 =item paydate_monthyear
 
 Returns a two-element list consisting of the month and year of this customer's
diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 117d72561..e057334c2 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -1,12 +1,17 @@
 package FS::cust_pay_batch;
 
 use strict;
-use vars qw( @ISA );
-use FS::Record qw(dbh qsearchs);
+use vars qw( @ISA $DEBUG );
+use FS::Record qw(dbh qsearch qsearchs);
 use Business::CreditCard;
 
 @ISA = qw( FS::Record );
 
+# 1 is mostly method/subroutine entry and options
+# 2 traces progress of some operations
+# 3 is even more information including possibly sensitive data
+$DEBUG = 0;
+
 =head1 NAME
 
 FS::cust_pay_batch - Object methods for batch cards
@@ -37,6 +42,10 @@ following fields are currently supported:
 
 =item paybatchnum - primary key (automatically assigned)
 
+=item batchnum - indentifies group in batch
+
+=item payby - CARD/CHEK/LECB/BILL/COMP
+
 =item payinfo
 
 =item exp - card expiration 
@@ -65,6 +74,8 @@ following fields are currently supported:
 
 =item country 
 
+=item status
+
 =back
 
 =head1 METHODS
@@ -94,16 +105,8 @@ otherwise returns false.
 
 =item replace OLD_RECORD
 
-#inactive
-#
-#Replaces the OLD_RECORD with this one in the database.  If there is an error,
-#returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
-  return "Can't (yet?) replace batched transactions!";
-}
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
 
 =item check
 
@@ -119,7 +122,6 @@ sub check {
   my $error = 
       $self->ut_numbern('paybatchnum')
     || $self->ut_numbern('trancode') #depriciated
-    || $self->ut_number('payinfo') 
     || $self->ut_money('amount')
     || $self->ut_number('invnum')
     || $self->ut_number('custnum')
@@ -137,6 +139,10 @@ sub check {
   $self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
   $self->first($1);
 
+  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREP|CASH|WEST|MCRD)$/
+    or return "Illegal payby";
+  $self->payby($1);
+
   # FIXME
   # there is no point in false laziness here
   # we will effectively set "check_payinfo to 0"
@@ -152,7 +158,8 @@ sub check {
   #return "Unknown card type" if cardtype($cardnum) eq "Unknown";
 
   if ( $self->exp eq '' ) {
-    return "Expiration date required"; #unless 
+    return "Expiration date required"
+      unless $self->payby =~ /^(CHEK|DCHK|LECB|WEST)$/;
     $self->exp('');
   } else {
     if ( $self->exp =~ /^(\d{4})[\/\-](\d{1,2})[\/\-](\d{1,2})$/ ) {
@@ -226,7 +233,11 @@ sub import_results {
   my $format = $param->{'format'};
   my $paybatch = $param->{'paybatch'};
 
+  my $filetype;      # CSV, Fixed80, Fixed264
   my @fields;
+  my $formatre;      # for Fixed.+
+  my @values;
+  my $begin_condition;
   my $end_condition;
   my $end_hook;
   my $hook;
@@ -235,6 +246,8 @@ sub import_results {
 
   if ( $format eq 'csv-td_canada_trust-merchant_pc_batch' ) {
 
+    $filetype = "CSV";
+
     @fields = (
       'paybatchnum', # Reference#:  Invoice number of the transaction
       'paid',        # Amount:  Amount of the transaction.  Dollars and cents
@@ -293,6 +306,58 @@ sub import_results {
     };
 
 
+  }elsif ( $format eq 'PAP' ) {
+
+    $filetype = "Fixed264";
+
+    @fields = (
+      'recordtype',  # We are interested in the 'D' or debit records
+      'batchnum',    # Record#:  batch number we used when sending the file
+      'datacenter',  # Where in the bowels of the bank the data was processed
+      'paid',        # Amount:  Amount of the transaction.  Dollars and cents
+                     #          with no decimal entered.
+      '_date',       # Transaction Date:  Date the Transaction was processed
+      'bank',        # Routing information
+      'payinfo',     # Account number for the transaction
+      'paybatchnum', # Reference#:  Invoice number of the transaction
+    );
+
+    $formatre = '^(.).{19}(.{4})(.{3})(.{10})(.{6})(.{9})(.{12}).{110}(.{19}).{71}$'; 
+
+    $end_condition = sub {
+      my $hash = shift;
+      $hash->{'recordtype'} eq 'W';
+    };
+
+    $end_hook = sub {
+      my( $hash, $total) = @_;
+      $total = sprintf("%.2f", $total);
+      my $batch_total = $hash->{'datacenter'}.$hash->{'paid'}.
+                        substr($hash->{'_date'},0,1);          # YUCK!
+      $batch_total = sprintf("%.2f", $batch_total / 100 );
+      return "Our total $total does not match bank total $batch_total!"
+        if $total != $batch_total;
+      '';
+    };
+
+    $hook = sub {
+      my $hash = shift;
+      $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
+      my $tmpdate = timelocal( 0,0,1,1,0,substr($hash->{'_date'}, 0, 3)+2000); 
+      $tmpdate += 86400*(substr($hash->{'_date'}, 3, 3)-1) ;
+      $hash->{'_date'} = $tmpdate;
+      $hash->{'payinfo'} = $hash->{'payinfo'} . '@' . $hash->{'bank'};
+    };
+
+    $approved_condition = sub {
+      1;
+    };
+
+    $declined_condition = sub {
+      0;
+    };
+
+
   } else {
     return "Unknown format $format";
   }
@@ -316,10 +381,10 @@ sub import_results {
     return "batch $paybatch is not in transit";
   };
 
-  my %batchhash = $pay_batch->hash;
-  $batchhash{'status'} = 'R';   # Resolved
-  my $newbatch = new FS::pay_batch ( \%batchhash );
-  my $error = $newbatch->replace($paybatch);
+  my $newbatch = new FS::pay_batch { $pay_batch->hash };
+  $newbatch->status('R');   # Resolved
+  $newbatch->upload(time);
+  my $error = $newbatch->replace($pay_batch);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error
@@ -331,12 +396,23 @@ sub import_results {
 
     next if $line =~ /^\s*$/; #skip blank lines
 
-    $csv->parse($line) or do {
+    if ($filetype eq "CSV") {
+      $csv->parse($line) or do {
+        $dbh->rollback if $oldAutoCommit;
+        return "can't parse: ". $csv->error_input();
+      };
+      @values = $csv->fields();
+    }elsif ($filetype eq "Fixed80" || $filetype eq "Fixed264"){
+      @values = $line =~ /$formatre/;
+      unless (@values) {
+        $dbh->rollback if $oldAutoCommit;
+        return "can't parse: ". $line;
+      };
+    }else{
       $dbh->rollback if $oldAutoCommit;
-      return "can't parse: ". $csv->error_input();
-    };
+      return "Unknown file type $filetype";
+    }
 
-    my @values = $csv->fields();
     my %hash;
     foreach my $field ( @fields ) {
       my $value = shift @values;
@@ -354,26 +430,25 @@ sub import_results {
     }
 
     my $cust_pay_batch =
-      qsearchs('cust_pay_batch', { 'paybatchnum' => $hash{'paybatchnum'} } );
+      qsearchs('cust_pay_batch', { 'paybatchnum' => $hash{'paybatchnum'}+0 } );
     unless ( $cust_pay_batch ) {
       $dbh->rollback if $oldAutoCommit;
       return "unknown paybatchnum $hash{'paybatchnum'}\n";
     }
     my $custnum = $cust_pay_batch->custnum,
+    my $payby = $cust_pay_batch->payby,
 
-    my $error = $cust_pay_batch->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "error removing paybatchnum $hash{'paybatchnum'}: $error\n";
-    }
+    my $new_cust_pay_batch = new FS::cust_pay_batch { $cust_pay_batch->hash };
 
     &{$hook}(\%hash);
 
     if ( &{$approved_condition}(\%hash) ) {
 
+      $new_cust_pay_batch->status('Approved');
+
       my $cust_pay = new FS::cust_pay ( {
         'custnum'  => $custnum,
-        'payby'    => 'CARD',
+	'payby'    => $payby,
         'paybatch' => $paybatch,
         map { $_ => $hash{$_} } (qw( paid _date payinfo )),
       } );
@@ -388,11 +463,83 @@ sub import_results {
 
     } elsif ( &{$declined_condition}(\%hash) ) {
 
+      $new_cust_pay_batch->status('Declined');
+
       #this should be configurable... if anybody else ever uses batches
-      $cust_pay_batch->cust_main->suspend;
+      # $cust_pay_batch->cust_main->suspend;
+
+      foreach my $part_bill_event (
+        sort {    $a->seconds   <=> $b->seconds
+               || $a->weight    <=> $b->weight
+               || $a->eventpart <=> $b->eventpart }
+          grep { ! qsearch( 'cust_bill_event', {
+                               'invnum'    => $cust_pay_batch->invnum,
+                               'eventpart' => $_->eventpart,
+                               'status'    => 'done',
+                                                                   } )
+               }
+            qsearch( {
+              'table'     => 'part_bill_event',
+              'hashref'   => { 'payby'    => 'DCLN',
+                               'disabled' => '',           },
+            } )
+      ) {
+
+        # don't run subsequent events if balance<=0
+        last if $cust_pay_batch->cust_main->balance <= 0;
+
+        warn "  calling invoice event (". $part_bill_event->eventcode. ")\n"
+          if $DEBUG > 1;
+        my $cust_main = $cust_pay_batch->cust_main; #for callback
+
+        my $error;
+        {
+          local $SIG{__DIE__}; # don't want Mason __DIE__ handler active
+          $error = eval $part_bill_event->eventcode;
+        }
+
+        my $status = '';
+        my $statustext = '';
+        if ( $@ ) {
+          $status = 'failed';
+          $statustext = $@;
+        } elsif ( $error ) {
+          $status = 'done';
+          $statustext = $error;
+        } else {
+          $status = 'done'
+        }
+
+	#add cust_bill_event
+	my $cust_bill_event = new FS::cust_bill_event {
+	  'invnum'     => $cust_pay_batch->invnum,
+	  'eventpart'  => $part_bill_event->eventpart,
+	  '_date'      => time,
+	  'status'     => $status,
+	  'statustext' => $statustext,
+	};
+	$error = $cust_bill_event->insert;
+	if ( $error ) {
+	  # gah, even with transactions.
+	  $dbh->commit if $oldAutoCommit; #well.
+          my $e = 'WARNING: Event run but database not updated - '.
+                  'error inserting cust_bill_event, invnum #'. $cust_pay_batch->invnum.
+		  ', eventpart '. $part_bill_event->eventpart.
+                  ": $error";
+          warn $e;
+          return $e;
+        }
+
+      }
 
     }
 
+    my $error = $new_cust_pay_batch->replace($cust_pay_batch);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "error updating status of paybatchnum $hash{'paybatchnum'}: $error\n";
+    }
+
   }
   
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index 98e15d4a2..2aef5bcce 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -144,7 +144,7 @@ sub check {
   }
 
   my $error = $self->ut_numbern('eventpart')
-    || $self->ut_enum('payby', [qw( CARD DCRD CHEK DCHK LECB BILL COMP )] )
+    || $self->ut_enum('payby', [qw( CARD DCLN DCRD CHEK DCHK LECB BILL COMP )] )
     || $self->ut_text('event')
     || $self->ut_anything('eventcode')
     || $self->ut_number('seconds')
diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
index 41b312c7a..7d9d9fb09 100644
--- a/FS/FS/pay_batch.pm
+++ b/FS/FS/pay_batch.pm
@@ -34,7 +34,11 @@ FS::Record.  The following fields are currently supported:
 
 =item batchnum - primary key
 
-=item status - 
+=item status -  
+
+=item download - 
+
+=item upload - 
 
 
 =back
@@ -109,7 +113,7 @@ sub check {
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
+status is somewhat redundant now that download and upload exist
 
 =head1 SEE ALSO
 
diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 9f8b68918..72a876655 100644
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -90,6 +90,11 @@ tie %hash, 'Tie::IxHash',
     shortname => 'Complimentary',
     longname  => 'Complimentary',
   },
+  'DCLN' => {  # This is only an event.
+    tinyname  => 'declined',
+    shortname => 'Declined payment',
+    longname  => 'Declined payment',
+  },
 ;
 
 sub payby {
diff --git a/README.1.7.0 b/README.1.7.0
index 69b395a34..c82c8ada9 100644
--- a/README.1.7.0
+++ b/README.1.7.0
@@ -8,9 +8,11 @@ ALTER TABLE cust_pay_batch ALTER COLUMN batchnum SET NOT NULL;
 ALTER TABLE cust_pay_batch ADD COLUMN payinfo varchar(512);
 UPDATE cust_pay_batch SET payinfo = cardnum;
 ALTER TABLE cust_pay_batch DROP COLUMN cardnum;
+ALTER TABLE cust_pay_batch ALTER COLUMN exp DROP NOT NULL;
 ALTER TABLE h_cust_pay_batch ADD COLUMN payinfo varchar(512);
 UPDATE h_cust_pay_batch SET payinfo = cardnum;
 ALTER TABLE h_cust_pay_batch DROP COLUMN cardnum;
+ALTER TABLE h_cust_pay_batch ALTER COLUMN exp DROP NOT NULL;
 
 make install-perl-modules
 run "freeside-upgrade username" to uprade your database schema
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index c7f0afe76..98ea2f5a2 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -1,12 +1,24 @@
 <!-- mason kludge -->
-<%= include("/elements/header.html","Pending credit card batch", menubar( 'Main Menu' => $p,)) %>
+<%= include("/elements/header.html","Credit card batch details", menubar( 'Main Menu' => $p,)) %>
+
+<%
+
+die "No batch specified (bad URL)!" unless $cgi->keywords;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+my $batchnum = $1;
+my $pay_batch = qsearchs('pay_batch',{'batchnum'=>$batchnum});
+die "Batch not found!" unless $pay_batch;
+
+%>
 
 <FORM ACTION="<%=$p%>misc/download-batch.cgi" METHOD="POST">
 Download batch in format <SELECT NAME="format">
 <OPTION VALUE="">Default batch mode</OPTION>
 <OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV file for TD Canada Trust Merchant PC Batch</OPTION>
-<OPTION VALUE="BoM">Bank of Montreal ECA results</OPTION>
-</SELECT><INPUT TYPE="submit" VALUE="Download"></FORM>
+<OPTION VALUE="PAP">80 byte file for TD Canada Trust PAP Batch</OPTION>
+<OPTION VALUE="BoM">Bank of Montreal ECA batch</OPTION>
+</SELECT><INPUT TYPE="hidden" NAME="batchnum" VALUE="<%= $batchnum %>"><INPUT TYPE="submit" VALUE="Download"></FORM>
 <BR><BR>
 
 <FORM ACTION="<%=$p%>misc/upload-batch.cgi" METHOD="POST" ENCTYPE="multipart/form-data">
@@ -15,25 +27,28 @@ Filename <INPUT TYPE="file" NAME="batch_results"><BR>
 Format <SELECT NAME="format">
 <OPTION VALUE="">Default batch mode</OPTION>
 <OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV results from TD Canada Trust Merchant PC Batch</OPTION>
-<OPTION VALUE="BoM">Bank of Montreal ECA batch</OPTION>
+<OPTION VALUE="PAP">264 byte results for TD Canada Trust PAP Batch</OPTION>
+<OPTION VALUE="BoM">Bank of Montreal ECA results</OPTION>
 </SELECT><BR>
 <INPUT TYPE="submit" VALUE="Upload"></FORM>
 <BR>
 
 <%
-  my $statement = "SELECT SUM(amount) from cust_pay_batch";
+  my $statement = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=".
+                     $batchnum;
   my $sth = dbh->prepare($statement) or die dbh->errstr. "doing $statement";
   $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
   my $total = $sth->fetchrow_arrayref->[0];
 
-  my $c_statement = "SELECT COUNT(*) from cust_pay_batch";
+  my $c_statement = "SELECT COUNT(*) from cust_pay_batch WHERE batchnum=".
+                       $batchnum;
   my $c_sth = dbh->prepare($c_statement)
     or die dbh->errstr. "doing $c_statement";
   $c_sth->execute or die "Error executing \"$c_statement\": ". $c_sth->errstr;
   my $cards = $c_sth->fetchrow_arrayref->[0];
 %>
 <%= $cards %> credit card payments batched<BR>
-$<%= sprintf("%.2f", $total) %> total in pending batch<BR>
+$<%= sprintf("%.2f", $total) %> total in batch<BR>
 
 <BR>
 <%= &table() %>
@@ -45,11 +60,12 @@ $<%= sprintf("%.2f", $total) %> total in pending batch<BR>
         <TH>Card</TH>
         <TH>Exp</TH>
         <TH>Amount</TH>
+        <TH>Status</TH>
       </TR>
 
 <%
 foreach my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
-                             qsearch('cust_pay_batch', {} )
+                             qsearch('cust_pay_batch', {'batchnum'=>$batchnum} )
 ) {
   my $cardnum = $cust_pay_batch->payinfo;
   #$cardnum =~ s/.{4}$/xxxx/;
@@ -71,6 +87,7 @@ foreach my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
         <TD><%= $cardnum %></TD>
         <TD><%= $exp %></TD>
         <TD align="right">$<%= $cust_pay_batch->amount %></TD>
+        <TD><%= $cust_pay_batch->status %></TD>
       </TR>
 
 <% } %>
diff --git a/httemplate/browse/pay_batch.cgi b/httemplate/browse/pay_batch.cgi
new file mode 100755
index 000000000..66c86d676
--- /dev/null
+++ b/httemplate/browse/pay_batch.cgi
@@ -0,0 +1,54 @@
+<!-- mason kludge -->
+<%= include("/elements/header.html","Credit card batches", menubar( 'Main Menu' => $p,)) %>
+
+<BR><BR>
+
+<%
+  my %statusmap = ('I'=>'In Transit', 'O'=>'Open', 'R'=>'Resolved');
+%>
+
+<BR>
+<%= &table() %>
+      <TR>
+        <TH>Batch</TH>
+        <TH>First Download</TH>
+        <TH>Last Upload</TH>
+        <TH>Item Count</TH>
+        <TH>Amount</TH>
+        <TH>Status</TH>
+      </TR>
+
+<%
+foreach my $pay_batch ( sort { $b->batchnum <=> $a->batchnum }
+                             qsearch('pay_batch', {} )
+) {
+
+  my $statement = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=" .
+                     $pay_batch->batchnum;
+  my $sth = dbh->prepare($statement) or die dbh->errstr. "doing $statement";
+  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+  my $total = $sth->fetchrow_arrayref->[0];
+
+  my $c_statement = "SELECT COUNT(*) from cust_pay_batch WHERE batchnum=" .
+                       $pay_batch->batchnum;
+  my $c_sth = dbh->prepare($c_statement)
+    or die dbh->errstr. "doing $c_statement";
+  $c_sth->execute or die "Error executing \"$c_statement\": ". $c_sth->errstr;
+  my $cards = $c_sth->fetchrow_arrayref->[0];
+
+%>
+
+      <TR>
+        <TD><A HREF="cust_pay_batch.cgi?<%= $pay_batch->batchnum %>"><%= $pay_batch->batchnum %></TD>
+        <TD><%= $pay_batch->download ? time2str("%a %b %e %T %Y", $pay_batch->download) : '' %></TD>
+        <TD><%= $pay_batch->upload ? time2str("%a %b %e %T %Y", $pay_batch->upload) : '' %></TD>
+        <TD><%= $cards %></TD>
+        <TD align="right"><%= $total %></TD>
+        <TD><%= $statusmap{$pay_batch->status} %></TD>
+      </TR>
+
+<% } %>
+
+    </TABLE>
+  </BODY>
+</HTML>
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index d9e35efc7..cd4914a6c 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -203,11 +203,14 @@
       <ul>
         <li>batchnum
         <li>status
+        <li>download
+        <li>upload
       </ul>
     <li><a name="cust_pay_batch" href="man/FS/cust_pay_batch.html">cust_pay_batch</a> - Pending batch members
       <ul>
         <li>paybatchnum
         <li>batchnum
+        <li>payby - CARD, CHEK, LECB, BILL, or COMP
         <li>payinfo - account number
         <li>exp - card expiration
         <li>amount
@@ -222,6 +225,7 @@
         <li>state
         <li>zip
         <li>country
+        <li>status
       </ul>
     <li><a name="cust_pkg" href="man/FS/cust_pkg.html">cust_pkg</a> - Customer billing items
       <ul>
diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 6172b1335..2c6481493 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -5,6 +5,13 @@ my $conf=new FS::Conf;
 #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
 http_header('Content-Type' => 'text/plain' );
 
+my $batchnum;
+if ( $cgi->param('batchnum') =~ /^(\d+)$/ ) {
+  $batchnum = $1;
+} else {
+  die "No batch number (bad URL) \n";
+}
+
 my $format;
 if ( $cgi->param('format') =~ /^([\w\- ]+)$/ ) {
   $format = $1;
@@ -16,11 +23,12 @@ my $oldAutoCommit = $FS::UID::AutoCommit;
 local $FS::UID::AutoCommit = 0;
 my $dbh = dbh;
 
-my $pay_batch = qsearchs('pay_batch', {'status'=>'O'} );
+my $pay_batch = qsearchs('pay_batch', {'batchnum'=>$batchnum, 'status'=>'O'} );
 die "No pending batch. \n" unless $pay_batch;
 
 my %batchhash = $pay_batch->hash;
 $batchhash{'status'} = 'I';
+$batchhash{'download'} = time unless $batchhash{'download'};
 my $new = new FS::pay_batch \%batchhash;
 my $error = $new->replace($pay_batch);
 die "error updating batch status: $error\n" if $error;
@@ -28,8 +36,10 @@ die "error updating batch status: $error\n" if $error;
 my $batchtotal=0;
 my $batchcount=0;
 
-my (@date)=localtime();
-my $jdate = sprintf("%03d", $date[5] % 100).sprintf("%03d", $date[7]);
+my (@date)=localtime($new->download);
+my $jdate = sprintf("%03d", $date[5] % 100).sprintf("%03d", $date[7] + 1);
+my $cdate = sprintf("%02d", $date[3]).sprintf("%02d", $date[4] + 1).
+            sprintf("%02d", $date[5] % 100);
 
 if ($format eq "BoM") {
 
@@ -39,6 +49,14 @@ if ($format eq "BoM") {
         sprintf( "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct )
   %><%
 
+}elsif ($format eq "PAP"){
+
+  my($origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) =
+    $conf->config("batchconfig-$format");
+  %><%= sprintf( "H%10sD%3s%06u%-15s%09u%-12s%04u%19s\n",$origid,$typecode,$cdate,$shortname,$mybank,$myacct,$pay_batch->batchnum,"")
+
+  %><%
+
 }elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
 #  1;
 }else{
@@ -61,7 +79,12 @@ for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
   if ($format eq "BoM") {
 
     my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
-    %><%= sprintf( "D%010u%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->invnum %><%
+    %><%= sprintf( "D%010.0f%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->paybatchnum) %><%
+
+  } elsif ($format eq "PAP"){
+
+    my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
+    %><%= sprintf( "D%-23s%06u%-19s%09u%-12s%010.0f\n",$cust_pay_batch->payname,$cdate,$cust_pay_batch->paybatchnum,$aba,$account,$cust_pay_batch->amount*100) %><%
 
   } elsif ($format eq "csv-td_canada_trust-merchant_pc_batch") {
 
@@ -75,9 +98,13 @@ for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
 
 if ($format eq "BoM") {
 
-  %><%= sprintf( "YD%08u%014u%56s\n",$batchcount,$batchtotal*100,"" ).
+  %><%= sprintf( "YD%08u%014.0f%56s\n",$batchcount,$batchtotal*100,"" ).
         sprintf( "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","" ) %><%
 
+} elsif ($format eq "PAP"){
+
+  %><%= sprintf( "T%08u%014.0f%57s\n",$batchcount,$batchtotal*100,"" ) %><%
+
 } elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
   #1;
 } else {
-- 
cgit v1.2.1


From cea76425e837641044923ac3622a2d0a35e4cfb2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Aug 2006 07:03:43 +0000
Subject: this is not my beautiful magic template! (water flowing underground)

---
 fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi b/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi
index bf82a87e8..e353b4489 100644
--- a/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi
@@ -4,15 +4,15 @@ use strict;
 use CGI;
 use FS::SelfService qw( invoice_logo );
 
-$cgi = new CGI;
+my $cgi = new CGI;
 
 my($query) = $cgi->keywords;
 $query =~ /^([^\.\/]*)$/ or '' =~ /^()$/;
 my $templatename = $1;
-invoice_logo($templatename);
+my $hashref = invoice_logo($templatename);
 
-print $cgi->header( '-type'    => $content_type,
+print $cgi->header( '-type'    => $hashref->{'content_type'},
                     '-expires' => 'now',
                   ).
-      $logo;
+      $hashref->{'logo'};
 
-- 
cgit v1.2.1


From 95f4195da730f6d40faee94aa7a3108b82823d8d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Aug 2006 07:46:09 +0000
Subject: and the days go by...

---
 fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi b/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi
index e353b4489..cade712d1 100644
--- a/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi
@@ -9,7 +9,7 @@ my $cgi = new CGI;
 my($query) = $cgi->keywords;
 $query =~ /^([^\.\/]*)$/ or '' =~ /^()$/;
 my $templatename = $1;
-my $hashref = invoice_logo($templatename);
+my $hashref = invoice_logo('templatename' => $templatename);
 
 print $cgi->header( '-type'    => $hashref->{'content_type'},
                     '-expires' => 'now',
-- 
cgit v1.2.1


From 97316d268e5751a1d08a0a37e5a0456f2ce4815c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Aug 2006 10:47:18 +0000
Subject: self-service interface: add proper password changer and prevent
 "Setup my services" provisioner from showing broken links for services not
 handled yet

---
 FS/FS/ClientAPI/MyAccount.pm                       | 84 ++++++++++++++++++++++
 FS/FS/svc_acct.pm                                  |  5 ++
 fs_selfservice/FS-SelfService/SelfService.pm       |  5 +-
 .../FS-SelfService/cgi/change_password.html        | 53 ++++++++++++++
 .../FS-SelfService/cgi/myaccount_menu.html         | 10 +--
 .../cgi/process_change_password.html               | 13 ++++
 .../FS-SelfService/cgi/provision_list.html         |  5 +-
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi  | 38 +++++++++-
 8 files changed, 205 insertions(+), 8 deletions(-)
 create mode 100644 fs_selfservice/FS-SelfService/cgi/change_password.html
 create mode 100644 fs_selfservice/FS-SelfService/cgi/process_change_password.html

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 163718e13..54b8a9979 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -526,6 +526,51 @@ sub list_pkgs {
 
 }
 
+sub list_svcs {
+  my $p = shift;
+
+  use Data::Dumper;
+
+  my($context, $session, $custnum) = _custoragent_session_custnum($p);
+  return { 'error' => $session } if $context eq 'error';
+
+  my $search = { 'custnum' => $custnum };
+  $search->{'agentnum'} = $session->{'agentnum'} if $context eq 'agent';
+  my $cust_main = qsearchs('cust_main', $search )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  my @cust_svc = ();
+  #foreach my $cust_pkg ( $cust_main->ncancelled_pkgs ) {
+  foreach my $cust_pkg ( $cust_main->unsuspended_pkgs ) {
+    push @cust_svc, @{[ $cust_pkg->cust_svc ]}; #@{[ ]} to force array context
+  }
+  @cust_svc = grep { $_->part_svc->svcdb eq $p->{'svcdb'} } @cust_svc
+    if $p->{'svcdb'};
+
+  #@svc_x = sort { $a->domain cmp $b->domain || $a->username cmp $b->username }
+  #              @svc_x;
+
+  { 
+    #no#'svcnum'   => $session->{'svcnum'},
+    'custnum'  => $custnum,
+    'svcs'     => [ map { 
+                          my $svc_x = $_->svc_x;
+                          my($label, $value) = $_->label;
+
+                          { 'svcnum'   => $_->svcnum,
+                            'label'    => $label,
+                            'value'    => $value,
+                            'username' => $svc_x->username,
+                            'email'    => $svc_x->email,
+                            # more...
+                          };
+                        }
+                        @cust_svc
+                  ],
+  };
+
+}
+
 sub order_pkg {
   my $p = shift;
 
@@ -799,6 +844,45 @@ sub unprovision_svc {
 
 }
 
+sub myaccount_passwd {
+  my $p = shift;
+  my($context, $session, $custnum) = _custoragent_session_custnum($p);
+  return { 'error' => $session } if $context eq 'error';
+
+  return { 'error' => "New passwords don't match." }
+    if $p->{'new_password'} ne $p->{'new_password2'};
+
+  return { 'error' => 'Enter new password' }
+    unless length($p->{'new_password'});
+
+  #my $search = { 'custnum' => $custnum };
+  #$search->{'agentnum'} = $session->{'agentnum'} if $context eq 'agent';
+  $custnum =~ /^(\d+)$/ or die "illegal custnum";
+  my $search = " AND custnum = $1";
+  $search .= " AND agentnum = ". $session->{'agentnum'} if $context eq 'agent';
+
+  my $svc_acct = qsearchs( {
+    'table'     => 'svc_acct',
+    'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                   'LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                   'LEFT JOIN cust_main USING ( custnum ) ',
+    'hashref'   => { 'svcnum' => $p->{'svcnum'}, },
+    'extra_sql' => $search, #important
+  } )
+    or return { 'error' => "Service not found" };
+
+  $svc_acct->_password($p->{'new_password'});
+  my $error = $svc_acct->replace();
+
+  my($label, $value) = $svc_acct->cust_svc->label;
+
+  return { 'error' => $error,
+           'label' => $label,
+           'value' => $value,
+         };
+
+}
+
 #--
 
 sub _custoragent_session_custnum {
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c50dfd540..b201f2353 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -484,6 +484,11 @@ sub replace {
   my $error;
   warn "$me replacing $old with $new\n" if $DEBUG;
 
+  # We absolutely have to have an old vs. new record to make this work.
+  if (!defined($old)) {
+    $old = qsearchs( 'svc_acct', { 'svcnum' => $new->svcnum } );
+  }
+
   return "can't modify system account" if $old->_check_system;
 
   {
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 16ca48ec8..c3026fa13 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -33,7 +33,8 @@ $socket .= '.'.$tag if defined $tag && length($tag);
   'payment_info'         => 'MyAccount/payment_info',
   'process_payment'      => 'MyAccount/process_payment',
   'process_prepay'       => 'MyAccount/process_prepay',
-  'list_pkgs'            => 'MyAccount/list_pkgs',     #add to ss cgi!
+  'list_pkgs'            => 'MyAccount/list_pkgs',     #add to ss cgi (added?)
+  'list_svcs'            => 'MyAccount/list_svcs',     #add to ss cgi (added?)
   'order_pkg'            => 'MyAccount/order_pkg',     #add to ss cgi!
   'cancel_pkg'           => 'MyAccount/cancel_pkg',    #add to ss cgi!
   'charge'               => 'MyAccount/charge',        #?
@@ -41,6 +42,7 @@ $socket .= '.'.$tag if defined $tag && length($tag);
   'provision_acct'       => 'MyAccount/provision_acct',
   'provision_external'   => 'MyAccount/provision_external',
   'unprovision_svc'      => 'MyAccount/unprovision_svc',
+  'myaccount_passwd'     => 'MyAccount/myaccount_passwd',
   'signup_info'          => 'Signup/signup_info',
   'new_customer'         => 'Signup/new_customer',
   'agent_login'          => 'Agent/agent_login',
@@ -73,6 +75,7 @@ foreach my $autoload ( keys %autoload ) {
                    if ( ref($_[0]) ) {
                      $param = shift;
                    } else {
+                     #warn scalar(@_). ": ". join(" / ", @_);
                      $param = { @_ };
                    }
 
diff --git a/fs_selfservice/FS-SelfService/cgi/change_password.html b/fs_selfservice/FS-SelfService/cgi/change_password.html
new file mode 100644
index 000000000..af7b45313
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/change_password.html
@@ -0,0 +1,53 @@
+<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
+<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<%= include('myaccount_menu') %>
+<TD VALIGN="top">
+
+<FONT SIZE=4>Change password</FONT><BR><BR>
+
+<%= if ( $error ) {
+  $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">$error</FONT><BR><BR>!;
+} ''; %>
+
+<FORM ACTION="<%= $selfurl %>" METHOD="POST">
+<INPUT TYPE="hidden" NAME="session" VALUE="<%= $session_id %>">
+<INPUT TYPE="hidden" NAME="action" VALUE="process_change_password">
+
+<TABLE BGCOLOR="#cccccc">
+
+  <TR>
+    <TH ALIGN="right">Change password for account: </TH>
+    <TD>
+      <SELECT NAME="svcnum">
+        <%= foreach my $svc ( @svcs ) {
+              $OUT .= '<OPTION VALUE="'. $svc->{'svcnum'}. '"'.
+                        ( $svc->{'svcnum'} eq $svcnum ? ' SELECTED' : '' ). '>'.
+                      $svc->{'label'}. ': '. $svc->{'value'}. "\n";
+            }
+        %>
+      </SELECT>
+    </TD>
+  </TR>
+
+  <TR>
+    <TH ALIGN="right">New password: </TH>
+    <TD><INPUT TYPE="password" NAME="new_password" SIZE="18"></TD>
+  </TR>
+
+  <TR>
+    <TH ALIGN="right">Re-enter new password: </TH>
+    <TD><INPUT TYPE="password" NAME="new_password2" SIZE="18"></TD>
+  </TR>
+
+</TABLE>
+<BR>
+
+<INPUT TYPE="submit" VALUE="Change password">
+
+</FORM>
+
+</TD></TR></TABLE>
+<HR>
+<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
+</BODY></HTML>
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
index f2e5e998e..aa22e7c9b 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
@@ -35,9 +35,9 @@ push @menu, (
 { title=>' ' },
 
 { title=>'Change my information', size=>'+1', },
-  { title=>'Change payment information*', url=>'change_bill', indent=>2 },
-  { title=>'Change service address*',     url=>'change_ship', indent=>2 },
-  { title=>'Change password(s)*',         url=>'hmmmFIXME',   indent=>2 },
+  { title=>'Change payment information*', url=>'change_bill',     indent=>2 },
+  { title=>'Change service address*',     url=>'change_ship',     indent=>2 },
+  { title=>'Change password(s)',          url=>'change_password', indent=>2 },
 
 { title=>' ' },
 
@@ -82,8 +82,8 @@ foreach my $item ( @menu ) {
 
 %>
 
+<TR><TD STYLE="border-right: 1px solid black"><BR><BR>*&nbsp;coming&nbsp;soon</TD></TR>
+
 </TABLE>
 
-<A HREF="passwd.html">(tempFIXME) Change&nbsp;password(s)</A><BR><BR>
-*&nbsp;coming&nbsp;soon
 </TD>
diff --git a/fs_selfservice/FS-SelfService/cgi/process_change_password.html b/fs_selfservice/FS-SelfService/cgi/process_change_password.html
new file mode 100644
index 000000000..4fdee79f3
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/process_change_password.html
@@ -0,0 +1,13 @@
+<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
+<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
+<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<%= include('myaccount_menu') %>
+<TD VALIGN="top">
+
+<FONT SIZE=4>Password changed for <%= $value %> <%= $label %>.</FONT>
+
+</TD></TR></TABLE>
+<HR>
+<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
+</BODY></HTML>
+
diff --git a/fs_selfservice/FS-SelfService/cgi/provision_list.html b/fs_selfservice/FS-SelfService/cgi/provision_list.html
index 0f68dfe3c..cd587f072 100644
--- a/fs_selfservice/FS-SelfService/cgi/provision_list.html
+++ b/fs_selfservice/FS-SelfService/cgi/provision_list.html
@@ -75,7 +75,10 @@ function areyousure(href, message) {
     $OUT .= "<TR>$td COLSPAN=3 ALIGN=center>".
             qq!<A HREF="$link">!. 'Setup '. $part_svc->{'svc'}. '</A> '.
             '('. $part_svc->{'num_avail'}. ' available)'.
-            '</TD></TR>';
+            '</TD></TR>'
+      #self-service only supports these services so far
+      if grep { $part_svc->{'svcdb'} eq $_ } qw( svc_acct svc_external );
+
     $col = $col eq $col1 ? $col2 : $col1;
   }
 
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 034a684c6..4ab13090f 100644
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -13,6 +13,7 @@ use FS::SelfService qw( login customer_info invoice
                         list_pkgs
                         part_svc_info provision_acct provision_external
                         unprovision_svc
+                        list_svcs myaccount_passwd
                       );
 
 $template_dir = '.';
@@ -62,7 +63,7 @@ $session_id = $cgi->param('session');
 
 #order|pw_list XXX ???
 $cgi->param('action') =~
-    /^(myaccount|view_invoice|make_payment|payment_results|recharge_prepay|recharge_results|logout|change_bill|change_ship|provision|provision_svc|process_svc_acct|process_svc_external|delete_svc)$/
+    /^(myaccount|view_invoice|make_payment|payment_results|recharge_prepay|recharge_results|logout|change_bill|change_ship|provision|provision_svc|process_svc_acct|process_svc_external|delete_svc|change_password|process_change_password)$/
   or die "unknown action ". $cgi->param('action');
 my $action = $1;
 
@@ -257,6 +258,41 @@ sub delete_svc {
   );
 }
 
+sub change_password {
+  list_svcs(
+    'session_id' => $session_id,
+    'svcdb'      => 'svc_acct',
+  );
+};
+
+sub process_change_password {
+
+  my $result = myaccount_passwd(
+    'session_id'    => $session_id,
+    map { $_ => $cgi->param($_) } qw( svcnum new_password new_password2 )
+  );
+
+  if ( exists $result->{'error'} && $result->{'error'} ) { 
+
+    $action = 'change_password';
+    return {
+      $cgi->Vars,
+      %{ list_svcs( 'session_id' => $session_id,
+                    'svcdb'      => 'svc_acct',
+                  )
+       },
+      #'svcnum' => $cgi->param('svcnum'),
+      'error'  => $result->{'error'}
+    };
+
+ } else {
+
+   return $result;
+
+ }
+
+}
+
 #--
 
 sub do_template {
-- 
cgit v1.2.1


From 9f4696b5f2d5e414580eda21a7d7a5acb4a97160 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Aug 2006 21:46:32 +0000
Subject: take "coming soon" options off the menu, its been Soon for too long -
 they'll get here when they do

---
 fs_selfservice/FS-SelfService/cgi/myaccount_menu.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
index aa22e7c9b..6dacc3ef4 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
@@ -12,7 +12,7 @@ my @menu = (
 { title=>' ' },
 
 { title=>'Purchase', size=>'+1', },
-  { title=>'Purchase additional package*', url=>'order', 'indent'=>2 },
+#  { title=>'Purchase additional package*', url=>'order', 'indent'=>2 },
 );
 
 if ( 1 ) { #XXXFIXME "enable selfservice prepay features" flag or something, eventually per-pkg or something really fancy
@@ -35,8 +35,8 @@ push @menu, (
 { title=>' ' },
 
 { title=>'Change my information', size=>'+1', },
-  { title=>'Change payment information*', url=>'change_bill',     indent=>2 },
-  { title=>'Change service address*',     url=>'change_ship',     indent=>2 },
+#  { title=>'Change payment information*', url=>'change_bill',     indent=>2 },
+#  { title=>'Change service address*',     url=>'change_ship',     indent=>2 },
   { title=>'Change password(s)',          url=>'change_password', indent=>2 },
 
 { title=>' ' },
@@ -82,7 +82,9 @@ foreach my $item ( @menu ) {
 
 %>
 
-<TR><TD STYLE="border-right: 1px solid black"><BR><BR>*&nbsp;coming&nbsp;soon</TD></TR>
+<!-- <TR><TD STYLE="border-right: 1px solid black"><BR><BR>*&nbsp;coming&nbsp;soon</TD></TR> -->
+
+<TR><TD STYLE="border-right: 1px solid black" HEIGHT="100%"><BR><BR><BR><BR></TD></TR>
 
 </TABLE>
 
-- 
cgit v1.2.1


From 64aeaf538530faec44db4818e8ecadfd0d1ee3f1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Aug 2006 02:27:35 +0000
Subject: better debugging for missing recur_fee so its easier to check the db

---
 FS/FS/part_pkg.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index aa39d890b..9de27f813 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -687,7 +687,8 @@ sub option {
   my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
                      split("\n", $self->get('plandata') );
   return $plandata{$opt} if exists $plandata{$opt};
-  cluck "Package definition option $opt not found in options or plandata!\n"
+  cluck "WARNING: (pkgpart ". $self->pkgpart. ") Package def option $opt".
+        "not found in options or plandata!\n"
     unless $ornull;
   '';
 }
-- 
cgit v1.2.1


From 6495ab5fb29dcdb8233f004b5d60d3d97db058b9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Aug 2006 03:10:00 +0000
Subject: don't set the default to NULL the string!  besides, that's already
 the default value of any nullable column, which @date_type is...

---
 FS/FS/Schema.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 5dac26600..e7505465e 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -543,8 +543,8 @@ sub tables_hashref {
       'columns' => [
         'batchnum',   'serial',    '',   '', '', '', 
         'status',     'char', 'NULL',     1, '', '', 
-        'download',   @date_type, 'NULL', '', 
-        'upload',     @date_type, 'NULL', '', 
+        'download',   @date_type, '', '', 
+        'upload',     @date_type, '', '', 
       ],
       'primary_key' => 'batchnum',
       'unique' => [],
-- 
cgit v1.2.1


From 264ad081e68057c7bc30a8b2ad741b783e1342ff Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Aug 2006 11:55:50 +0000
Subject: agent-virtualize advertising sources

---
 FS/FS/AccessRight.pm                       |   5 +-
 FS/FS/Record.pm                            |  31 +++++++
 FS/FS/Schema.pm                            |   7 +-
 FS/FS/access_user.pm                       |  22 +++++
 FS/FS/part_referral.pm                     |  24 ++++--
 httemplate/browse/part_referral.cgi        |  97 ---------------------
 httemplate/browse/part_referral.html       | 132 +++++++++++++++++++++++++++++
 httemplate/edit/part_referral.cgi          |  44 ----------
 httemplate/edit/part_referral.html         |   9 ++
 httemplate/edit/process/part_referral.cgi  |  28 ------
 httemplate/edit/process/part_referral.html |   5 ++
 httemplate/elements/menu.html              |  52 +++++++-----
 12 files changed, 257 insertions(+), 199 deletions(-)
 delete mode 100755 httemplate/browse/part_referral.cgi
 create mode 100755 httemplate/browse/part_referral.html
 delete mode 100755 httemplate/edit/part_referral.cgi
 create mode 100755 httemplate/edit/part_referral.html
 delete mode 100755 httemplate/edit/process/part_referral.cgi
 create mode 100755 httemplate/edit/process/part_referral.html

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 797a12a4d..888a6865b 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -136,8 +136,11 @@ assigned to users and/or groups.
   'Import',    #
   'Export',    #
 
-  'Configuration', #none of the configuraiton is agent-virtualized either
+  'Edit advertising sources',
+  'Edit global advertising sources',
 
+  'Configuration', #most of the rest of the configuraiton is not
+                   # agent-virtualized
 );
 
 sub rights {
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 41e0eba51..a551bb8cc 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -10,6 +10,7 @@ use Locale::Country;
 use DBI qw(:sql_types);
 use DBIx::DBSchema 0.25;
 use FS::UID qw(dbh getotaker datasrc driver_name);
+use FS::CurrentUser;
 use FS::Schema qw(dbdef);
 use FS::SearchCache;
 use FS::Msgcat qw(gettext);
@@ -1620,6 +1621,36 @@ sub ut_foreign_keyn {
     : '';
 }
 
+=item ut_agentnum_acl
+
+Checks this column as an agentnum, taking into account the current users's
+ACLs.
+
+=cut
+
+sub ut_agentnum_acl {
+  my( $self, $field, $null_acl ) = @_;
+
+  my $error = $self->ut_foreign_keyn($field, 'agent', 'agentnum');
+  return "Illegal agentnum: $error" if $error;
+
+  my $curuser = $FS::CurrentUser::CurrentUser;
+
+  if ( $self->$field() ) {
+
+    return "Access deined"
+      unless $curuser->agentnum($self->$field());
+
+  } else {
+
+    return "Access denied"
+      unless $curuser->access_right($null_acl);
+
+  }
+
+  '';
+
+}
 
 =item virtual_fields [ TABLE ]
 
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e7505465e..e23ae737d 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -692,9 +692,10 @@ sub tables_hashref {
 
     'part_referral' => {
       'columns' => [
-        'refnum',   'serial',    '',   '', '', '', 
-        'referral', 'varchar',   '',   $char_d, '', '', 
-        'disabled',     'char', 'NULL', 1, '', '', 
+        'refnum',   'serial',     '',        '', '', '', 
+        'referral', 'varchar',    '',   $char_d, '', '', 
+        'disabled', 'char',   'NULL',         1, '', '', 
+        'agentnum', 'int',    'NULL',        '', '', '', 
       ],
       'primary_key' => 'refnum',
       'unique' => [],
diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index 5d1e183e7..f32fa3a23 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -106,6 +106,10 @@ sub insert {
 
 sub htpasswd_kludge {
   my $self = shift;
+  
+  #awful kludge to skip setting htpasswd for fs_* users
+  return '' if $self->username =~ /^fs_/;
+
   unshift @_, '-c' unless -e $htpasswd_file;
   if ( 
        system('htpasswd', '-b', @_,
@@ -297,6 +301,24 @@ sub agentnums_sql {
   ' )';
 }
 
+=item agentnum
+
+Returns true if the user can view the specified agent.
+
+=cut
+
+sub agentnum {
+  my( $self, $agentnum ) = @_;
+  my $sth = dbh->prepare(
+    "SELECT COUNT(*) FROM access_usergroup
+                     JOIN access_groupagent USING ( groupnum )
+       WHERE usernum = ? AND agentnum = ?"
+  ) or die dbh->errstr;
+  $sth->execute($self->usernum, $agentnum) or die $sth->errstr;
+  $sth->fetchrow_arrayref->[0];
+}
+
+
 =item access_right
 
 Given a right name, returns true if this user has this right (currently via
diff --git a/FS/FS/part_referral.pm b/FS/FS/part_referral.pm
index c0858c0ed..b12cd628e 100644
--- a/FS/FS/part_referral.pm
+++ b/FS/FS/part_referral.pm
@@ -2,7 +2,8 @@ package FS::part_referral;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record;
+use FS::Record qw(qsearchs);
+use FS::agent;
 
 @ISA = qw( FS::Record );
 
@@ -40,6 +41,8 @@ The following fields are currently supported:
 
 =item disabled - Disabled flag, empty or 'Y'
 
+=item agentnum - Optional agentnum (see L<FS::agent>)
+
 =back
 
 =head1 NOTE
@@ -95,17 +98,26 @@ sub check {
 
   my $error = $self->ut_numbern('refnum')
     || $self->ut_text('referral')
+    || $self->ut_enum('disabled', [ '', 'Y' ] )
+    #|| $self->ut_foreign_keyn('agentnum', 'agent', 'agentnum')
+    || $self->ut_agentnum_acl('agentnum', 'Edit global advertising sources')
   ;
   return $error if $error;
 
-  if ( $self->dbdef_table->column('disabled') ) {
-    $error = $self->ut_enum('disabled', [ '', 'Y' ] );
-    return $error if $error;
-  }
-
   $self->SUPER::check;
 }
 
+=item agent 
+
+Returns the associated agent for this referral, if any, as an FS::agent object.
+
+=cut
+
+sub agent {
+  my $self = shift;
+  qsearchs('agent', { 'agentnum' => $self->agentnum } );
+}
+
 =back
 
 =head1 BUGS
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
deleted file mode 100755
index 238ddace7..000000000
--- a/httemplate/browse/part_referral.cgi
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- mason kludge -->
-<%= include("/elements/header.html","Advertising source Listing", menubar(
-  'Main Menu' => $p,
-#  'Add new referral' => "../edit/part_referral.cgi",
-)) %>
-Where a customer heard about your service. Tracked for informational purposes.
-<BR><BR>
-<A HREF="<%= $p %>edit/part_referral.cgi"><I>Add a new advertising source</I></A>
-<BR><BR>
-
-<%
-  my $today = timelocal(0, 0, 0, (localtime(time))[3..5] );
-  my %after;
-  tie %after, 'Tie::IxHash',
-    'Today'         =>        0,
-    'Yesterday'     =>    86400, # 60sec * 60min * 24hrs
-    'Past week'     =>   518400, # 60sec * 60min * 24hrs * 6days
-    'Past 30 days'  =>  2505600, # 60sec * 60min * 24hrs * 29days 
-    'Past 60 days'  =>  5097600, # 60sec * 60min * 24hrs * 59days 
-    'Past 90 days'  =>  7689600, # 60sec * 60min * 24hrs * 89days 
-    'Past 6 months' => 15724800, # 60sec * 60min * 24hrs * 182days 
-    'Past year'     => 31486000, # 60sec * 60min * 24hrs * 364days 
-    'Total'         => $today,
-  ;
-  my %before = (
-    'Today'         =>   86400, # 60sec * 60min * 24hrs
-    'Yesterday'     =>       0,
-    'Past week'     =>   86400, # 60sec * 60min * 24hrs
-    'Past 30 days'  =>   86400, # 60sec * 60min * 24hrs
-    'Past 60 days'  =>   86400, # 60sec * 60min * 24hrs
-    'Past 90 days'  =>   86400, # 60sec * 60min * 24hrs
-    'Past 6 months' =>   86400, # 60sec * 60min * 24hrs
-    'Past year'     =>   86400, # 60sec * 60min * 24hrs
-    'Total'         =>   86400, # 60sec * 60min * 24hrs
-  );
-
-  my $statement = "SELECT COUNT(*) FROM h_cust_main
-                    WHERE history_action = 'insert'
-                      AND refnum = ?
-                      AND history_date >= ?
-		      AND history_date < ?
-		  ";
-  my $sth = dbh->prepare($statement)
-    or die dbh->errstr;
-%>
-
-<%= table() %>
-<TR>
-  <TH COLSPAN=2 ROWSPAN=2>Advertising source</TH>
-  <TH COLSPAN=<%= scalar(keys %after) %>>Customers</TH>
-</TR>
-<% for my $period ( keys %after ) { %>
-  <TH><FONT SIZE=-1><%= $period %></FONT></TH>
-<% } %>
-</TR>
-
-<%
-foreach my $part_referral ( sort { 
-  $a->getfield('refnum') <=> $b->getfield('refnum')
-} qsearch('part_referral',{}) ) {
-%>
-      <TR>
-        <TD><A HREF="<%= $p %>edit/part_referral.cgi?<%= $part_referral->refnum %>">
-          <%= $part_referral->refnum %></A></TD>
-        <TD><A HREF="<%= $p %>edit/part_referral.cgi?<%= $part_referral->refnum %>">
-          <%= $part_referral->referral %></A></TD>
-        <% for my $period ( keys %after ) {
-          $sth->execute( $part_referral->refnum,
-                         $today-$after{$period},
-                         $today+$before{$period},
-          ) or die $sth->errstr;
-          my $number = $sth->fetchrow_arrayref->[0];
-        %>
-          <TD ALIGN="right"><%= $number %></TD>
-        <% } %>
-      </TR>
-<% } %>
-
-<%
-  $statement =~ s/AND refnum = \?//;
-  $sth = dbh->prepare($statement)
-    or die dbh->errstr;
-%>
-      <TR>
-        <TH COLSPAN=2>Total</TH>
-        <% for my $period ( keys %after ) {
-          $sth->execute( $today-$after{$period},
-                         $today+$before{$period},
-          ) or die $sth->errstr;
-          my $number = $sth->fetchrow_arrayref->[0];
-        %>
-          <TD ALIGN="right"><%= $number %></TD>
-        <% } %>
-      </TR>
-    </TABLE>
-  </BODY>
-</HTML>
diff --git a/httemplate/browse/part_referral.html b/httemplate/browse/part_referral.html
new file mode 100755
index 000000000..fff433ae0
--- /dev/null
+++ b/httemplate/browse/part_referral.html
@@ -0,0 +1,132 @@
+<%= include("/elements/header.html","Advertising source Listing" ) %>
+
+Where a customer heard about your service. Tracked for informational purposes.
+<BR><BR>
+
+<A HREF="<%= $p %>edit/part_referral.html"><I>Add a new advertising source</I></A>
+<BR><BR>
+
+<%
+  my $today = timelocal(0, 0, 0, (localtime(time))[3..5] );
+  my %after;
+  tie %after, 'Tie::IxHash',
+    'Today'         =>        0,
+    'Yesterday'     =>    86400, # 60sec * 60min * 24hrs
+    'Past week'     =>   518400, # 60sec * 60min * 24hrs * 6days
+    'Past 30 days'  =>  2505600, # 60sec * 60min * 24hrs * 29days 
+    'Past 60 days'  =>  5097600, # 60sec * 60min * 24hrs * 59days 
+    'Past 90 days'  =>  7689600, # 60sec * 60min * 24hrs * 89days 
+    'Past 6 months' => 15724800, # 60sec * 60min * 24hrs * 182days 
+    'Past year'     => 31486000, # 60sec * 60min * 24hrs * 364days 
+    'Total'         => $today,
+  ;
+  my %before = (
+    'Today'         =>   86400, # 60sec * 60min * 24hrs
+    'Yesterday'     =>       0,
+    'Past week'     =>   86400, # 60sec * 60min * 24hrs
+    'Past 30 days'  =>   86400, # 60sec * 60min * 24hrs
+    'Past 60 days'  =>   86400, # 60sec * 60min * 24hrs
+    'Past 90 days'  =>   86400, # 60sec * 60min * 24hrs
+    'Past 6 months' =>   86400, # 60sec * 60min * 24hrs
+    'Past year'     =>   86400, # 60sec * 60min * 24hrs
+    'Total'         =>   86400, # 60sec * 60min * 24hrs
+  );
+
+  my $curuser = $FS::CurrentUser::CurrentUser;
+  my $extra_sql = $curuser->agentnums_sql;
+  $extra_sql .= ' OR agentnum IS NULL '
+    if $curuser->access_right('Edit global advertising sources');
+
+  $extra_sql = " WHERE $extra_sql";
+
+  my $statement = "SELECT COUNT(*) FROM h_cust_main
+                    WHERE history_action = 'insert'
+                      AND refnum = ?
+                      AND history_date >= ?
+		      AND history_date < ?
+		      AND ". $curuser->agentnums_sql;
+  my $sth = dbh->prepare($statement)
+    or die dbh->errstr;
+
+  my $show_agentnums = scalar($curuser->agentnums);
+
+%>
+
+<%= include('/elements/table-grid.html') %>
+
+<% my $bgcolor1 = '#eeeeee';
+   my $bgcolor2 = '#ffffff';
+   my $bgcolor = '';
+%>
+
+<TR>
+  <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=2 ROWSPAN=2>Advertising source</TH>
+  <% if ( $show_agentnums ) { %>
+    <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Agent</TH>
+  <% } %>
+  <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=<%= scalar(keys %after) %>>Customers</TH>
+</TR>
+<% for my $period ( keys %after ) { %>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><%= $period %></FONT></TH>
+<% } %>
+</TR>
+
+<%
+foreach my $part_referral (
+
+  qsearch({
+    'table'     => 'part_referral',
+    'extra_sql' => "$extra_sql ORDER BY refnum",
+  })
+
+) {
+
+  if ( $bgcolor eq $bgcolor1 ) {
+    $bgcolor = $bgcolor2;
+  } else {
+    $bgcolor = $bgcolor1;
+  }
+
+%>
+      <TR>
+
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF="<%= $p %>edit/part_referral.html?<%= $part_referral->refnum %>">
+          <%= $part_referral->refnum %></A></TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF="<%= $p %>edit/part_referral.html?<%= $part_referral->refnum %>">
+          <%= $part_referral->referral %></A></TD>
+
+        <% if ( $show_agentnums ) { %>
+          <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $part_referral->agentnum ? $part_referral->agent->agent : '(global)' %></TD>
+        <% } %>
+
+        <% for my $period ( keys %after ) {
+          $sth->execute( $part_referral->refnum,
+                         $today-$after{$period},
+                         $today+$before{$period},
+          ) or die $sth->errstr;
+          my $number = $sth->fetchrow_arrayref->[0];
+        %>
+          <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right"><%= $number %></TD>
+        <% } %>
+      </TR>
+<% } %>
+
+<%
+  $statement =~ s/AND refnum = \?//;
+  $sth = dbh->prepare($statement)
+    or die dbh->errstr;
+%>
+      <TR>
+        <TD BGCOLOR="#dddddd" COLSPAN=3><B>Total</B></TD>
+        <% for my $period ( keys %after ) {
+          $sth->execute( $today-$after{$period},
+                         $today+$before{$period},
+          ) or die $sth->errstr;
+          my $number = $sth->fetchrow_arrayref->[0];
+        %>
+          <TD BGCOLOR="#dddddd" ALIGN="right"><%= $number %></TD>
+        <% } %>
+      </TR>
+    </TABLE>
+  </BODY>
+</HTML>
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
deleted file mode 100755
index dce1e6394..000000000
--- a/httemplate/edit/part_referral.cgi
+++ /dev/null
@@ -1,44 +0,0 @@
-<%
-
-my $part_referral;
-if ( $cgi->param('error') ) {
-  $part_referral = new FS::part_referral ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_referral')
-  } );
-} elsif ( $cgi->keywords ) {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $part_referral = qsearchs( 'part_referral', { 'refnum' => $1 } );
-} else { #adding
-  $part_referral = new FS::part_referral {};
-}
-my $action = $part_referral->refnum ? 'Edit' : 'Add';
-my $hashref = $part_referral->hashref;
-
-my $p1 = popurl(1);
-
-%><%= include('/elements/header.html', "$action Advertising source", menubar(
-  'Main Menu' => popurl(2),
-  'View all advertising sources' => popurl(2). "browse/part_referral.cgi",
-)) %>
-
-<% if ( $cgi->param('error') ) { %>
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
-<% } %>
-
-<FORM ACTION="<%= $p1 %>process/part_referral.cgi" METHOD=POST>
-
-<INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $hashref->{refnum} %>">
-
-<%
-#print "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
-%>
-
-Advertising source <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="<%= $hashref->{referral} %>">
-
-<BR>
-<INPUT TYPE="submit" VALUE="<%= $hashref->{refnum} ? "Apply changes" : "Add advertising source" %>">
-
-</FORM>
-
-<%= include('/elements/footer.html') %>
diff --git a/httemplate/edit/part_referral.html b/httemplate/edit/part_referral.html
new file mode 100755
index 000000000..ec0f32f58
--- /dev/null
+++ b/httemplate/edit/part_referral.html
@@ -0,0 +1,9 @@
+<%= include( 'elements/edit.html',
+                'name'        => 'Advertising source',
+                'table'       => 'part_referral',
+                'fields'      => [ 'referral' ],
+                'labels'      => { 'referral' => 'Advertising source' },
+                'viewall_dir' => 'browse',
+                'html_table_bottom' => include('/elements/tr-select-agent.html'),
+           )
+%>
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
deleted file mode 100755
index fd2c01506..000000000
--- a/httemplate/edit/process/part_referral.cgi
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-
-my $refnum = $cgi->param('refnum');
-
-my $new = new FS::part_referral ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('part_referral')
-} );
-
-my $error;
-if ( $refnum ) {
-  my $old = qsearchs( 'part_referral', { 'refnum' =>$ refnum } );
-  die "(Old) Record not found!" unless $old;
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-}
-$refnum=$new->refnum;
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "part_referral.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/part_referral.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/part_referral.html b/httemplate/edit/process/part_referral.html
new file mode 100755
index 000000000..0b5d959a0
--- /dev/null
+++ b/httemplate/edit/process/part_referral.html
@@ -0,0 +1,5 @@
+<%= include( 'elements/process.html',
+                 'table'       => 'part_referral',
+                 'viewall_dir' => 'browse',
+           )
+%>
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 8c62d9778..a5b41aefd 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -189,26 +189,36 @@
     'View/Edit address blocks' => [ $fsurl.'browse/addr_block.cgi', 'Manage address blocks and block assignments to broadband routers' ],
   ;
 
-  tie my %config_misc, 'Tie::IxHash',
-    'View/Edit advertising sources' => [ $fsurl.'browse/part_referral.cgi', 'Where a customer heard about your service.  Tracked for informational purposes' ],
-    'View/Edit virtual fields' => [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ],
-    'View/Edit message catalog' => [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ],
-    'View/Edit inventory classes and inventory' => [ $fsurl.'browse/inventory_class.html', 'Setup inventory classes and stock inventory' ],
-  ;
+  tie my %config_misc, 'Tie::IxHash';
+  $config_misc{'View/Edit advertising sources'} = [ $fsurl.'browse/part_referral.html', 'Where a customer heard about your service.  Tracked for informational purposes' ]
+    if $curuser->access_right('Configuration')
+    || $curuser->access_right('Edit advertising sources')
+    || $curuser->access_right('Edit global advertising sources');
+  if ( $curuser->access_right('Configuration') ) {
+    $config_misc{'View/Edit virtual fields'} = [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ];
+    $config_misc{'View/Edit message catalog'} = [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ];
+    $config_misc{'View/Edit inventory classes and inventory'} = [ $fsurl.'browse/inventory_class.html', 'Setup inventory classes and stock inventory' ];
+  }
 
-  tie my %config_menu, 'Tie::IxHash',
-    'Settings'      => [ $fsurl.'config/config-view.cgi', '' ],
-    'separator'     => '', #its a separator!
-    'Employees'     => [ \%config_employees, '' ],
-    'Provisioning, services and packages'
-                    => [ \%config_export_svc_pkg, ''    ],
-    'Resellers'     => [ \%config_agent, ''    ],
-    'Billing'       => [ \%config_billing, ''    ],
-    'Dialup'        => [ \%config_dialup, ''    ],
-    'Fixed (username-less) broadband'
-                    => [ \%config_broadband, ''    ],
-    'Miscellaneous' => [ \%config_misc, ''    ],
-  ;
+  tie my %config_menu, 'Tie::IxHash';
+  if ( $curuser->access_right('Configuration' ) ) {
+    %config_menu = (
+      'Settings'      => [ $fsurl.'config/config-view.cgi', '' ],
+      'separator'     => '', #its a separator!
+      'Employees'     => [ \%config_employees, '' ],
+      'Provisioning, services and packages'
+                      => [ \%config_export_svc_pkg, ''    ],
+      'Resellers'     => [ \%config_agent, ''    ],
+      'Billing'       => [ \%config_billing, ''    ],
+      'Dialup'        => [ \%config_dialup, ''    ],
+      'Fixed (username-less) broadband'
+                      => [ \%config_broadband, ''    ],
+    );
+  }
+  $config_menu{'Miscellaneous'} = [ \%config_misc, ''    ]
+    if $curuser->access_right('Configuration')
+    || $curuser->access_right('Edit advertising sources')
+    || $curuser->access_right('Edit global advertising sources');
 
   tie my %menu, 'Tie::IxHash',
     'Billing Main'   => [ $fsurl, 'Billing start page', ],
@@ -225,7 +235,9 @@
   $menu{'Tools'} = [ \%tools_menu, 'Tools' ]
     if keys %tools_menu;
   $menu{'Configuration'} = [ \%config_menu, 'Configuraiton and setup' ]
-    if $curuser->access_right('Configuration');
+    if $curuser->access_right('Configuration')
+    || $curuser->access_right('Edit advertising sources')
+    || $curuser->access_right('Edit global advertising sources');
 
   use vars qw($gmenunum);
   $gmenunum = 0;
-- 
cgit v1.2.1


From 9b38584b79d03f6baa9a55bc623760261305e96c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Aug 2006 12:01:07 +0000
Subject: bold the total footer

---
 httemplate/browse/part_referral.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/browse/part_referral.html b/httemplate/browse/part_referral.html
index fff433ae0..6a9f7003b 100755
--- a/httemplate/browse/part_referral.html
+++ b/httemplate/browse/part_referral.html
@@ -117,14 +117,14 @@ foreach my $part_referral (
     or die dbh->errstr;
 %>
       <TR>
-        <TD BGCOLOR="#dddddd" COLSPAN=3><B>Total</B></TD>
+        <TD BGCOLOR="#dddddd" ALIGN="center" COLSPAN=3><B>Total</B></TD>
         <% for my $period ( keys %after ) {
           $sth->execute( $today-$after{$period},
                          $today+$before{$period},
           ) or die $sth->errstr;
           my $number = $sth->fetchrow_arrayref->[0];
         %>
-          <TD BGCOLOR="#dddddd" ALIGN="right"><%= $number %></TD>
+          <TD BGCOLOR="#dddddd" ALIGN="right"><B><%= $number %><B></TD>
         <% } %>
       </TR>
     </TABLE>
-- 
cgit v1.2.1


From 0a7d9371d3514312edd8661c621876cece4d5221 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Aug 2006 13:50:45 +0000
Subject: add cust_main.agent_custid (at least to schema and customer view, no
 manual editing yet)

---
 FS/FS/Schema.pm                      |  3 +-
 FS/FS/cust_main.pm                   |  1 +
 FS/FS/part_referral.pm               | 61 +++++++++++++++++++++++++++++++++++-
 README.1.7.0                         |  3 ++
 httemplate/browse/part_referral.html |  7 +----
 httemplate/view/cust_main/misc.html  | 15 +++++++--
 6 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e23ae737d..ce2d79067 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -394,6 +394,7 @@ sub tables_hashref {
       'columns' => [
         'custnum',  'serial',  '',     '', '', '', 
         'agentnum', 'int',  '',     '', '', '', 
+        'agent_custid', 'varchar', 'NULL', $char_d, '', '',
 #        'titlenum', 'int',  'NULL',   '', '', '', 
         'last',     'varchar', '',     $char_d, '', '', 
 #        'middle',   'varchar', 'NULL', $char_d, '', '', 
@@ -443,7 +444,7 @@ sub tables_hashref {
         'spool_cdr','char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'custnum',
-      'unique' => [],
+      'unique' => [ [ 'agentnum', 'agent_custid' ] ],
       #'index' => [ ['last'], ['company'] ],
       'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ],
                    [ 'daytime' ], [ 'night' ], [ 'fax' ], [ 'refnum' ],
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index f1d969cd1..3f67c62f0 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1060,6 +1060,7 @@ sub check {
   my $error =
     $self->ut_numbern('custnum')
     || $self->ut_number('agentnum')
+    || $self->ut_textn('agent_custid')
     || $self->ut_number('refnum')
     || $self->ut_name('last')
     || $self->ut_name('first')
diff --git a/FS/FS/part_referral.pm b/FS/FS/part_referral.pm
index b12cd628e..e1688650d 100644
--- a/FS/FS/part_referral.pm
+++ b/FS/FS/part_referral.pm
@@ -2,7 +2,7 @@ package FS::part_referral;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw(qsearchs);
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::agent;
 
 @ISA = qw( FS::Record );
@@ -120,6 +120,65 @@ sub agent {
 
 =back
 
+=head1 CLASS METHODS
+
+=over 4
+
+=item acl_agentnum_sql
+
+Returns an SQL fragment for searching for part_referral records allowed by the
+current users's agent ACLs (and "Edit global advertising sources" right).
+
+=cut
+
+sub acl_agentnum_sql {
+  #my $class = shift;
+
+  my $curuser = $FS::CurrentUser::CurrentUser;
+  my $sql = $curuser->agentnums_sql;
+  $sql = " ( $sql OR agentnum IS NULL ) "
+    if $curuser->access_right('Edit global advertising sources');
+
+  $sql;
+
+}
+
+=item all_part_referral
+
+Returns all part_referral records allowed by the current users's agent ACLs
+(and "Edit global advertising sources" right).
+
+=cut
+
+sub all_part_referral {
+  my $self = shift;
+
+  qsearch({
+    'table'     => 'part_referral',
+    'extra_sql' => ' WHERE '. $self->acl_agentnum_sql. ' ORDER BY refnum ',
+  });
+
+}
+
+=item num_part_referral
+
+Returns the number of part_referral records allowed by the current users's
+agent ACLs (and "Edit global advertising sources" right).
+
+=cut
+
+sub num_part_referral {
+  my $self = shift;
+
+  my $sth = dbh->prepare(
+    'SELECT COUNT(*) FROM part_referral WHERE '. $self->acl_agentnum_sql
+  ) or die dbh->errstr;
+  $sth->execute() or die $sth->errstr;
+  $sth->fetchrow_arrayref->[0];
+}
+
+=back
+
 =head1 BUGS
 
 The delete method is unimplemented.
diff --git a/README.1.7.0 b/README.1.7.0
index c82c8ada9..24b89c90d 100644
--- a/README.1.7.0
+++ b/README.1.7.0
@@ -34,6 +34,9 @@ Optional for better zip code report performance:
 CREATE INDEX cust_main16 on cust_main ( zip );
 CREATE INDEX cust_main17 on cust_main ( ship_zip );
 
+Optional if you're using the new agent cust ref#s:
+CREATE UNIQUE INDEX cust_main18 ON cust_main ( agentnum, agent_custid );
+
 Optional to eliminate harmless but noisy warnings:
 UPDATE cust_main_county SET exempt_amount = 0 WHERE exempt_amount IS NULL;
 
diff --git a/httemplate/browse/part_referral.html b/httemplate/browse/part_referral.html
index 6a9f7003b..468593160 100755
--- a/httemplate/browse/part_referral.html
+++ b/httemplate/browse/part_referral.html
@@ -32,12 +32,7 @@ Where a customer heard about your service. Tracked for informational purposes.
     'Total'         =>   86400, # 60sec * 60min * 24hrs
   );
 
-  my $curuser = $FS::CurrentUser::CurrentUser;
-  my $extra_sql = $curuser->agentnums_sql;
-  $extra_sql .= ' OR agentnum IS NULL '
-    if $curuser->access_right('Edit global advertising sources');
-
-  $extra_sql = " WHERE $extra_sql";
+  $extra_sql = " WHERE ". FS::part_referral->acl_agentnum_sql;
 
   my $statement = "SELECT COUNT(*) FROM h_cust_main
                     WHERE history_action = 'insert'
diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index 69e120573..742b35958 100644
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -1,5 +1,6 @@
 <%
   my( $cust_main ) = @_;
+  my $conf = new FS::Conf;
 %>
 
 <%= ntable("#cccccc") %><TR><TD><%= &ntable("#cccccc",2) %>
@@ -25,8 +26,18 @@
     $agent = $agents[0];
   }
 
-  my @referrals = qsearch( 'part_referral', {} );
-  unless ( scalar(@referrals) == 1 ) {
+  if ( $cust_main->agent_custid ) {
+%>
+
+<TR>
+  <TD ALIGN="right">Agent customer ref#</TD>
+  <TD BGCOLOR="#ffffff"><%= $cust_main->agent_custid %></TD>
+</TR>
+
+<%
+  }
+
+  unless ( FS::part_referral->num_part_referral == 1 ) {
     my $referral = qsearchs('part_referral', {
       'refnum' => $cust_main->refnum
     } );
-- 
cgit v1.2.1


From dbc120189697e8306f62349c310f5410f8382491 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Aug 2006 22:18:45 +0000
Subject: bugfix for selects that don't have select_enum

---
 httemplate/config/config.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 6008c0e42..cf228dba5 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -102,7 +102,7 @@ function SafeOnsubmit() {
 
               <% my $curvalue = $conf->config($i->key);
                  if ( $conf->exists($i->key) && $curvalue
-                      && ! grep { $curvalue eq $_ } @{$i->select_enum}
+                      && ! $hash{$curvalue}
                     ) {
               %>
               
-- 
cgit v1.2.1


From e47e9758f480c664bfc3917d798cd69c7d354999 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Aug 2006 08:02:26 +0000
Subject: virtualize referrals on customer addition

---
 FS/FS/access_user.pm                             | 16 +++++
 FS/FS/part_referral.pm                           | 21 ++++---
 httemplate/browse/part_referral.html             | 29 +++++----
 httemplate/edit/cust_main.cgi                    | 80 +++++++++---------------
 httemplate/elements/select-agent.html            |  8 +--
 httemplate/elements/select-part_referral.html    | 17 +++++
 httemplate/elements/tr-select-agent.html         | 10 ++-
 httemplate/elements/tr-select-part_referral.html | 30 +++++++++
 8 files changed, 132 insertions(+), 79 deletions(-)
 create mode 100644 httemplate/elements/select-part_referral.html
 create mode 100644 httemplate/elements/tr-select-part_referral.html

diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index f32fa3a23..830d7f826 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA $htpasswd_file );
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::m2m_Common;
 use FS::access_usergroup;
+use FS::agent;
 
 @ISA = qw( FS::m2m_Common FS::Record );
 
@@ -318,6 +319,21 @@ sub agentnum {
   $sth->fetchrow_arrayref->[0];
 }
 
+=item agents
+
+Returns the list of agents this user can view (via group membership), as
+FS::agent objects.
+
+=cut
+
+sub agents {
+  my $self = shift;
+  qsearch({
+    'table'     => 'agent',
+    'hashref'   => { disabled=>'' },
+    'extra_sql' => ' AND '. $self->agentnums_sql,
+  });
+}
 
 =item access_right
 
diff --git a/FS/FS/part_referral.pm b/FS/FS/part_referral.pm
index e1688650d..87bc87cba 100644
--- a/FS/FS/part_referral.pm
+++ b/FS/FS/part_referral.pm
@@ -124,30 +124,37 @@ sub agent {
 
 =over 4
 
-=item acl_agentnum_sql
+=item acl_agentnum_sql [ INCLUDE_GLOBAL_BOOL ]
 
 Returns an SQL fragment for searching for part_referral records allowed by the
 current users's agent ACLs (and "Edit global advertising sources" right).
 
+Pass a true value to include global advertising sources (for example, when
+simply using rather than editing advertising sources).
+
 =cut
 
 sub acl_agentnum_sql {
-  #my $class = shift;
+  my $self = shift;
 
   my $curuser = $FS::CurrentUser::CurrentUser;
   my $sql = $curuser->agentnums_sql;
   $sql = " ( $sql OR agentnum IS NULL ) "
-    if $curuser->access_right('Edit global advertising sources');
+    if $curuser->access_right('Edit global advertising sources')
+    or defined($_[0]) && $_[0];
 
   $sql;
 
 }
 
-=item all_part_referral
+=item all_part_referral [ INCLUDE_GLOBAL_BOOL ]
 
 Returns all part_referral records allowed by the current users's agent ACLs
 (and "Edit global advertising sources" right).
 
+Pass a true value to include global advertising sources (for example, when
+simply using rather than editing advertising sources).
+
 =cut
 
 sub all_part_referral {
@@ -155,12 +162,12 @@ sub all_part_referral {
 
   qsearch({
     'table'     => 'part_referral',
-    'extra_sql' => ' WHERE '. $self->acl_agentnum_sql. ' ORDER BY refnum ',
+    'extra_sql' => ' WHERE '. $self->acl_agentnum_sql(@_). ' ORDER BY refnum ',
   });
 
 }
 
-=item num_part_referral
+=item num_part_referral [ INCLUDE_GLOBAL_BOOL ]
 
 Returns the number of part_referral records allowed by the current users's
 agent ACLs (and "Edit global advertising sources" right).
@@ -171,7 +178,7 @@ sub num_part_referral {
   my $self = shift;
 
   my $sth = dbh->prepare(
-    'SELECT COUNT(*) FROM part_referral WHERE '. $self->acl_agentnum_sql
+    'SELECT COUNT(*) FROM part_referral WHERE '. $self->acl_agentnum_sql(@_)
   ) or die dbh->errstr;
   $sth->execute() or die $sth->errstr;
   $sth->fetchrow_arrayref->[0];
diff --git a/httemplate/browse/part_referral.html b/httemplate/browse/part_referral.html
index 468593160..c50a406ed 100755
--- a/httemplate/browse/part_referral.html
+++ b/httemplate/browse/part_referral.html
@@ -32,7 +32,7 @@ Where a customer heard about your service. Tracked for informational purposes.
     'Total'         =>   86400, # 60sec * 60min * 24hrs
   );
 
-  $extra_sql = " WHERE ". FS::part_referral->acl_agentnum_sql;
+  my $curuser = $FS::CurrentUser::CurrentUser;
 
   my $statement = "SELECT COUNT(*) FROM h_cust_main
                     WHERE history_action = 'insert'
@@ -67,14 +67,7 @@ Where a customer heard about your service. Tracked for informational purposes.
 </TR>
 
 <%
-foreach my $part_referral (
-
-  qsearch({
-    'table'     => 'part_referral',
-    'extra_sql' => "$extra_sql ORDER BY refnum",
-  })
-
-) {
+foreach my $part_referral ( FS::part_referral->all_part_referral(1) ) {
 
   if ( $bgcolor eq $bgcolor1 ) {
     $bgcolor = $bgcolor2;
@@ -82,13 +75,23 @@ foreach my $part_referral (
     $bgcolor = $bgcolor1;
   }
 
+  $a = 0;
+
 %>
       <TR>
 
-        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF="<%= $p %>edit/part_referral.html?<%= $part_referral->refnum %>">
-          <%= $part_referral->refnum %></A></TD>
-        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF="<%= $p %>edit/part_referral.html?<%= $part_referral->refnum %>">
-          <%= $part_referral->referral %></A></TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+          <% if ( $part_referral->agentnum || $curuser->access_right('Edit global advertising sources') ) { 
+            $a++;
+          %>
+            <A HREF="<%= $p %>edit/part_referral.html?<%= $part_referral->refnum %>">
+          <% } %>
+          <%= $part_referral->refnum %><%= $a ? '</A>' : '' %></TD>
+        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+          <% if ( $a ) { %>
+            <A HREF="<%= $p %>edit/part_referral.html?<%= $part_referral->refnum %>">
+          <% } %>
+          <%= $part_referral->referral %><%= $a ? '</A>' : '' %></TD>
 
         <% if ( $show_agentnums ) { %>
           <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $part_referral->agentnum ? $part_referral->agent->agent : '(global)' %></TD>
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index bb2a8618e..45cb69fc2 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -66,6 +66,8 @@ if ( $cgi->param('error') ) {
 $cgi->delete_all();
 my $action = $custnum ? 'Edit' : 'Add';
 
+my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
+
 %>
 
 <!-- top -->
@@ -77,38 +79,29 @@ my $action = $custnum ? 'Edit' : 'Add';
 ) %>
 
 <% if ( $error ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT><BR><BR>
 <% } %>
 
 <FORM NAME="topform" STYLE="margin-bottom: 0">
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
-Customer # <%= $custnum ? "<B>$custnum</B>" : " (NEW)" %>
-
-<!-- agent -->
-
-<%
+<% if ( $custnum ) { %>
+  Customer #<B><%= $custnum %></B> - 
+  <B><FONT COLOR="<%= $cust_main->statuscolor %>">
+    <%= ucfirst($cust_main->status) %>
+  </FONT></B>
+  <BR><BR>
+<% } %>
 
-my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
+<%= &ntable("#cccccc") %>
 
-my %agent_search = dbdef->table('agent')->column('disabled')
-                     ? ( 'disabled' => '' ) : ();
-my @agents = qsearch( 'agent', \%agent_search );
-#die "No agents created!" unless @agents;
-eidiot "You have not created any agents (or all agents are disabled).  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
-my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
+<!-- agent -->
 
+<%= include('/elements/tr-select-agent.html', $cust_main->agentnum,
+              'label'       => "<B>${r}Agent</B>",
+              'empty_label' => 'Select agent',
+           )
 %>
 
-<% if ( scalar(@agents) == 1 ) { %>
-  <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agentnum %>">
-<% } else { %>
-  <BR><BR><%=$r%>Agent <SELECT NAME="agentnum" SIZE="1">
-  <% foreach my $agent (sort { $a->agent cmp $b->agent; } @agents) { %>
-    <OPTION VALUE="<%= $agent->agentnum %>"<%= " SELECTED"x($agent->agentnum==$agentnum) %>><%= $agent->agent %>
-  <% } %>
-  </SELECT>
-<% } %>
-
 <!-- referral (advertising source) -->
 
 <%
@@ -118,28 +111,9 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
 
   <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $refnum %>">
 
-<%
- } else {
-
-   my(@referrals) = qsearch('part_referral',{});
-   if ( scalar(@referrals) == 0 ) {
-     eidiot "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
-   } elsif ( scalar(@referrals) == 1 ) {
-     $refnum ||= $referrals[0]->refnum;
-%>
-
-     <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $refnum %>">
-
 <% } else { %>
 
-     <BR><BR><%=$r%>Advertising source 
-     <SELECT NAME="refnum" SIZE="1">
-       <%= $refnum ? '' : '<OPTION VALUE="">' %>
-       <% foreach my $referral (sort { $a->refnum <=> $b->refnum } @referrals) { %>
-         <OPTION VALUE="<%= $referral->refnum %>" <%= $referral->refnum == $refnum ? 'SELECTED' : '' %>><%= $referral->refnum %>: <%= $referral->referral %>
-       <% } %>
-     </SELECT>
-<% } %>
+   <%= include('/elements/tr-select-part_referral.html') %>
 
 <% } %>
 
@@ -153,14 +127,20 @@ if ( $cust_main->referral_custnum
 ) {
 %>
 
-  <BR><BR>Referring Customer: 
-  <A HREF="<%= popurl(1) %>/cust_main.cgi?<%= $cust_main->referral_custnum %>"><%= $cust_main->referral_custnum %>: <%= $referring_cust_main->name %></A>
+  <TR>
+    <TD ALIGN="right">Referring customer</TD>
+    <TD>
+      <A HREF="<%= popurl(1) %>/cust_main.cgi?<%= $cust_main->referral_custnum %>"><%= $cust_main->referral_custnum %>: <%= $referring_cust_main->name %></A>
+    </TD>
+  </TR>
   <INPUT TYPE="hidden" NAME="referral_custnum" VALUE="<%= $cust_main->referral_custnum %>">
 
 <% } elsif ( ! $conf->exists('disable_customer_referrals') ) { %>
 
-  <BR><BR>Referring customer number: 
-  <INPUT TYPE="text" NAME="referral_custnum" VALUE="">
+  <TR>
+    <TD ALIGN="right">Referring customer</TD>
+    <TD><INPUT TYPE="text" NAME="referral_custnum" VALUE=""></TD>
+  </TR>
 
 <% } else { %>
 
@@ -168,6 +148,8 @@ if ( $cust_main->referral_custnum
 
 <% } %>
 
+</TABLE>
+
 <!-- contact info -->
 
 <BR><BR>
@@ -377,10 +359,10 @@ unless ( $custnum ) {
 
   #false laziness, copied from FS::cust_pkg::order
   my $pkgpart;
+  my @agents = $FS::CurrentUser::CurrentUser->agents;
   if ( scalar(@agents) == 1 ) {
     # $pkgpart->{PKGPART} is true iff $custnum may purchase PKGPART
-    my($agent)=qsearchs('agent',{'agentnum'=> $agentnum });
-    $pkgpart = $agent->pkgpart_hashref;
+    $pkgpart = $agents[0]->pkgpart_hashref;
   } else {
     #can't know (agent not chosen), so, allow all
     my %typenum;
diff --git a/httemplate/elements/select-agent.html b/httemplate/elements/select-agent.html
index 78ec25f82..009cc6e06 100644
--- a/httemplate/elements/select-agent.html
+++ b/httemplate/elements/select-agent.html
@@ -1,8 +1,7 @@
 <%
   my( $agentnum, %opt ) = @_;
 
-  my %select_opt = ();
-  $select_opt{'records'} = $opt{'agents'}
+  $opt{'records'} = delete $opt{'agents'}
     if $opt{'agents'};
 
 %><%= include( '/elements/select-table.html',
@@ -12,7 +11,8 @@
                  'empty_label' => 'all',
                  'hashref'     => { 'disabled' => '' },
                  'extra_sql'   => ' AND '.
-                                  $FS::CurrentUser::CurrentUser->agentnums_sql,
-                 %select_opt,
+                                  $FS::CurrentUser::CurrentUser->agentnums_sql.
+                                  ' ORDER BY agent',
+                 %opt,
              )
 %>
diff --git a/httemplate/elements/select-part_referral.html b/httemplate/elements/select-part_referral.html
new file mode 100644
index 000000000..deb87bd3b
--- /dev/null
+++ b/httemplate/elements/select-part_referral.html
@@ -0,0 +1,17 @@
+<%
+  my( $refnum, %opt ) = @_;
+
+  $opt{'records'} = delete $opt{'part_referrals'}
+    if $opt{'part_referrals'};
+
+%><%= include( '/elements/select-table.html',
+                 'table'       => 'part_referral',
+                 'name_col'    => 'referral',
+                 'value'       => $refnum,
+                 'empty_label' => 'Select advertising source',
+                 'hashref'     => { 'disabled' => '' },
+                 'extra_sql'   => ' AND '.
+                                  FS::part_referral->all_part_referral(1),
+                 %opt,
+             )
+%>
diff --git a/httemplate/elements/tr-select-agent.html b/httemplate/elements/tr-select-agent.html
index 83c8d1758..6158f6f47 100644
--- a/httemplate/elements/tr-select-agent.html
+++ b/httemplate/elements/tr-select-agent.html
@@ -7,12 +7,9 @@
     #here is the agent virtualization
     my $agentnums_href = $FS::CurrentUser::CurrentUser->agentnums_href;
     @agents = grep $agentnums_href->{$_->agentnum}, @{ $opt{'agents'} };
+    delete $opt{'agents'};
   } else {
-    @agents = qsearch( {
-      'table'     => 'agent',
-      'hashref'   => { disabled=>'' },
-      'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
-    });
+    @agents = $FS::CurrentUser::CurrentUser->agents;
   }
 
 %>
@@ -24,10 +21,11 @@
 <% } else { %>
 
   <TR>
-    <TD ALIGN="right"><%= $opt{'label'} || 'Agent: ' %></TD>
+    <TD ALIGN="right"><%= $opt{'label'} || 'Agent' %></TD>
     <TD>
       <%= include( '/elements/select-agent.html', $agentnum,
                      'agents' => \@agents,
+                     %opt,
                  )
       %>
     </TD>
diff --git a/httemplate/elements/tr-select-part_referral.html b/httemplate/elements/tr-select-part_referral.html
new file mode 100644
index 000000000..0108388bc
--- /dev/null
+++ b/httemplate/elements/tr-select-part_referral.html
@@ -0,0 +1,30 @@
+<%
+  my( $refnum, %opt ) = @_;
+
+  $opt{'part_referrals'} ||=
+    [ FS::part_referral->all_part_referral( 1 ) ]; #1: include global
+
+  my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
+
+%>
+
+<% if ( scalar( @{$opt{'part_referrals'}} ) == 0 ) {
+     eidiot "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.html and create one or more advertising sources.";
+   } elsif ( scalar( @{$opt{'part_referrals'}} ) == 1 ) {
+%>
+
+     <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $opt{'part_referrals'}->[0]->refnum %>">
+
+<% } else { %>
+
+     <TR>
+       <TH ALIGN="right"><%=$r%>Advertising source</TH>
+       <TD>
+         <%= include( '/elements/select-part_referral.html', $refnum,
+                        'part_referrals' => $opt{'part_referrals'},
+                    )
+         %>
+       </TD>
+     </TR>
+
+<% } %>
-- 
cgit v1.2.1


From eddbfe83c7b701ef02ce346b169fc44eae4f6e97 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Aug 2006 06:45:14 +0000
Subject: don't adjust next bill date on unsuspension!  causes undesirable
 effects with prorate/subscription packages and undesirably rewards customers
 for non-payment, closes: Bug#1325

---
 FS/FS/cust_pkg.pm | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 45128e966..4976a2d50 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -556,18 +556,27 @@ sub suspend {
   ''; #no errors
 }
 
-=item unsuspend
+=item unsuspend [ OPTION => VALUE ... ]
 
 Unsuspends all services (see L<FS::cust_svc> and L<FS::part_svc>) in this
 package, then unsuspends the package itself (clears the susp field).
 
+Available options are: I<adjust_next_bill>.
+
+I<adjust_next_bill> can be set true to adjust the next bill date forward by
+the amount of time the account was inactive.  This was set true by default
+since 1.4.2 and 1.5.0pre6; however, starting with 1.7.0 this needs to be
+explicitly requested.  Price plans for which this makes sense (anniversary-date
+based than prorate or subscription) could have an option to enable this
+behaviour?
+
 If there is an error, returns the error, otherwise returns false.
 
 =cut
 
 sub unsuspend {
-  my $self = shift;
-  my($error);
+  my( $self, %opt ) = @_;
+  my $error;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -606,9 +615,12 @@ sub unsuspend {
   unless ( ! $self->getfield('susp') ) {
     my %hash = $self->hash;
     my $inactive = time - $hash{'susp'};
-    $hash{'susp'} = '';
+
     $hash{'bill'} = ( $hash{'bill'} || $hash{'setup'} ) + $inactive
-      if $inactive > 0 && ( $hash{'bill'} || $hash{'setup'} );
+      if $opt{'adjust_next_bill'}
+      && $inactive > 0 && ( $hash{'bill'} || $hash{'setup'} );
+
+    $hash{'susp'} = '';
     my $new = new FS::cust_pkg ( \%hash );
     $error = $new->replace($self);
     if ( $error ) {
-- 
cgit v1.2.1


From b8ec621c59747a1c2fcd7fbd603d0c6de41e7df5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Aug 2006 10:47:51 +0000
Subject: fix acl rewrite causing problems: void now shows up properly,
 deprecate all the redundant config values

---
 FS/FS/AccessRight.pm                           |  1 +
 FS/FS/Conf.pm                                  | 28 ++++-----
 httemplate/view/cust_main/payment_history.html | 86 +++++++++++++++++---------
 3 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 888a6865b..d03b79acd 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -120,6 +120,7 @@ assigned to users and/or groups.
 
   'Credit card void', #aka. cc-void #Enable local-only voiding of echeck payments in addition to refunds against the payment gateway
   'Echeck void', #aka. echeck-void #Enable local-only voiding of echeck payments in addition to refunds against the payment gateway
+  'Regular void',
   'Unvoid', #aka. unvoid #Enable unvoiding of voided payments
 
   'List customers',
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 8b3cd1aa6..5b77234a6 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -435,29 +435,29 @@ httemplate/docs/config.html
 
   {
     'key'         => 'deletepayments',
-    'section'     => 'UI',
-    'description' => 'Enable deletion of unclosed payments.  Be very careful!  Only delete payments that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.',
+    'section'     => 'billing',
+    'description' => 'Enable deletion of unclosed payments.  Really, with voids this is pretty much not recommended in any situation anymore.  Be very careful!  Only delete payments that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.',
     'type'        => [qw( checkbox text )],
   },
 
   {
     'key'         => 'deletecredits',
-    'section'     => 'UI',
-    'description' => 'Enable deletion of unclosed credits.  Be very careful!  Only delete credits that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable deletion of unclosed credits.  Be very careful!  Only delete credits that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.',
     'type'        => [qw( checkbox text )],
   },
 
   {
     'key'         => 'unapplypayments',
-    'section'     => 'UI',
-    'description' => 'Enable "unapplication" of unclosed payments.',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable "unapplication" of unclosed payments.',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'unapplycredits',
-    'section'     => 'UI',
-    'description' => 'Enable "unapplication" of unclosed credits.',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to nable "unapplication" of unclosed credits.',
     'type'        => 'checkbox',
   },
 
@@ -1557,22 +1557,22 @@ httemplate/docs/config.html
 
   {
     'key'         => 'echeck-void',
-    'section'     => 'billing',
-    'description' => 'Enable local-only voiding of echeck payments in addition to refunds against the payment gateway',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable local-only voiding of echeck payments in addition to refunds against the payment gateway',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'cc-void',
-    'section'     => 'billing',
-    'description' => 'Enable local-only voiding of credit card payments in addition to refunds against the payment gateway',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable local-only voiding of credit card payments in addition to refunds against the payment gateway',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'unvoid',
-    'section'     => 'billing',
-    'description' => 'Enable unvoiding of voided payments',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable unvoiding of voided payments',
     'type'        => 'checkbox',
   },
 
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 5c2aa24c9..482136fa1 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -135,7 +135,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
     $post = '</FONT></B>';
     $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
              $cust_pay->paynum.
-             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
+             qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
 
   } elsif (    scalar(@cust_bill_pay)   == 1
             && scalar(@cust_pay_refund) == 0
@@ -161,7 +161,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
       } elsif ( $app->isa('FS::cust_pay_refund') ) {
         $desc .= '&nbsp;&nbsp;'.
                  '$'. $app->amount.
-                 ' refunded on'. time2str("%D", $app->_date).
+                 ' refunded on '. time2str("%D", $app->_date).
                  '<BR>';
       } else {
         die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
@@ -173,7 +173,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
                $cust_pay->unapplied. ' unapplied</FONT></B>'.
                qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
                $cust_pay->paynum. 
-               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
+               qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
                '<BR>';
     }
   }
@@ -195,13 +195,14 @@ foreach my $cust_pay ($cust_main->cust_pay) {
   my $void = '';
   if (    $cust_pay->closed !~ /^Y/i
        && (    ( $cust_pay->payby eq 'CARD'
-                 && $conf->exists('cc-void')
-                 && $curuser->acccess_right('Credit card void')
+                 && $curuser->access_right('Credit card void')
                )
             || ( $cust_pay->payby eq 'CHEK'
-                 && $conf->exists('echeck-void')
-                 && $curuser->acccess_right('Echeck void')
-               ) 
+                 && $curuser->access_right('Echeck void')
+               )
+            || ( $cust_pay->payby !~ /^(CARD|CHEK)$/
+                 && $curuser->access_right('Regular void')
+               )
           )
      )
   {
@@ -231,7 +232,6 @@ foreach my $cust_pay ($cust_main->cust_pay) {
 
   my $unapply = '';
   if (    $cust_pay->closed !~ /^Y/i
-       && $conf->exists('unapplypayments')
        && scalar(@cust_bill_pay)           
        && $curuser->access_right('Unapply payment')
      )
@@ -268,7 +268,6 @@ foreach my $cust_pay_void ($cust_main->cust_pay_void) {
 
   my $unvoid = '';
   if ( $cust_pay_void->closed !~ /^Y/i
-       && $conf->exists('unvoid')
        && $curuser->access_right('Unvoid')
      )
   {
@@ -307,7 +306,7 @@ foreach my $cust_credit ($cust_main->cust_credit) {
     $post = '</FONT></B>';
     $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
              $cust_credit->crednum.
-             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
+             qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
   } elsif (    scalar(@cust_credit_bill)   == 1
             && scalar(@cust_credit_refund) == 0
             && $cust_credit->credited == 0      ) {
@@ -332,7 +331,7 @@ foreach my $cust_credit ($cust_main->cust_credit) {
       } elsif ( $app->isa('FS::cust_credit_refund') ) {
         $desc .= '&nbsp;&nbsp;'.
                  '$'. $app->amount.
-                 ' refunded on'. time2str("%D", $app->_date).
+                 ' refunded on '. time2str("%D", $app->_date).
                  '<BR>';
       } else {
         die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund";
@@ -343,14 +342,18 @@ foreach my $cust_credit ($cust_main->cust_credit) {
                $cust_credit->credited. ' unapplied</FONT></B>'.
                qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
                $cust_credit->crednum.
-               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
+               qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
                '<BR>';
     }
   }
 #
   my $delete = '';
   if ( $cust_credit->closed !~ /^Y/i
-       && $conf->exists('deletecredits')
+
+       #s'pose deleting a credit isn't bad like deleting a payment
+       # and this needs to be generally available until we have credit voiding..
+       #&& $conf->exists('deletecredits')
+
        && $curuser->access_right('Delete credit')
      )
   {
@@ -362,7 +365,6 @@ foreach my $cust_credit ($cust_main->cust_credit) {
   
   my $unapply = '';
   if (    $cust_credit->closed !~ /^Y/i
-       && $conf->exists('unapplycredits')
        && scalar(@cust_credit_bill)
        && $curuser->access_right('Unapply credit')
      )
@@ -408,15 +410,21 @@ foreach my $cust_refund ($cust_main->cust_refund) {
 
 %>
 
-<%= include("/elements/table.html") %>
+<%= include("/elements/table-grid.html") %>
+
+<% my $bgcolor1 = '#eeeeee';
+   my $bgcolor2 = '#ffffff';
+   my $bgcolor = '';
+%>
+
 <TR>
-  <TH>Date</TH>
-  <TH>Description</TH>
-  <TH><FONT SIZE=-1>Charge</FONT></TH>
-  <TH><FONT SIZE=-1>Payment</FONT></TH>
-  <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
-  <TH><FONT SIZE=-1>Refund</FONT></TH>
-  <TH><FONT SIZE=-1>Balance</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Charge</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Payment</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Refund</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Balance</FONT></TH>
 </TR>
 
 <%
@@ -426,6 +434,12 @@ my %target;
 my $balance = 0;
 foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
 
+  if ( $bgcolor eq $bgcolor1 ) {
+    $bgcolor = $bgcolor2;
+  } else {
+    $bgcolor = $bgcolor1;
+  }
+
   my $charge  = exists($item->{'charge'})
                   ? sprintf('$%.2f', $item->{'charge'})
                   : '';
@@ -454,7 +468,7 @@ foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
 %>
 
   <TR>
-    <TD>
+    <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
       <% unless ( !$target || $target{$target}++ ) { %>
         <A NAME="<%= $target %>">
       <% } %>
@@ -464,12 +478,24 @@ foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
       <% } %>
       </FONT>
     </TD>
-    <TD><%= $item->{'desc'} %></TD>
-    <TD ALIGN="right"><%= $charge  %></TD>
-    <TD ALIGN="right"><%= $payment %></TD>
-    <TD ALIGN="right"><%= $credit  %></TD>
-    <TD ALIGN="right"><%= $refund  %></TD>
-    <TD ALIGN="right"><%= $showbalance %></TD>
+    <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $item->{'desc'} %>
+    </TD>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $charge  %>
+    </TD>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $payment %>
+    </TD>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $credit  %>
+    </TD>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $refund  %>
+    </TD>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $showbalance %>
+    </TD>
   </TR>
 
 <% } %>
-- 
cgit v1.2.1


From a2bddcaabfdaf11d4b726b21af7f6ffc13c458d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Aug 2006 11:01:27 +0000
Subject: s/Post/Enter/;

---
 httemplate/edit/cust_credit.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index d19f0e4b3..8de627d20 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -24,7 +24,7 @@ my $otaker = getotaker;
 
 my $p1 = popurl(1);
 
-%><%= include('/elements/header-popup.html', 'Post Credit') %>
+%><%= include('/elements/header-popup.html', 'Enter Credit') %>
 
 <% if ( $cgi->param('error') ) { %>
   <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
@@ -72,7 +72,7 @@ Credit
 </TABLE>
 
 <BR>
-<CENTER><INPUT TYPE="submit" VALUE="Post credit"></CENTER>
+<CENTER><INPUT TYPE="submit" VALUE="Enter credit"></CENTER>
     </FORM>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 8e3dfb380406e145494a5fffa7a0e4aab7b38253 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 13 Aug 2006 10:25:58 +0000
Subject: customer view work:

DONE  1. add status and balance to top

DONE  2. add some sort of oldest date thing so the history doesn't get too
     big (# years and a link to "show older")

  3. make the rest of the action links into js popups?  maybe later,
     weird IENess when closing em
DONE (finished)    - so revert out or finish/commit the Enter check payment one
   - Process page can wait until another day.. it should be more of an *action*

DONE  4. Ticket list config knobs for wtxs (grid it too)

DONE  5. grid the package list
---
 FS/FS/Conf.pm                                  |  22 ++++++
 FS/FS/TicketSystem/RT_External.pm              |  46 ++++++++----
 httemplate/edit/cust_pay.cgi                   |  20 +++--
 httemplate/edit/process/cust_pay.cgi           |  30 +++++---
 httemplate/view/cust_main.cgi                  |  19 +----
 httemplate/view/cust_main/billing.html         |  14 +++-
 httemplate/view/cust_main/misc.html            |  15 +++-
 httemplate/view/cust_main/packages.html        | 100 +++++++++++++------------
 httemplate/view/cust_main/payment_history.html |  92 +++++++++++++++++++----
 httemplate/view/cust_main/tickets.html         |  46 +++++++++---
 10 files changed, 278 insertions(+), 126 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 5b77234a6..68ca49d0b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1716,6 +1716,28 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'payment_history-years',
+    'section'     => 'UI',
+    'description' => 'Number of years of payment history to show by default.  Currently defaults to 2.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'cust_main-ticket_statuses',
+    'section'     => 'UI',
+    'description' => 'Show tickets with these statuses on the customer view page.',
+    'type'        => 'selectmultiple',
+    'select_enum' => [qw( new open stalled resolved rejected deleted )],
+  },
+
+  {
+    'key'         => 'cust_main-max_tickets',
+    'section'     => 'UI',
+    'description' => 'Maximum number of tickets to show on the customer view page.',
+    'type'        => 'text',
+  },
+
 );
 
 1;
diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm
index ea3448039..7dde86228 100644
--- a/FS/FS/TicketSystem/RT_External.pm
+++ b/FS/FS/TicketSystem/RT_External.pm
@@ -10,7 +10,7 @@ use FS::Record qw(qsearchs);
 use FS::cust_main;
 
 FS::UID->install_callback( sub { 
-  my $conf = new FS::Conf;
+  $conf = new FS::Conf;
   $default_queueid = $conf->config('ticket_system-default_queueid');
   $priority_field =
     $conf->config('ticket_system-custom_priority_field');
@@ -57,7 +57,7 @@ sub customer_tickets {
   my( $from_sql, @param) = $self->_from_customer( $custnum, $priority );
   my $sql = "SELECT tickets.*, queues.name".
             ( length($priority) ? ", objectcustomfieldvalues.content" : '' ).
-            " $from_sql ORDER BY priority DESC LIMIT $limit";
+            " $from_sql ORDER BY priority, id DESC LIMIT $limit";
   my $sth = $dbh->prepare($sql) or die $dbh->errstr. "preparing $sql";
   $sth->execute(@param)         or die $sth->errstr. "executing $sql";
 
@@ -131,7 +131,7 @@ sub _from_customer {
                     JOIN queues ON ( tickets.queue = queues.id )
                     JOIN links ON ( tickets.id = links.localbase )
                     $join 
-       WHERE ( status = 'new' OR status = 'open' OR status = 'stalled' )
+       WHERE ( ". join(' OR ', map "status = '$_'", $self->statuses ). " )
          AND target = 'freeside://freeside/cust_main/$custnum'
          $where
   ";
@@ -140,31 +140,44 @@ sub _from_customer {
 
 }
 
+sub statuses {
+  #my $self = shift;
+  my @statuses = grep { ! /^\s*$/ } $conf->config('cust_main-ticket_statuses');
+  @statuses = (qw( new open stalled )) unless scalar(@statuses);
+  @statuses;
+}
+
 sub href_customer_tickets {
   my( $self, $custnum, $priority ) = @_;
 
-  my $href = $self->baseurl;
+  #my $href = $self->baseurl;
 
-  #i snarfed this from an RT bookmarked search, it could be unescaped in the
-  #source for readability and run through uri_escape
-  $href .= 
-    'Search/Results.html?Order=ASC&Query=%20MemberOf%20%3D%20%27freeside%3A%2F%2Ffreeside%2Fcust_main%2F'.
-    $custnum.
-    '%27%20%20AND%20%28%20Status%20%3D%20%27open%27%20%20OR%20Status%20%3D%20%27new%27%20%20OR%20Status%20%3D%20%27stalled%27%20%29%20'
+  #i snarfed this from an RT bookmarked search, then unescaped (some of) it with
+  #perl -npe 's/%([0-9A-F]{2})/pack('C', hex($1))/eg;'
+
+  my $href .= 
+    "Search/Results.html?Order=ASC&".
+    "Query= MemberOf = 'freeside://freeside/cust_main/$custnum' ".
+    #" AND ( Status = 'open'  OR Status = 'new'  OR Status = 'stalled' )"
+    " AND ( ". join(' OR ', map "Status = '$_'", $self->statuses ). " ) "
   ;
 
   if ( defined($priority) && $field && $priority_field_queue ) {
-    $href .= 'AND%20Queue%20%3D%20%27'. $priority_field_queue. '%27%20';
+    $href .= " AND Queue = '$priority_field_queue' ";
   }
   if ( defined($priority) && $field ) {
-    $href .= '%20AND%20%27CF.'. $field. '%27%20';
+    $href .= " AND 'CF.$field' ";
     if ( $priority ) {
-      $href .= '%3D%20%27'. $priority. '%27%20';
+      $href .= "= '$priority' ";
     } else {
-      $href .= 'IS%20%27NULL%27%20';
+      $href .= "IS 'NULL' "; #this is "RTQL", not SQL
     }
   }
 
+  #$href = 
+  uri_escape($href);
+  #eventually should unescape all of it...
+
   $href .= '&Rows=100'.
            '&OrderBy=id&Page=1'.
            '&Format=%27%20%20%20%3Cb%3E%3Ca%20href%3D%22'.
@@ -185,7 +198,10 @@ sub href_customer_tickets {
 
   $href .= '%20%0A%27%3Csmall%3E__ToldRelative__%3C%2Fsmall%3E%27%2C%20%0A%27%3Csmall%3E__LastUpdatedRelative__%3C%2Fsmall%3E%27%2C%20%0A%27%3Csmall%3E__TimeLeft__%3C%2Fsmall%3E%27';
 
-  $href;
+  #$href =
+  #uri_escape($href);
+
+  $self->baseurl. $href;
 
 }
 
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index a03a245eb..e7734c1fc 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -9,22 +9,20 @@ my %payby = (
   'MCRD' => 'Manual credit card',
 );
 
-my($link, $linknum, $paid, $payby, $payinfo, $quickpay, $_date); 
+my($link, $linknum, $paid, $payby, $payinfo, $_date); 
 if ( $cgi->param('error') ) {
   $link     = $cgi->param('link');
   $linknum  = $cgi->param('linknum');
   $paid     = $cgi->param('paid');
   $payby    = $cgi->param('payby');
   $payinfo  = $cgi->param('payinfo');
-  $quickpay = $cgi->param('quickpay');
   $_date    = $cgi->param('_date') ? str2time($cgi->param('_date')) : time;
 } elsif ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
-  $link     = 'custnum';
+  $link     = $cgi->param('popup') ? 'popup' : 'custnum';
   $linknum  = $1;
   $paid     = '';
   $payby    = $cgi->param('payby') || 'BILL';
   $payinfo  = '';
-  $quickpay = $cgi->param('quickpay');
   $_date    = time;
 } elsif ( $cgi->param('invnum') =~ /^(\d+)$/ ) {
   $link     = 'invnum';
@@ -32,7 +30,6 @@ if ( $cgi->param('error') ) {
   $paid     = '';
   $payby    = $cgi->param('payby') || 'BILL';
   $payinfo  = "";
-  $quickpay = '';
   $_date    = time;
 } else {
   die "illegal query ". $cgi->keywords;
@@ -43,9 +40,15 @@ my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 my $title = 'Post '. $payby{$payby}. ' payment';
 $title .= " against Invoice #$linknum" if $link eq 'invnum';
 
-%>
+if ( $link eq 'popup' ) { 
+
+%><%= include('/elements/header-popup.html', $title ) %>
+
+<% } else { %>
 
-<%=  include("/elements/header.html",$title, '') %>
+<%=  include("/elements/header.html", $title, '') %>
+
+<% } %>
 
 <% if ( $cgi->param('error') ) { %>
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
@@ -60,7 +63,6 @@ $title .= " against Invoice #$linknum" if $link eq 'invnum';
 <FORM ACTION="<%= popurl(1) %>process/cust_pay.cgi" METHOD=POST>
 <INPUT TYPE="hidden" NAME="link" VALUE="<%= $link %>">
 <INPUT TYPE="hidden" NAME="linknum" VALUE="<%= $linknum %>">
-<INPUT TYPE="hidden" NAME="quickpay" VALUE="<%= $quickpay %>">
 
 <% 
 my $money_char = $conf->config('money_char') || '$';
@@ -74,7 +76,9 @@ if ( $link eq 'invnum' ) {
 }
 %>
 
+<% unless ( $link eq 'popup' ) { %>
 <%= small_custview($custnum, $conf->config('countrydefault')) %>
+<% } %>
 
 <INPUT TYPE="hidden" NAME="payby" VALUE="<%= $payby %>">
 
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 87d6011e7..cecccb59e 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -4,15 +4,16 @@ $cgi->param('linknum') =~ /^(\d+)$/
   or die "Illegal linknum: ". $cgi->param('linknum');
 my $linknum = $1;
 
-$cgi->param('link') =~ /^(custnum|invnum)$/
+$cgi->param('link') =~ /^(custnum|invnum|popup)$/
   or die "Illegal link: ". $cgi->param('link');
-my $link = $1;
+my $field = my $link = $1;
+$field = 'custnum' if $field eq 'popup';
 
 my $_date = str2time($cgi->param('_date'));
 
 my $new = new FS::cust_pay ( {
-  $link => $linknum,
-  _date => $_date,
+  $field => $linknum,
+  _date  => $_date,
   map {
     $_, scalar($cgi->param($_));
   } qw(paid payby payinfo paybatch)
@@ -24,19 +25,30 @@ my $error = $new->insert;
 if ($error) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
-} elsif ( $link eq 'invnum' ) {
+} elsif ( $field eq 'invnum' ) {
   print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
-} elsif ( $link eq 'custnum' ) {
+} elsif ( $field eq 'custnum' ) {
   if ( $cgi->param('apply') eq 'yes' ) {
     my $cust_main = qsearchs('cust_main', { 'custnum' => $linknum })
       or die "unknown custnum $linknum";
     $cust_main->apply_payments;
   }
-  if ( $cgi->param('quickpay') eq 'yes' ) {
-    print $cgi->redirect(popurl(3). "search/cust_main-quickpay.html");
-  } else {
+  if ( $link eq 'popup' ) {
+
+    %><%= header('Payment entered') %>
+    <SCRIPT TYPE="text/javascript">
+      window.top.location.reload();
+    </SCRIPT>
+
+    </BODY></HTML>
+    <%
+
+  } elsif ( $link eq 'custnum' ) {
     print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
+  } else {
+    die "unknown link $link";
   }
+
 }
 
 %>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 89ddc38f2..8267fea51 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -2,24 +2,6 @@
 
 my $conf = new FS::Conf;
 
-my %uiview = ();
-my %uiadd = ();
-foreach my $part_svc ( qsearch('part_svc',{}) ) {
-  $uiview{$part_svc->svcpart} = $p. "view/". $part_svc->svcdb . ".cgi";
-  $uiadd{$part_svc->svcpart}= $p. "edit/". $part_svc->svcdb . ".cgi";
-}
-
-%>
-
-
-<%= include("/elements/header.html","Customer View", 
-	include("/elements/menubar.html",
-  'Main Menu' => $p,
-)) %>
-
-
-<%
-
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 die "No customer specified (bad URL)!" unless $cgi->keywords;
@@ -31,6 +13,7 @@ die "Customer not found!" unless $cust_main;
 
 %>
 
+<%= include("/elements/header.html","Customer View: ". $cust_main->name ) %>
 
 <% if ( $curuser->access_right('Edit customer') ) { %>
   <A HREF="<%= $p %>edit/cust_main.cgi?<%= $custnum %>">Edit this customer</A> | 
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 895814cc2..191d3092f 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -1,12 +1,24 @@
 <%
   my( $cust_main ) = @_;
   my @invoicing_list = $cust_main->invoicing_list;
+  my $conf = new FS::Conf;
+  my $money_char = $conf->config('money_char') || '$';
 %>
 
 Billing information
 (<A HREF="<%= $p %>misc/bill.cgi?<%= $cust_main->custnum %>">Bill now</A>)
 <%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
 
+<%
+( my $balance = $cust_main->balance )
+  =~ s/^(\-?)(.*)$/<FONT SIZE=+1>$1<\/FONT>$money_char$2/;
+%>
+
+<TR>
+  <TD ALIGN="right">Balance due</TD>
+  <TD BGCOLOR="#ffffff"><B><%= $balance %></B></TD>
+</TR>
+
 <TR>
   <TD ALIGN="right">Billing&nbsp;type</TD>
   <TD BGCOLOR="#ffffff">
@@ -159,7 +171,7 @@ if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
     <%= join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %>
   </TD>
 </TR>
-<% my $conf = new FS::Conf; if ( $conf->exists('voip-cust_cdr_spools') ) { %>
+<% if ( $conf->exists('voip-cust_cdr_spools') ) { %>
   <TR>
     <TD ALIGN="right">Spool&nbsp;CDRs</TD>
     <TD BGCOLOR="#ffffff"><%= $cust_main->spool_cdr ? 'yes' : 'no' %></TD>
diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index 742b35958..f06a4fbd2 100644
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -4,11 +4,17 @@
 %>
 
 <%= ntable("#cccccc") %><TR><TD><%= &ntable("#cccccc",2) %>
+
 <TR>
   <TD ALIGN="right">Customer&nbsp;number</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->custnum %></TD>
 </TR>
 
+<TR>
+  <TD ALIGN="right">Status</TD>
+  <TD BGCOLOR="#ffffff"><FONT COLOR="#<%= $cust_main->statuscolor %>"><B><%= ucfirst($cust_main->status) %></B></FONT></TD>
+</TR>
+
 <%
   my @agents = qsearch( 'agent', {} );
   my $agent;
@@ -50,10 +56,6 @@
 
 <% } %>
 
-<TR>
-  <TD ALIGN="right">Order taker</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->otaker %></TD>
-</TR>
 <TR>
   <TD ALIGN="right">Referring&nbsp;Customer</TD>
   <TD BGCOLOR="#ffffff">
@@ -82,5 +84,10 @@
   </TD>
 </TR>
 
+<TR>
+  <TD ALIGN="right">Order taker</TD>
+  <TD BGCOLOR="#ffffff"><%= $cust_main->otaker %></TD>
+</TR>
+
 </TABLE></TD></TR></TABLE>
 
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index beb67f325..9cd1e284f 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -7,10 +7,6 @@
   my $packages = get_packages($cust_main, $conf);
 %>
 
-<STYLE TYPE="text/css">
-.package .provision { font-weight: bold }
-</STYLE>
-
 <A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A>
 
 <% if ( $curuser->access_right('Order customer package') ) { %>
@@ -54,30 +50,33 @@ Current packages
 
 <% if ( @$packages ) { %>
 
-<TABLE CLASS="package" BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
+<%= include('/elements/table-grid.html') %>
+
+<% my $bgcolor1 = '#eeeeee';
+   my $bgcolor2 = '#ffffff';
+   my $bgcolor = '';
+%>
+
 <TR>
-  <TH>Package</TH>
-  <TH>Status</TH>
-  <TH COLSPAN=2>Services</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Package</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Status</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Services</TH>
 </TR>
 
 <%
 foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
-  my $rowspan = 0;
 
-  if ($pkg->{cancel}) {
-    $rowspan = 0;
+  if ( $bgcolor eq $bgcolor1 ) {
+    $bgcolor = $bgcolor2;
   } else {
-    foreach my $svcpart (@{$pkg->{svcparts}}) {
-      $rowspan += $svcpart->{count};
-      $rowspan++ if ($svcpart->{count} < $svcpart->{quantity});
-    }
-  } 
+    $bgcolor = $bgcolor1;
+  }
+
 %>
 
 <!--pkgnum: <%=$pkg->{pkgnum}%>-->
 <TR>
-  <TD ROWSPAN=<%= $rowspan || 1 %>>
+  <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
     <A NAME="cust_pkg<%=$pkg->{pkgnum}%>"><%=$pkg->{pkgnum}%></A>:
     <%=$pkg->{pkg}%> - <%=$pkg->{comment}%><BR>
     <FONT SIZE=-1>
@@ -94,8 +93,8 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
       <% } %>
     </FONT>
   </TD>
-  <TD ROWSPAN=<%= $rowspan || 1 %>>
-    <TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
+  <TD CLASS="inv" BGCOLOR="<%= $bgcolor %>">
+    <TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
 
 <%
   sub myfreq {
@@ -315,42 +314,51 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 </TABLE>
 </TD>
 
-<%
-  if ($rowspan == 0) { print qq!</TR>\n!; next; }
+<TD CLASS="inv" BGCOLOR="<%= $bgcolor %>">
+  <TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
 
-  my $cnt = 0;
+
+<%
   foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) {
     foreach my $service (@{$svcpart->{services}}) {
-      print '<TR>' if ($cnt > 0);
 %>
-  <TD><%=svc_link($svcpart,$service)%></TD>
-  <TD><%=svc_label_link($svcpart,$service)%>
-    <% if ( $curuser->access_right('Unprovision customer service') ) { %>
-      <BR>(&nbsp;<%=svc_unprovision_link($service)%>&nbsp;)
+      <TR>
+        <TD ALIGN="right" VALIGN="top" ROWSPAN=2><%=svc_link($svcpart,$service)%></TD>
+        <TD STYLE="padding-bottom:0px"><B><%=svc_label_link($svcpart,$service)%></B></TD>
+      </TR>
+
+      <% if ( $curuser->access_right('Unprovision customer service') ) { %>
+        <TR>
+          <TD ALIGN="right" VALIGN="top" STYLE="padding-bottom:5px;padding-top:0px"><FONT SIZE="-2">(&nbsp;<%=svc_unprovision_link($service)%>&nbsp;)</FONT></TD>
+        </TR>
+      <% } %>
+
     <% } %>
-  </TD>
-</TR>
-<%
-      $cnt++;
-    }
-    if ( $svcpart->{count} < $svcpart->{quantity} ) {
-      print '<TR>' if ($cnt > 0);
-      if ( $curuser->access_right('Provision customer service') ) {
-        print '<TD COLSPAN=2>'.
-              svc_provision_link($pkg, $svcpart, $conf, $curuser).
-              '</TD></TR>';
-      } else {
-        #print '<TD COLSPAN=2>&nbsp;</TD></TR>';
-        print '<TD COLSPAN=2></TD></TR>';
-      }
-    }
 
-  }
-}
-#end display packages
+    <% if ( $curuser->access_right('Provision customer service') 
+            && $svcpart->{count} < $svcpart->{quantity}
+          )
+       {
+    %>
+
+      <TR>
+        <TD COLSPAN=2 ALIGN="center" STYLE="padding-bottom:4px;padding-top:0px">
+          <B><%= svc_provision_link($pkg, $svcpart, $conf, $curuser) %></B>
+        </TD>
+      </TR>
+
+    <% } %>
+
+<% } %>
+
+</TABLE>
+</TD>
+
+<% } #end display packages
 %>
 
 </TABLE>
+
 <% } else { %>
 <BR>
 <% } %>
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 482136fa1..aef5fb8f8 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -21,21 +21,21 @@
 <% if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=BILL;custnum=<%= $custnum %>">Post check payment</A>
+  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_pay.cgi?popup=1;payby=BILL;custnum=<%= $custnum %>', 392, 336, 'cust_pay_popup' ), CAPTION, 'Enter check payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter check payment</A>
 
 <% } %>
 
 <% if ( $payby{'CASH'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=CASH;custnum=<%= $custnum %>">Post cash payment</A>
+  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_pay.cgi?popup=1;payby=CASH;custnum=<%= $custnum %>', 392, 336, 'cust_pay_popup' ), CAPTION, 'Enter cash payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter cash payment</A>
 
 <% } %>
 
 <% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;custnum=<%= $custnum %>">Post Western Union payment</A>
+  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;custnum=<%= $custnum %>">Enter Western Union payment</A>
 
 <% } %>
 
@@ -62,7 +62,7 @@
 <% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<%= $custnum %>">Post manual credit card payment</A>
+  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<%= $custnum %>">Post manual (offline) credit card payment</A>
 
 <% } %>
 
@@ -70,7 +70,7 @@
 
 <% if ( $curuser->access_right('Post credit') ) { %>
 
-  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Post credit</A>
+  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Enter credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter credit</A>
 
   <BR>
 
@@ -430,10 +430,53 @@ foreach my $cust_refund ($cust_main->cust_refund) {
 <%
 #display payment history
 
-my %target;
 my $balance = 0;
+my %target = ();
+my $money_char = $conf->config('money_char') || '$';
+
+my $years =  $conf->config('payment_history-years') || 2;
+my $older_than = time - $years * 31556736; #60*60*24*365.24
+my $hidden = 0;
+my $seen = 0;
+my $old_history = 0;
+
 foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
 
+  my $display;
+  if ( $item->{'date'} < $older_than ) {
+    $display = ' STYLE="display:none" ';
+    $hidden = 1;
+  } else {
+
+    $display = '';
+
+    if ( $hidden && ! $seen++ ) {
+      ( my $balance_forward = $money_char. $balance ) =~ s/^\$\-/-&nbsp;\$/;
+    %>
+
+      <TR ID="balance_forward_row">
+        <TD CLASS="grid" BGCOLOR="#dddddd">
+          <%= time2str("%D",$item->{'date'}) %>
+        </TD>
+
+        <TD CLASS="grid" BGCOLOR="#dddddd">
+          <I>Starting balance on <%= time2str("%D",$item->{'date'}) %></I>
+          (<A HREF="javascript:void(0);" onClick="show_history();">show prior history</A>)
+        </TD>
+
+        <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+        <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+        <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+        <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+        <TD CLASS="grid" BGCOLOR="#dddddd"><I><%= $balance_forward %></I></TD>
+
+      </TR>
+
+    <%
+    }
+
+  }
+
   if ( $bgcolor eq $bgcolor1 ) {
     $bgcolor = $bgcolor2;
   } else {
@@ -441,18 +484,24 @@ foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
   }
 
   my $charge  = exists($item->{'charge'})
-                  ? sprintf('$%.2f', $item->{'charge'})
+                  ? sprintf("$money_char\%.2f", $item->{'charge'})
                   : '';
+
   my $payment = exists($item->{'payment'})
-                  ? sprintf('-&nbsp;$%.2f', $item->{'payment'})
+                  ? sprintf("-&nbsp;$money_char\%.2f", $item->{'payment'})
                   : '';
-  $payment ||= sprintf('<DEL>-&nbsp;$%.2f</DEL>', $item->{'void_payment'})
+
+  $payment ||= sprintf( "<DEL>-&nbsp;$money_char\%.2f</DEL>",
+                        $item->{'void_payment'}
+                      )
     if exists($item->{'void_payment'});
+
   my $credit  = exists($item->{'credit'})
-                  ? sprintf('-&nbsp;$%.2f', $item->{'credit'})
+                  ? sprintf("-&nbsp;$money_char\%.2f", $item->{'credit'})
                   : '';
+
   my $refund  = exists($item->{'refund'})
-                  ? sprintf('$%.2f', $item->{'refund'})
+                  ? sprintf("$money_char\%.2f", $item->{'refund'})
                   : '';
 
   my $target = exists($item->{'target'}) ? $item->{'target'} : '';
@@ -463,11 +512,11 @@ foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
   $balance += $item->{'refund'}  if exists $item->{'refund'};
   $balance = sprintf("%.2f", $balance);
   $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
-  ( my $showbalance = '$'. $balance ) =~ s/^\$\-/-&nbsp;\$/;
+  ( my $showbalance = $money_char. $balance ) =~ s/^\$\-/-&nbsp;\$/;
 
 %>
 
-  <TR>
+  <TR <%= $display ? $display.' ID="old_history'.$old_history++.'"'  : ''%>>
     <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
       <% unless ( !$target || $target{$target}++ ) { %>
         <A NAME="<%= $target %>">
@@ -502,3 +551,20 @@ foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
 
 </TABLE>
 
+<SCRIPT TYPE="text/javascript">
+
+function show_history () {
+  //alert('showing history!');
+
+  var balance_forward_row = document.getElementById('balance_forward_row');
+
+  balance_forward_row.style.display = 'none';
+  for ( var i = 0; i < <%= $old_history %>; i++ ) {
+    var oldRow = document.getElementById('old_history'+i);
+    oldRow.style.display = '';
+  }
+
+}
+
+</SCRIPT>
+
diff --git a/httemplate/view/cust_main/tickets.html b/httemplate/view/cust_main/tickets.html
index 5c1d94ee1..93cb51f25 100644
--- a/httemplate/view/cust_main/tickets.html
+++ b/httemplate/view/cust_main/tickets.html
@@ -2,7 +2,7 @@
   my( $cust_main ) = @_;
 
   my $conf = new FS::Conf;
-  my $num = 10;
+  my $num = $conf->config('cust_main-max_tickets') || 10;
 
   my @tickets = ();
   unless ( $conf->config('ticket_system-custom_priority_field') ) {
@@ -31,24 +31,46 @@
 Highest priority tickets
 (<A HREF="<%= FS::TicketSystem->href_customer_tickets($cust_main->custnum) %>">View all tickets for this customer</A>)
 (<A HREF="<%= FS::TicketSystem->href_new_ticket($cust_main, join(', ', grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list ) ) %>">New ticket for this customer</A>)
-<%= include("/elements/table.html") %>
+
+<%= include("/elements/table-grid.html") %>
+
+<% my $bgcolor1 = '#eeeeee';
+   my $bgcolor2 = '#ffffff';
+   my $bgcolor = '';
+%>
+
 <TR>
-  <TH>#</TH>
-  <TH>Subject</TH>
-  <TH>Priority</TH>
-  <TH>Queue</TH>
-  <TH>Status</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">#</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Subject</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Priority</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Queue</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Status</TH>
 </TR>
+
 <% foreach my $ticket ( @tickets ) {
      my $href = FS::TicketSystem->href_ticket($ticket->{id});
+     if ( $bgcolor eq $bgcolor1 ) {
+       $bgcolor = $bgcolor2;
+     } else {
+       $bgcolor = $bgcolor1;
+     }
 %>
+
 <TR>
-  <TD><A HREF=<%=$href%>><%= $ticket->{id} %></A></TD>
-  <TD><A HREF=<%=$href%>><%= $ticket->{subject} %></A></TD>
-  <TD ALIGN="right"><%= $ticket->{content} || $ticket->{priority} %></TD>
-  <TD><%= $ticket->{name} %></TD>
-  <TD><%= $ticket->{status} %></TD>
+
+  <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF=<%=$href%>><%= $ticket->{id} %></A></TD>
+
+  <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF=<%=$href%>><%= $ticket->{subject} %></A></TD>
+
+  <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $ticket->{content} || $ticket->{priority} %></TD>
+
+  <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $ticket->{name} %></TD>
+
+  <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $ticket->{status} %></TD>
+
 </TR>
+
 <% } %>
+
 </TABLE>
 
-- 
cgit v1.2.1


From 97168edae6af4a4d98c4f790b0c064b73efbb9fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Aug 2006 08:38:08 +0000
Subject: bugfix for agentless access users, triggered by part_referral
 (advertising source) agent virtualization

---
 FS/FS/access_user.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index 830d7f826..874da6687 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -297,8 +297,12 @@ Returns an sql fragement to select only agentnums this user can view.
 
 sub agentnums_sql {
   my $self = shift;
+
+  my @agentnums = $self->agentnums;
+  return ' 1 = 0 ' unless scalar(@agentnums);
+
   '( '.
-    join( ' OR ', map "agentnum = $_", $self->agentnums ).
+    join( ' OR ', map "agentnum = $_", @agentnums ).
   ' )';
 }
 
-- 
cgit v1.2.1


From b19897e1db4c110d7d7e8b52800cda5ab58ce9e0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Aug 2006 12:13:40 +0000
Subject: sprinkle some magic ajax fairy dust on referring customer SELEKTAH. 
 rewind!  make smart search smarter, re-layout the top search bars and add an
 invoice one

---
 FS/FS/cust_main.pm                        | 329 +++++++++++++++++++-----------
 httemplate/edit/cust_main.cgi             |  10 +-
 httemplate/elements/header.html           |  94 +++++++--
 httemplate/elements/search-cust_main.html | 163 +++++++++++++++
 rt/html/Elements/FreesideInvoiceSearch    |  20 ++
 rt/html/Elements/FreesideNewCust          |   2 +-
 rt/html/Elements/FreesideSearch           |   7 +-
 rt/html/Elements/FreesideSvcSearch        |   7 +-
 rt/html/Elements/PageLayout               |   2 +-
 rt/html/Elements/SimpleSearch             |   7 +-
 rt/html/Elements/Tabs                     |   6 +-
 rt/html/NoAuth/webrt.css                  |  39 +++-
 12 files changed, 531 insertions(+), 155 deletions(-)
 create mode 100644 httemplate/elements/search-cust_main.html
 create mode 100644 rt/html/Elements/FreesideInvoiceSearch

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 3f67c62f0..7962f6dfa 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3824,8 +3824,8 @@ sub uncancel_sql { "
 =item fuzzy_search FUZZY_HASHREF [ HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ ]
 
 Performs a fuzzy (approximate) search and returns the matching FS::cust_main
-records.  Currently, only I<last> or I<company> may be specified (the
-appropriate ship_ field is also searched if applicable).
+records.  Currently, I<first>, I<last> and/or I<company> may be specified (the
+appropriate ship_ field is also searched).
 
 Additional options are the same as FS::Record::qsearch
 
@@ -3839,19 +3839,25 @@ sub fuzzy_search {
 
   check_and_rebuild_fuzzyfiles();
   foreach my $field ( keys %$fuzzy ) {
-    my $sub = \&{"all_$field"};
     my %match = ();
-    $match{$_}=1 foreach ( amatch($fuzzy->{$field}, ['i'], @{ &$sub() } ) );
+    $match{$_}=1 foreach ( amatch( $fuzzy->{$field},
+                                   ['i'],
+                                   @{ $self->all_X($field) }
+                                 )
+                         );
 
+    my @fcust = ();
     foreach ( keys %match ) {
-      push @cust_main, qsearch('cust_main', { %$hash, $field=>$_}, @opt);
-      push @cust_main, qsearch('cust_main', { %$hash, "ship_$field"=>$_}, @opt)
-        if defined dbdef->table('cust_main')->column('ship_last');
+      push @fcust, qsearch('cust_main', { %$hash, $field=>$_}, @opt);
+      push @fcust, qsearch('cust_main', { %$hash, "ship_$field"=>$_}, @opt);
     }
+    my %fsaw = ();
+    push @cust_main, grep { ! $fsaw{$_->custnum}++ } @fcust;
   }
 
+  # we want the components of $fuzzy ANDed, not ORed, but still don't want dupes
   my %saw = ();
-  @cust_main = grep { !$saw{$_->custnum}++ } @cust_main;
+  @cust_main = grep { ++$saw{$_->custnum} == scalar(keys %$fuzzy) } @cust_main;
 
   @cust_main;
 
@@ -3866,8 +3872,9 @@ sub fuzzy_search {
 =item smart_search OPTION => VALUE ...
 
 Accepts the following options: I<search>, the string to search for.  The string
-will be searched for as a customer number, last name or company name, first
-searching for an exact match then fuzzy and substring matches.
+will be searched for as a customer number, phone number, name or company name,
+first searching for an exact match then fuzzy and substring matches (in some
+cases - see the source code for the exact heuristics used).
 
 Any additional options treated as an additional qualifier on the search
 (i.e. I<agentnum>).
@@ -3878,13 +3885,53 @@ Returns a (possibly empty) array of FS::cust_main objects.
 
 sub smart_search {
   my %options = @_;
-  my $search = delete $options{'search'};
 
   #here is the agent virtualization
   my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
 
   my @cust_main = ();
-  if ( $search =~ /^\s*(\d+)\s*$/ ) { # customer # search
+
+  my $search = delete $options{'search'};
+  ( my $alphanum_search = $search ) =~ s/\W//g;
+  
+  if ( $alphanum_search =~ /^1?(\d{3})(\d{3})(\d{4})(\d*)$/ ) { #phone# search
+
+    #false laziness w/Record::ut_phone
+    my $phonen = "$1-$2-$3";
+    $phonen .= " x$4" if $4;
+
+    push @cust_main, qsearch( {
+      'table'   => 'cust_main',
+      'hashref' => { %options },
+      'extra_sql' => ( scalar(keys %options) ? ' AND ' : ' WHERE ' ).
+                     ' ( '.
+                         join(' OR ', map "$_ = '$phonen'",
+                                          qw( daytime night fax
+                                              ship_daytime ship_night ship_fax )
+                             ).
+                     ' ) '.
+                     " AND $agentnums_sql", #agent virtualization
+    } );
+
+    unless ( @cust_main || $phonen =~ /x\d+$/ ) { #no exact match
+      #try looking for matches with extensions unless one was specified
+
+      push @cust_main, qsearch( {
+        'table'   => 'cust_main',
+        'hashref' => { %options },
+        'extra_sql' => ( scalar(keys %options) ? ' AND ' : ' WHERE ' ).
+                       ' ( '.
+                           join(' OR ', map "$_ LIKE '$phonen\%'",
+                                            qw( daytime night
+                                                ship_daytime ship_night )
+                               ).
+                       ' ) '.
+                       " AND $agentnums_sql", #agent virtualization
+      } );
+
+    }
+
+  } elsif ( $search =~ /^\s*(\d+)\s*$/ ) { # customer # search
 
     push @cust_main, qsearch( {
       'table'     => 'cust_main',
@@ -3892,22 +3939,86 @@ sub smart_search {
       'extra_sql' => " AND $agentnums_sql", #agent virtualization
     } );
 
-  } elsif ( $search =~ /^\s*(\S.*\S)\s*$/ ) { #value search
+  } elsif ( $search =~ /^\s*(\S.*\S)\s+\((.+), ([^,]+)\)\s*$/ ) {
+
+    my($company, $last, $first) = ( $1, $2, $3 );
+
+    # "Company (Last, First)"
+    #this is probably something a browser remembered,
+    #so just do an exact search
+
+    foreach my $prefix ( '', 'ship_' ) {
+      push @cust_main, qsearch( {
+        'table'     => 'cust_main',
+        'hashref'   => { $prefix.'first'   => $first,
+                         $prefix.'last'    => $last,
+                         $prefix.'company' => $company,
+                         %options,
+                       },
+        'extra_sql' => " AND $agentnums_sql",
+      } );
+    }
+
+  } elsif ( $search =~ /^\s*(\S.*\S)\s*$/ ) { # value search
+                                              # try (ship_){last,company}
 
     my $value = lc($1);
 
-    # remove "(Last, First)" in "Company (Last, First"), otherwise the
-    # full strings the browser remembers won't work
-    $value =~ s/\([\w \,\.\-\']*\)$//; #false laziness w/Record::ut_name
+    # # remove "(Last, First)" in "Company (Last, First)", otherwise the
+    # # full strings the browser remembers won't work
+    # $value =~ s/\([\w \,\.\-\']*\)$//; #false laziness w/Record::ut_name
+
+    use Lingua::EN::NameParse;
+    my $NameParse = new Lingua::EN::NameParse(
+             auto_clean     => 1,
+             allow_reversed => 1,
+    );
+
+    my($last, $first) = ( '', '' );
+    #maybe disable this too and just rely on NameParse?
+    if ( $value =~ /^(.+),\s*([^,]+)$/ ) { # Last, First
     
+      ($last, $first) = ( $1, $2 );
+    
+    #} elsif  ( $value =~ /^(.+)\s+(.+)$/ ) {
+    } elsif ( ! $NameParse->parse($value) ) {
+
+      my %name = $NameParse->components;
+      $first = $name{'given_name_1'};
+      $last  = $name{'surname_1'};
+
+    }
+
+    if ( $first && $last ) {
+
+      my($q_last, $q_first) = ( dbh->quote($last), dbh->quote($first) );
+
+      #exact
+      my $sql = scalar(keys %options) ? ' AND ' : ' WHERE ';
+      $sql .= "
+        (     ( LOWER(last) = $q_last AND LOWER(first) = $q_first )
+           OR ( LOWER(ship_last) = $q_last AND LOWER(ship_first) = $q_first )
+        )";
+
+      push @cust_main, qsearch( {
+        'table'     => 'cust_main',
+        'hashref'   => \%options,
+        'extra_sql' => "$sql AND $agentnums_sql", #agent virtualization
+      } );
+
+      # or it just be something that was typed in... (try that in a sec)
+
+    }
+
     my $q_value = dbh->quote($value);
 
     #exact
     my $sql = scalar(keys %options) ? ' AND ' : ' WHERE ';
-    $sql .= " ( LOWER(last) = $q_value OR LOWER(company) = $q_value";
-    $sql .= " OR LOWER(ship_last) = $q_value OR LOWER(ship_company) = $q_value"
-      if defined dbdef->table('cust_main')->column('ship_last');
-    $sql .= ' )';
+    $sql .= " (    LOWER(last)         = $q_value
+                OR LOWER(company)      = $q_value
+                OR LOWER(ship_last)    = $q_value
+                OR LOWER(ship_company) = $q_value
+              )";
 
     push @cust_main, qsearch( {
       'table'     => 'cust_main',
@@ -3920,56 +4031,62 @@ sub smart_search {
       #still some false laziness w/ search/cust_main.cgi
 
       #substring
-      push @cust_main, qsearch( {
-        'table'     => 'cust_main',
-        'hashref'   => { 'last'     => { 'op'    => 'ILIKE',
-                                         'value' => "%$value%" },
-                         %options,
-                       },
-        'extra_sql' => " AND $agentnums_sql", #agent virtualizaiton
-      } );
-      push @cust_main, qsearch( {
-        'table'     => 'cust_main',
-        'hashref'   => { 'ship_last' => { 'op'     => 'ILIKE',
-                                          'value' => "%$value%" },
-                         %options, 
-                       },
-        'extra_sql' => " AND $agentnums_sql", #agent virtualization
-      } )
-        if defined dbdef->table('cust_main')->column('ship_last');
 
-      push @cust_main, qsearch( {
-        'table'     => 'cust_main',
-        'hashref'   => { 'company'  => { 'op'    => 'ILIKE',
-                                         'value' => "%$value%" },
-                         %options,
-                       },
-        'extra_sql' => " AND $agentnums_sql", #agent virtualization
-      } );
-      push @cust_main, qsearch(  {
-        'table'     => 'cust_main',
-        'hashref'   => { 'ship_company' => { 'op'    => 'ILIKE',
-                                             'value' => "%$value%" },
-                         %options,
-                       },
-        'extra_sql' => " AND $agentnums_sql", #agent virtualization
-      } )
-        if defined dbdef->table('cust_main')->column('ship_last');
+      my @hashrefs = (
+        { 'company'      => { op=>'ILIKE', value=>"%$value%" }, },
+        { 'ship_company' => { op=>'ILIKE', value=>"%$value%" }, },
+      );
+
+      if ( $first && $last ) {
+
+        push @hashrefs,
+          { 'first'        => { op=>'ILIKE', value=>"%$first%" },
+            'last'         => { op=>'ILIKE', value=>"%$last%" },
+          },
+          { 'ship_first'   => { op=>'ILIKE', value=>"%$first%" },
+            'ship_last'    => { op=>'ILIKE', value=>"%$last%" },
+          },
+        ;
+
+      } else {
+
+        push @hashrefs,
+          { 'last'         => { op=>'ILIKE', value=>"%$value%" }, },
+          { 'ship_last'    => { op=>'ILIKE', value=>"%$value%" }, },
+        ;
+      }
+
+      foreach my $hashref ( @hashrefs ) {
+
+        push @cust_main, qsearch( {
+          'table'     => 'cust_main',
+          'hashref'   => { %$hashref,
+                           %options,
+                         },
+          'extra_sql' => " AND $agentnums_sql", #agent virtualizaiton
+        } );
+
+      }
 
       #fuzzy
-      push @cust_main, FS::cust_main->fuzzy_search(
-        { 'last'     => $value }, #fuzzy hashref
-        \%options,                #hashref
-        '',                       #select
-        " AND $agentnums_sql",    #extra_sql  #agent virtualization
-      );
-      push @cust_main, FS::cust_main->fuzzy_search(
-        { 'company'  => $value }, #fuzzy hashref
+      my @fuzopts = (
         \%options,                #hashref
         '',                       #select
         " AND $agentnums_sql",    #extra_sql  #agent virtualization
       );
 
+      if ( $first && $last ) {
+        push @cust_main, FS::cust_main->fuzzy_search(
+          { 'last'   => $last,    #fuzzy hashref
+            'first'  => $first }, #
+          @fuzopts
+        );
+      }
+      foreach my $field ( 'last', 'company' ) {
+        push @cust_main,
+          FS::cust_main->fuzzy_search( { $field => $value }, @fuzopts );
+      }
+
     }
 
     #eliminate duplicates
@@ -3986,10 +4103,12 @@ sub smart_search {
 
 =cut
 
+use vars qw(@fuzzyfields);
+@fuzzyfields = ( 'last', 'first', 'company' );
+
 sub check_and_rebuild_fuzzyfiles {
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-  -e "$dir/cust_main.last" && -e "$dir/cust_main.company"
-    or &rebuild_fuzzyfiles;
+  rebuild_fuzzyfiles() if grep { ! -e "$dir/cust_main.$_" } @fuzzyfields
 }
 
 =item rebuild_fuzzyfiles
@@ -4003,71 +4122,39 @@ sub rebuild_fuzzyfiles {
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
   mkdir $dir, 0700 unless -d $dir;
 
-  #last
-
-  open(LASTLOCK,">>$dir/cust_main.last")
-    or die "can't open $dir/cust_main.last: $!";
-  flock(LASTLOCK,LOCK_EX)
-    or die "can't lock $dir/cust_main.last: $!";
-
-  my @all_last = map $_->getfield('last'), qsearch('cust_main', {});
-  push @all_last,
-                 grep $_, map $_->getfield('ship_last'), qsearch('cust_main',{})
-    if defined dbdef->table('cust_main')->column('ship_last');
-
-  open (LASTCACHE,">$dir/cust_main.last.tmp")
-    or die "can't open $dir/cust_main.last.tmp: $!";
-  print LASTCACHE join("\n", @all_last), "\n";
-  close LASTCACHE or die "can't close $dir/cust_main.last.tmp: $!";
-
-  rename "$dir/cust_main.last.tmp", "$dir/cust_main.last";
-  close LASTLOCK;
-
-  #company
-
-  open(COMPANYLOCK,">>$dir/cust_main.company")
-    or die "can't open $dir/cust_main.company: $!";
-  flock(COMPANYLOCK,LOCK_EX)
-    or die "can't lock $dir/cust_main.company: $!";
-
-  my @all_company = grep $_ ne '', map $_->company, qsearch('cust_main',{});
-  push @all_company,
-       grep $_ ne '', map $_->ship_company, qsearch('cust_main', {})
-    if defined dbdef->table('cust_main')->column('ship_last');
+  foreach my $fuzzy ( @fuzzyfields ) {
 
-  open (COMPANYCACHE,">$dir/cust_main.company.tmp")
-    or die "can't open $dir/cust_main.company.tmp: $!";
-  print COMPANYCACHE join("\n", @all_company), "\n";
-  close COMPANYCACHE or die "can't close $dir/cust_main.company.tmp: $!";
-
-  rename "$dir/cust_main.company.tmp", "$dir/cust_main.company";
-  close COMPANYLOCK;
-
-}
-
-=item all_last
-
-=cut
+    open(LOCK,">>$dir/cust_main.$fuzzy")
+      or die "can't open $dir/cust_main.$fuzzy: $!";
+    flock(LOCK,LOCK_EX)
+      or die "can't lock $dir/cust_main.$fuzzy: $!";
+  
+    my @all = map $_->getfield($fuzzy), qsearch('cust_main', {});
+    push @all,
+      grep $_, map $_->getfield("ship_$fuzzy"), qsearch('cust_main',{});
+  
+    open (CACHE,">$dir/cust_main.$fuzzy.tmp")
+      or die "can't open $dir/cust_main.$fuzzy.tmp: $!";
+    print CACHE join("\n", @all), "\n";
+    close CACHE or die "can't close $dir/cust_main.$fuzzy.tmp: $!";
+  
+    rename "$dir/cust_main.$fuzzy.tmp", "$dir/cust_main.$fuzzy";
+    close LOCK;
+  }
 
-sub all_last {
-  my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-  open(LASTCACHE,"<$dir/cust_main.last")
-    or die "can't open $dir/cust_main.last: $!";
-  my @array = map { chomp; $_; } <LASTCACHE>;
-  close LASTCACHE;
-  \@array;
 }
 
-=item all_company
+=item all_X
 
 =cut
 
-sub all_company {
+sub all_X {
+  my( $self, $field ) = @_;
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-  open(COMPANYCACHE,"<$dir/cust_main.company")
-    or die "can't open $dir/cust_main.last: $!";
-  my @array = map { chomp; $_; } <COMPANYCACHE>;
-  close COMPANYCACHE;
+  open(CACHE,"<$dir/cust_main.$field")
+    or die "can't open $dir/cust_main.$field: $!";
+  my @array = map { chomp; $_; } <CACHE>;
+  close CACHE;
   \@array;
 }
 
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 45cb69fc2..c3d1804bc 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -64,7 +64,9 @@ if ( $cgi->param('error') ) {
   @invoicing_list = ();
 }
 $cgi->delete_all();
+
 my $action = $custnum ? 'Edit' : 'Add';
+$action .= ": ". $cust_main->name if $custnum;
 
 my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
@@ -139,7 +141,13 @@ if ( $cust_main->referral_custnum
 
   <TR>
     <TD ALIGN="right">Referring customer</TD>
-    <TD><INPUT TYPE="text" NAME="referral_custnum" VALUE=""></TD>
+    <TD>
+      <!-- <INPUT TYPE="text" NAME="referral_custnum" VALUE=""> -->
+      <%= include('/elements/search-cust_main.html',
+                    'field_name' => 'referral_custnum',
+                 )
+      %>
+    </TD>
   </TR>
 
 <% } else { %>
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 3aa81be3b..ea8c418c3 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -3,6 +3,7 @@
   my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
   my $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
   my $conf = new FS::Conf;
+
 %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
@@ -18,17 +19,22 @@
 
     <SCRIPT TYPE="text/javascript">
       function clearhint_search_cust (what) {
-        if ( what.value = '(cust #, name or company)' )
+        if ( what.value == '(cust #, name, company or phone)' )
+          what.value = '';
+      }
+
+      function clearhint_search_invoice (what) {
+        if ( what.value == '(inv #)' )
           what.value = '';
       }
 
       function clearhint_search_svc (what) {
-        if ( what.value = '(user, user@domain or domain)' )
+        if ( what.value == '(user, user@domain or domain)' )
           what.value = '';
       }
 
       function clearhint_search_ticket (what) {
-        if ( what.value = '(ticket # or subject string)' )
+        if ( what.value == '(ticket # or subject string)' )
           what.value = '';
       }
     </SCRIPT>
@@ -39,13 +45,11 @@
   <BODY BACKGROUND="<%=$fsurl%>images/background-cheat.png" <%= $etc %> STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0">
     <table width="100%" CELLPADDING=0 CELLSPACING=0 STYLE="padding-left:0; padding-right:4">
       <tr>
-        <td rowspan=2 BGCOLOR="#ffffff">
-          <IMG BORDER=0 ALT="freeside" SRC="<%=$fsurl%>images/small-logo.png">
-        </td>
+        <td rowspan=2 BGCOLOR="#ffffff"><IMG BORDER=0 ALT="freeside" SRC="<%=$fsurl%>images/small-logo.png"></td>
         <td align=left rowspan=2 BGCOLOR="#ffffff"> <!-- valign="top" -->
           <font size=6><%= $conf->config('company_name') || 'ExampleCo' %></font>
         </td>
-        <td align=right valign=top BGCOLOR="#ffffff">Logged in as <b><%= getotaker %>&nbsp</b><br><FONT SIZE="-2"><a href="<%=$fsurl%>pref/XXXwritethis">Preferences</a>&nbsp;<BR><BR></FONT>
+        <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><%= getotaker %>&nbsp</b><br></FONT><FONT SIZE="-2"><a href="<%=$fsurl%>pref/XXXwritethis">Preferences</a>&nbsp;<BR></FONT>
         </td>
       </tr>
       <tr>
@@ -77,34 +81,88 @@
       </tr>
     </table>
 
-    <TABLE WIDTH="100%" CELLSPACING=0 CELLPADDING=4>
+<style type="text/css">
+input.fsblackbutton {
+	 background-color:#333333;
+	 color: #ffffff;
+	 border:1px solid;
+	 border-top-color:#cccccc;
+	 border-left-color:#cccccc;
+	 border-right-color:#aaaaaa;
+	 border-bottom-color:#aaaaaa;
+	 font-weight:bold;
+	 padding-left:12px;
+	 padding-right:12px;
+	 overflow:visible;
+	 filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666')
+}
+
+input.fsblackbuttonselected {
+	 background-color:#7e0079;
+	 color: #ffffff;
+	 border:1px solid;
+	 border-top-color:#cccccc;
+	 border-left-color:#cccccc;
+	 border-right-color:#aaaaaa;
+	 border-bottom-color:#aaaaaa;
+	 font-weight:bold;
+	 padding-left:12px;
+	 padding-right:12px;
+	 overflow:visible;
+	 filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079')
+}
+</style>
+
+    <TABLE WIDTH="100%" CELLSPACING=0 CELLPADDING=0>
       <TR>
-        <TD COLSPAN=4 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
+        <TD COLSPAN=5 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
       </TR>
+
       <TR>
-        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right" WIDTH="15%">
+
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>edit/cust_main.cgi" METHOD="GET" STYLE="margin:0">
-            <INPUT TYPE="submit" VALUE="New customer">
+            <INPUT TYPE="submit" VALUE="New customer" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="vertical-align:bottom">
           </FORM>
         </TD>
+
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name or company)" SIZE="22" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="text-align:right">
-            <INPUT TYPE="submit" VALUE="Search customers">
+            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name, company or phone)" SIZE="28" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="vertical-align:bottom;text-align:right"><BR>
+            <A HREF="<%=$fsurl%>search/cust_main.html" STYLE="color: #000000; font-size: 70%">Advanced</A>
+            <INPUT TYPE="submit" VALUE="Search customers" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%">
           </FORM>
         </TD>
+
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
+          <% if ( $FS::CurrentUser::CurrentUser->access_right('View invoices') ) { %>
+            <FORM ACTION="<%=$fsurl%>search/cust_bill.html" METHOD="GET" STYLE="margin:0;display:inline">
+              <INPUT NAME="invnum" TYPE="text" VALUE="(inv #)" SIZE="4" onFocus="clearhint_search_invoice(this);" onClick="clearhint_search_invoice(this);" STYLE="vertical-align:bottom;text-align:right;margin-bottom:1px">
+              <% if ( $FS::CurrentUser::CurrentUser->access_right('List invoices') ) { %>
+                <A HREF="<%=$fsurl%>search/report_cust_bill.html" STYLE="color: #ffffff; font-size: 70%">Advanced</A>
+              <% } %>
+              <BR>
+              <INPUT TYPE="submit" VALUE="Search invoices" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%">
+            </FORM>
+          <% } %>
+        </TD>
+
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>search/svc_Smart.html" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="search_svc" TYPE="text" VALUE="(user, user@domain or domain)" SIZE="26" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="text-align:right">
-            <INPUT TYPE="submit" VALUE="Search services">
+            <INPUT NAME="search_svc" TYPE="text" VALUE="(user, user@domain or domain)" SIZE="26" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="vertical-align:bottom;text-align:right"><BR>
+            <A HREF="<%=$fsurl%>search/svc_Smarter.html" STYLE="color: #000000; font-size: 70%">Advanced</A>
+            <INPUT TYPE="submit" VALUE="Search services"CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%">
           </FORM>
         </TD>
-        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
+
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right" STYLE="padding-right:4px">
           <FORM ACTION="<%=$fsurl%>rt/index.html" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="q" TYPE="text" VALUE="(ticket # or subject string)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="text-align:right">
-            <INPUT TYPE="submit" VALUE="Search tickets">
+            <INPUT NAME="q" TYPE="text" VALUE="(ticket # or subject string)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="vertical-align:bottom;text-align:right"><BR>
+            <A HREF="<%=$fsurl%>rt/Search/Build.html" STYLE="color: #ffffff; font-size: 70%">Advanced</A>
+            <INPUT TYPE="submit" VALUE="Search tickets" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%;padding-left:2px;padding-right:2px">
           </FORM>
         </TD>
+
       </TR>
     </TABLE>
     <TABLE WIDTH="100%" HEIGHT="100%" CELLSPACING=0 CELLPADDING=4>
diff --git a/httemplate/elements/search-cust_main.html b/httemplate/elements/search-cust_main.html
new file mode 100644
index 000000000..ca91b4027
--- /dev/null
+++ b/httemplate/elements/search-cust_main.html
@@ -0,0 +1,163 @@
+<%
+  my( %opt ) = @_;
+  $opt{'field_name'} ||= 'custnum';
+
+  my $cust_main = '';
+  if ( $opt{'value'} ) {
+    $cust_main = qsearchs(
+      'table'     => 'cust_main',
+      'hashref'   => { 'custnum' => $opt{'value'} },
+      'extra_sql' => " AND ". $FS::CurrentUser::CurrentUser->agentnums_sql,
+    );
+  }
+%>
+
+<INPUT TYPE="hidden" NAME="<%= $opt{'field_name'} %>" VALUE="<%= $opt{'value'} %>">
+
+<!-- some false laziness w/ misc/batch-cust_pay.html, though not as bad as i'd thought at first... -->
+
+<INPUT TYPE="text" NAME="<%= $opt{'field_name'} %>_search" ID="<%= $opt{'field_name'} %>_search" SIZE="32" VALUE="<%= $cust_main ? $cust_main->name : '(cust #, name or company)' %>" onFocus="clearhint_<%= $opt{'field_name'} %>_search(this);" onClick="clearhint_<%= $opt{'field_name'} %>_search(this);" onChange="smart_<%= $opt{'field_name'} %>_search(this);">
+
+<SELECT NAME="<%= $opt{'field_name'} %>_select" ID="<%= $opt{'field_name'} %>_select" STYLE="color:#ff0000; display:none" onChange="select_<%= $opt{'field_name'} %>(this);">
+</SELECT>
+
+<%= include('/elements/xmlhttp.html',
+              'url'  => $p. 'misc/xmlhttp-cust_main-search.cgi',
+              'subs' => [ 'smart_search' ],
+           )
+%>
+
+<SCRIPT TYPE="text/javascript">
+
+  function clearhint_<%= $opt{'field_name'} %>_search (what) {
+
+    what.style.color = '#000000';
+
+    if ( what.value == '(cust #, name or company)' )
+      what.value = '';
+
+    if ( what.value.indexOf('Customer not found: ') == 0 )
+      what.value = what.value.substr(20);
+
+  }
+
+  function smart_<%= $opt{'field_name'} %>_search(what) {
+
+    var customer = what.value;
+
+    if ( customer == 'searching...' || customer == ''
+         || customer.indexOf('Customer not found: ') == 0 )
+      return;
+
+    if ( what.getAttribute('magic') == 'nosearch' ) {
+      what.setAttribute('magic', '');
+      return;
+    }
+
+    //what.value = 'searching...'
+    what.disabled = true;
+    what.style.color= '#000000';
+    what.style.backgroundColor = '#dddddd';
+
+    var customer_select = document.getElementById('<%= $opt{'field_name'} %>_select');
+
+    //alert("search for customer " + customer);
+
+    function <%= $opt{'field_name'} %>_search_update(customers) {
+
+      //alert('customers returned: ' + customers);
+
+      var customerArray = eval('(' + customers + ')');
+
+      what.disabled = false;
+      what.style.backgroundColor = '#ffffff';
+
+      if ( customerArray.length == 0 ) {
+
+        what.form.<%= $opt{'field_name'} %>.value = '';
+
+        what.value = 'Customer not found: ' + what.value;
+        what.style.color = '#ff0000';
+
+        what.style.display = '';
+        customer_select.style.display = 'none';
+
+      } else if ( customerArray.length == 1 ) {
+
+        //alert('one customer found: ' + customerArray[0]);
+
+        what.form.<%= $opt{'field_name'} %>.value = customerArray[0][0];
+        what.value = customerArray[0][1];
+
+        what.style.display = '';
+        customer_select.style.display = 'none';
+
+      } else {
+
+        //alert('multiple customers found, have to create select dropdown');
+
+        //blank the current list
+        for ( var i = customer_select.length; i >= 0; i-- )
+          customer_select.options[i] = null;
+
+        opt(customer_select, '', 'Multiple customers match "' + customer + '" - select one', '#ff0000');
+
+        //add the multiple customers
+        for ( var s = 0; s < customerArray.length; s++ )
+          opt(customer_select, customerArray[s][0], customerArray[s][1], '#000000');
+
+        opt(customer_select, 'cancel', '(Edit search string)', '#000000');
+
+        what.style.display = 'none';
+        customer_select.style.display = '';
+
+      }
+
+    }
+
+    smart_search( customer, <%= $opt{'field_name'} %>_search_update );
+
+
+  }
+
+  function select_<%= $opt{'field_name'} %> (what) {
+
+    var custnum = what.options[what.selectedIndex].value;
+    var customer = what.options[what.selectedIndex].text;
+
+    var customer_obj = document.getElementById('<%= $opt{'field_name'} %>_search');
+
+    if ( custnum == '' ) {
+      //what.style.color = '#ff0000';
+
+    } else if ( custnum == 'cancel' ) {
+
+      customer_obj.style.color = '#000000';
+
+      what.style.display = 'none';
+      customer_obj.style.display = '';
+      customer_obj.focus();
+
+    } else {
+    
+      what.form.<%= $opt{'field_name'} %>.value = custnum;
+
+      customer_obj.value = customer;
+      customer_obj.style.color = '#000000';
+
+      what.style.display = 'none';
+      customer_obj.style.display = '';
+
+    }
+
+  }
+
+  function opt(what,value,text,color) {
+    var optionName = new Option(text, value, false, false);
+    optionName.style.color = color;
+    var length = what.length;
+    what.options[length] = optionName;
+  }
+
+</SCRIPT>
+
diff --git a/rt/html/Elements/FreesideInvoiceSearch b/rt/html/Elements/FreesideInvoiceSearch
new file mode 100644
index 000000000..3842b2ff9
--- /dev/null
+++ b/rt/html/Elements/FreesideInvoiceSearch
@@ -0,0 +1,20 @@
+% if ( $FS::CurrentUser::CurrentUser->access_right('View invoices') ) {
+
+  <form action="<% $RT::URI::freeside::URL %>/search/cust_bill.html" STYLE="margin:0">
+      <SCRIPT TYPE="text/javascript">
+        function clearhint_search_invoice (what) {
+          if ( what.value == '(inv #)' )
+            what.value = '';
+        }
+      </SCRIPT>
+  <input name="invnum" accesskey="0" VALUE="(inv #)" SIZE="4" onFocus="clearhint_search_invoice(this);" onClick="clearhint_search_invoice(this);" STYLE="text-align:right; margin-bottom:1px; font-family: Arial, Verdana, Helvetica, sans-serif;">
+  
+% if ( $FS::CurrentUser::CurrentUser->access_right('List invoices') ) {
+  <A HREF="<% $RT::URI::freeside::URL %>search/report_cust_bill.html" STYLE="color: #ffffff; font-size: 70%; font-weight:normal">Advanced</A>
+% } 
+  <BR>
+  
+  <input type="submit" value="<&|/l&>Search invoices</&>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%">
+  </form>
+
+% }
diff --git a/rt/html/Elements/FreesideNewCust b/rt/html/Elements/FreesideNewCust
index af8f9f1a7..c752437da 100644
--- a/rt/html/Elements/FreesideNewCust
+++ b/rt/html/Elements/FreesideNewCust
@@ -1,3 +1,3 @@
 <form action="<% $RT::URI::freeside::URL %>/edit/cust_main.cgi" STYLE="margin:0">
-<INPUT TYPE="submit" VALUE="<&|/l&>New customer</&>">&nbsp;
+<INPUT TYPE="submit" VALUE="<&|/l&>New customer</&>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;">&nbsp;
 </FORM>
diff --git a/rt/html/Elements/FreesideSearch b/rt/html/Elements/FreesideSearch
index f0efb60d4..99b8da072 100644
--- a/rt/html/Elements/FreesideSearch
+++ b/rt/html/Elements/FreesideSearch
@@ -1,10 +1,11 @@
 <form action="<% $RT::URI::freeside::URL %>/search/cust_main.cgi" STYLE="margin:0">
     <SCRIPT TYPE="text/javascript">
       function clearhint_search_cust (what) {
-        if ( what.value = '(cust #, name or company)' )
+        if ( what.value == '(cust #, name, company or phone)' )
           what.value = '';
       }
     </SCRIPT>
-<input name="search_cust" accesskey="0" VALUE="(cust #, name or company)" SIZE="23" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="text-align:right">
-<input type="submit" value="<&|/l&>Search customers</&>">&nbsp;
+<input name="search_cust" accesskey="0" VALUE="(cust #, name, company or phone)" SIZE="28" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="text-align:right; font-family: Arial, Verdana, Helvetica, sans-serif;"><BR>
+<A HREF="<% $RT::URI::freeside::URL %>/search/cust_main.html" STYLE="color: #000000; font-size: 70%; font-weight:normal">Advanced</A>
+<input type="submit" value="<&|/l&>Search customers</&>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%">
 </form>
diff --git a/rt/html/Elements/FreesideSvcSearch b/rt/html/Elements/FreesideSvcSearch
index 47c430f1a..e9ad56426 100644
--- a/rt/html/Elements/FreesideSvcSearch
+++ b/rt/html/Elements/FreesideSvcSearch
@@ -1,10 +1,11 @@
 <form action="<% $RT::URI::freeside::URL %>/search/svc_Smart.html" STYLE="margin:0">
     <SCRIPT TYPE="text/javascript">
       function clearhint_search_svc (what) {
-        if ( what.value = '(user, user@domain or domain)' )
+        if ( what.value == '(user, user@domain or domain)' )
           what.value = '';
       }
     </SCRIPT>
-<input name="search_svc" accesskey="0" VALUE="(user, user@domain or domain)" SIZE="27" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="text-align:right">
-<input type="submit" value="<&|/l&>Search services</&>">&nbsp;
+<input name="search_svc" accesskey="0" VALUE="(user, user@domain or domain)" SIZE="26" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="text-align:right; font-family: Arial, Verdana, Helvetica, sans-serif;"><BR>
+            <A HREF="<% $RT::URI::freeside::URL %>search/svc_Smarter.html" STYLE="color: #000000; font-size: 70%; font-weight:normal">Advanced</A>
+<input type="submit" value="<&|/l&>Search services</&>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%">
 </form>
diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout
index 52353fa46..f13ee0dda 100644
--- a/rt/html/Elements/PageLayout
+++ b/rt/html/Elements/PageLayout
@@ -52,7 +52,7 @@
 %#  </th>
       <span class="topactions">
 % my $notfirst = 0; foreach my $action (sort keys %{$topactions}) {
-        <td class="blackright" ALIGN="right" <% $notfirst++ ? '' : 'WIDTH="15%"' %>>
+        <td class="blackright" ALIGN="right" VALIGN="center">
         <%$topactions->{"$action"}->{'html'} |n %>
         </td>
 % }
diff --git a/rt/html/Elements/SimpleSearch b/rt/html/Elements/SimpleSearch
index 55d65fc89..e9fc5c6ed 100644
--- a/rt/html/Elements/SimpleSearch
+++ b/rt/html/Elements/SimpleSearch
@@ -46,10 +46,11 @@
 <form action="<% $RT::WebPath %>/index.html" STYLE="margin:0">
 <SCRIPT TYPE="text/javascript">
   function clearhint_search_ticket (what) {
-    if ( what.value = '(ticket # or subject string)' )
+    if ( what.value == '(ticket # or subject string)' )
       what.value = '';
   }
 </SCRIPT>
-<input name="q" accesskey="0" VALUE="(ticket # or subject string)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="text-align:right">
-<input type="submit" value="<&|/l&>Search tickets</&>">&nbsp;
+<input name="q" accesskey="0" VALUE="(ticket # or subject string)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="text-align:right; font-family: Arial, Verdana, Helvetica, sans-serif;"><BR>
+<A HREF="<% $RT::WebPath %>/Search/Build.html" STYLE="color: #ffffff; font-size: 70%; font-weight:normal">Advanced</A>
+<input type="submit" value="<&|/l&>Search tickets</&>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%;padding-left:2px;padding-right:2px">
 </form>
diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs
index dcb652e12..721f920d5 100644
--- a/rt/html/Elements/Tabs
+++ b/rt/html/Elements/Tabs
@@ -63,9 +63,11 @@ my $basetopactions = {
 		},
 	B => { html => $m->scomp('/Elements/FreesideSearch')	
 		},
-	C => { html => $m->scomp('/Elements/FreesideSvcSearch')	
+	C => { html => $m->scomp('/Elements/FreesideInvoiceSearch')	
 		},
-	D => { html => $m->scomp('/Elements/SimpleSearch') 
+	D => { html => $m->scomp('/Elements/FreesideSvcSearch')	
+		},
+	E => { html => $m->scomp('/Elements/SimpleSearch') 
 		}
 	};
 my $basetabs = {
diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index 04c959a05..5c241f93f 100644
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -373,9 +373,44 @@ li.currenttopnav-5-major {
 	 background-color: #000000;
 	 color: #ffffff;
 	 background-position: left top;
-	 vertical-align: top;
+	 vertical-align: center;
 	 text-align: right;
+	 font-size:16px;
+	 padding-right:4px
          }
+
+input.fsblackbutton {
+	 background-color:#333333;
+	 color: #ffffff;
+	 border:1px solid;
+	 border-top-color:#cccccc;
+	 border-left-color:#cccccc;
+	 border-right-color:#aaaaaa;
+	 border-bottom-color:#aaaaaa;
+	 font-family: Arial, Verdana, Helvetica, sans-serif;
+	 font-weight:bold;
+	 padding-left:12px;
+	 padding-right:12px;
+	 overflow:visible;
+	 filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666')
+}
+
+input.fsblackbuttonselected {
+	 background-color:#7e0079;
+	 color: #ffffff;
+	 border:1px solid;
+	 border-top-color:#cccccc;
+	 border-left-color:#cccccc;
+	 border-right-color:#aaaaaa;
+	 border-bottom-color:#aaaaaa;
+	 font-family: Arial, Verdana, Helvetica, sans-serif;
+	 font-weight:bold;
+	 padding-left:12px;
+	 padding-right:12px;
+	 overflow:visible;
+	 filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079')
+}
+
 .mediumgray {
 	 background-color: #cccccc;
 	 background-position: left top;
@@ -442,7 +477,7 @@ div.downloadattachment {
 
 
 td {  font-family: Arial, Verdana, Helvetica, sans-serif;
-	 font-size: 11px;
+	 font-size: 12px;
 	 background-position: left top;
          }
 .black { background-color: #000000;
-- 
cgit v1.2.1


From 9cf3ec9dbbcb4ecc7c00b5300beb065184b448d4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Aug 2006 12:24:08 +0000
Subject: there's more, but this will have to do

---
 Changes.1.7.0 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Changes.1.7.0 b/Changes.1.7.0
index d5dcf3da7..d98273efc 100644
--- a/Changes.1.7.0
+++ b/Changes.1.7.0
@@ -14,6 +14,21 @@
 and (now they're finally here)...
 - ACLs
 - Agent virtualization
+  - customers etc.
+  - most reports
+  - just advertising sources in the config so far
+- percentage late fees in addition to flat
+- voip work
+- "referring customer #" ajax-ified
+- top search box updated some more
+- view/cust_main:
+  - customer status and balance displayed up top
+  - all the tables (tickets, packages, payment history) are grid-ified
+  - payment history only shows N years of history with link to show more
+  - simple payment actions are js popups
+  - configurable statuses and # of tickets for ticket list
+- edit/cust_main:
+  - magic ajax search box for referring customer
 
 -------- some of the above, nicely:
 
-- 
cgit v1.2.1


From 16a001f9e22bdb68e85d6c23697bfb5f7b8fa8f4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Aug 2006 13:28:56 +0000
Subject: pass email, phone and ip adderss to B:OP when doing refunds,
 hopefully this will fix OpenECHO refunds

---
 FS/FS/cust_main.pm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 7962f6dfa..95097da71 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2850,6 +2850,22 @@ sub realtime_refund_bop {
     $payname =  "$payfirst $paylast";
   }
 
+  my @invoicing_list = grep { $_ ne 'POST' } $self->invoicing_list;
+  if ( $conf->exists('emailinvoiceauto')
+       || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
+    push @invoicing_list, $self->all_emails;
+  }
+
+  my $email = ($conf->exists('business-onlinepayment-email-override'))
+              ? $conf->config('business-onlinepayment-email-override')
+              : $invoicing_list[0];
+
+  my $payip = exists($options{'payip'})
+                ? $options{'payip'}
+                : $self->payip;
+  $content{customer_ip} = $payip
+    if length($payip);
+
   my $payinfo = '';
   if ( $method eq 'CC' ) {
 
@@ -2888,6 +2904,8 @@ sub realtime_refund_bop {
     'state'          => $self->state,
     'zip'            => $self->zip,
     'country'        => $self->country,
+    'email'          => $email,
+    'phone'          => $self->daytime || $self->night,
     %content, #after
   );
   warn join('', map { "  $_ => $sub_content{$_}\n" } keys %sub_content )
-- 
cgit v1.2.1


From 04cbf1d986eabf7fdcc22ff95b95da17e5f4bf63 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Aug 2006 14:20:51 +0000
Subject: add a new, extended CSV import format

---
 FS/FS/cust_main.pm                           | 112 ++++++++++++++++++++++-----
 httemplate/misc/cust_main-import.cgi         | 102 +++++++++++++-----------
 httemplate/misc/process/cust_main-import.cgi |   5 +-
 3 files changed, 153 insertions(+), 66 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 95097da71..c40d54aac 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4230,9 +4230,33 @@ sub batch_import {
   #warn join('-',keys %$param);
   my $fh = $param->{filehandle};
   my $agentnum = $param->{agentnum};
+
   my $refnum = $param->{refnum};
   my $pkgpart = $param->{pkgpart};
-  my @fields = @{$param->{fields}};
+
+  #my @fields = @{$param->{fields}};
+  my $format = $param->{'format'};
+  my @fields;
+  my $payby;
+  if ( $format eq 'simple' ) {
+    @fields = qw( cust_pkg.setup dayphone first last
+                  address1 address2 city state zip comments );
+    $payby = 'BILL';
+  } elsif ( $format eq 'extended' ) {
+    @fields = qw( agent_custid refnum
+                  last first address1 address2 city state zip country
+                  daytime night
+                  ship_last ship_first ship_address1 ship_address2
+                  ship_city ship_state ship_zip ship_country
+                  payinfo paycvv paydate
+                  invoicing_list
+                  cust_pkg.pkgpart
+                  svc_acct.username svc_acct._password 
+                );
+    $payby = 'CARD';
+  } else {
+    die "unknown format $format";
+  }
 
   eval "use Text::CSV_XS;";
   die $@ if $@;
@@ -4271,51 +4295,99 @@ sub batch_import {
       agentnum => $agentnum,
       refnum   => $refnum,
       country  => $conf->config('countrydefault') || 'US',
-      payby    => 'BILL', #default
+      payby    => $payby, #default
       paydate  => '12/2037', #default
     );
     my $billtime = time;
     my %cust_pkg = ( pkgpart => $pkgpart );
+    my %svc_acct = ();
     foreach my $field ( @fields ) {
-      if ( $field =~ /^cust_pkg\.(setup|bill|susp|expire|cancel)$/ ) {
+
+      if ( $field =~ /^cust_pkg\.(pkgpart|setup|bill|susp|expire|cancel)$/ ) {
+
         #$cust_pkg{$1} = str2time( shift @$columns );
-        if ( $1 eq 'setup' ) {
+        if ( $1 eq 'pkgpart' ) {
+          $cust_pkg{$1} = shift @columns;
+        } elsif ( $1 eq 'setup' ) {
           $billtime = str2time(shift @columns);
         } else {
           $cust_pkg{$1} = str2time( shift @columns );
-        }
+        } 
+
+      } elsif ( $field =~ /^svc_acct\.(username|_password)$/ ) {
+
+        $svc_acct{$1} = shift @columns;
+        
       } else {
+
+        #refnum interception
+        if ( $field eq 'refnum' && $columns[0] !~ /^\s*(\d+)\s*$/ ) {
+
+          my $referral = $columns[0];
+          my $part_referral = new FS::part_referral {
+            'referral' => $referral,
+            'agentnum' => $agentnum,
+          };
+
+          my $error = $part_referral->insert;
+          if ( $error ) {
+            $dbh->rollback if $oldAutoCommit;
+            return "can't auto-insert advertising source: $referral: $error";
+          }
+          $columns[0] = $part_referral->refnum;
+        }
+
         #$cust_main{$field} = shift @$columns; 
         $cust_main{$field} = shift @columns; 
       }
     }
 
-    my $cust_pkg = new FS::cust_pkg ( \%cust_pkg ) if $pkgpart;
+    my $invoicing_list = $cust_main{'invoicing_list'}
+                           ? [ delete $cust_main{'invoicing_list'} ]
+                           : [];
+
     my $cust_main = new FS::cust_main ( \%cust_main );
+
     use Tie::RefHash;
     tie my %hash, 'Tie::RefHash'; #this part is important
-    $hash{$cust_pkg} = [] if $pkgpart;
-    my $error = $cust_main->insert( \%hash );
 
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "can't insert customer for $line: $error";
+    if ( $cust_pkg{'pkgpart'} ) {
+      my $cust_pkg = new FS::cust_pkg ( \%cust_pkg );
+
+      my @svc_acct = ();
+      if ( $svc_acct{'username'} ) {
+        $svc_acct{svcpart} = $cust_pkg->part_pkg->svcpart( 'svc_acct' );
+        push @svc_acct, new FS::svc_acct ( \%svc_acct )
+      }
+
+      $hash{$cust_pkg} = \@svc_acct;
     }
 
-    #false laziness w/bill.cgi
-    $error = $cust_main->bill( 'time' => $billtime );
+    my $error = $cust_main->insert( \%hash, $invoicing_list );
+
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return "can't bill customer for $line: $error";
+      return "can't insert customer for $line: $error";
     }
 
-    $cust_main->apply_payments;
-    $cust_main->apply_credits;
+    if ( $format eq 'simple' ) {
+
+      #false laziness w/bill.cgi
+      $error = $cust_main->bill( 'time' => $billtime );
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "can't bill customer for $line: $error";
+      }
+  
+      $cust_main->apply_payments;
+      $cust_main->apply_credits;
+  
+      $error = $cust_main->collect();
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "can't collect customer for $line: $error";
+      }
 
-    $error = $cust_main->collect();
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "can't collect customer for $line: $error";
     }
 
     $imported++;
diff --git a/httemplate/misc/cust_main-import.cgi b/httemplate/misc/cust_main-import.cgi
index 484855005..2ad4d95b4 100644
--- a/httemplate/misc/cust_main-import.cgi
+++ b/httemplate/misc/cust_main-import.cgi
@@ -1,51 +1,65 @@
-<!-- mason kludge -->
 <%= include("/elements/header.html",'Batch Customer Import') %>
+
 <FORM ACTION="process/cust_main-import.cgi" METHOD="post" ENCTYPE="multipart/form-data">
-Import a CSV file containing customer records.<BR><BR>
-Default file format is CSV, with the following field order: <i>cust_pkg.setup, dayphone, first, last, address1, address2, city, state, zip, comments</i><BR><BR>
 
-<%
-  #false laziness with edit/cust_main.cgi
-  my @agents = qsearch( 'agent', {} );
-  die "No agents created!" unless @agents;
-  my $agentnum = $agents[0]->agentnum; #default to first
+Import a CSV file containing customer records.
+<BR><BR>
+
+<!-- Simple file format is CSV, with the following field order: <i>cust_pkg.setup, dayphone, first, last, address1, address2, city, state, zip, comments</i>
+<BR><BR> -->
+
+Extended file format is CSV, with the following field order: <i>agent_custid, refnum[1], last, first, address1, address2, city, state, zip, country, daytime, night, ship_last, ship_first, ship_address1, ship_address2, ship_city, ship_state, ship_zip, ship_country, payinfo, paycvv, paydate, invoicing_list, pkgpart, username, _password</i>
+<BR><BR>
 
-  if ( scalar(@agents) == 1 ) {
+[1] This field has special treatment upon import: If a string is passed instead
+of an integer, the string is searched for and if necessary auto-created in the
+target table.
+<BR><BR>
+
+<%= &ntable("#cccccc") %>
+
+<%= include('/elements/tr-select-agent.html', '', #$agentnum,
+              'label'       => "<B>Agent</B>",
+              'empty_label' => 'Select agent',
+           )
 %>
-    <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agentnum %>">
-<% } else { %>
-    <BR><BR>Agent <SELECT NAME="agentnum" SIZE="1">
-  <% foreach my $agent (sort { $a->agent cmp $b->agent } @agents) { %>
-    <OPTION VALUE="<%= $agent->agentnum %>" <%= " SELECTED"x($agent->agentnum==$agentnum) %>><%= $agent->agent %></OPTION>
-  <% } %>
-    </SELECT><BR><BR>
-<% } %>
-
-<%
-  my @referrals = qsearch('part_referral',{});
-  die "No advertising sources created!" unless @referrals;
-  my $refnum = $referrals[0]->refnum; #default to first
-
-  if ( scalar(@referrals) == 1 ) {
+
+<TR>
+  <TH ALIGN="right">Format</TH>
+  <TD>
+    <SELECT NAME="format">
+<!--      <OPTION VALUE="simple">Simple -->
+      <OPTION VALUE="extended" SELECTED>Extended
+    </SELECT>
+  </TD>
+</TR>
+
+<TR>
+  <TH ALIGN="right">CSV filename</TH>
+  <TD><INPUT TYPE="file" NAME="csvfile"></TD>
+</TR>
+
+<% #include('/elements/tr-select-part_referral.html')
 %>
-    <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $refnum %>">
-<% } else { %>
-    <BR><BR>Advertising source <SELECT NAME="refnum" SIZE="1">
-  <% foreach my $referral ( sort { $a->referral <=> $b->referral } @referrals) { %>
-    <OPTION VALUE="<%= $referral->refnum %>" <%= " SELECTED"x($referral->refnum==$refnum) %>><%= $referral->refnum %>: <%= $referral->referral %></OPTION>
-  <% } %>
-    </SELECT><BR><BR>
-<% } %>
-
-    First package: <SELECT NAME="pkgpart"><OPTION VALUE="">(none)</OPTION>
-<% foreach my $part_pkg ( qsearch('part_pkg',{'disabled'=>'' }) ) { %>
-     <OPTION VALUE="<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkg. ' - '. $part_pkg->comment %></OPTION>
-<% } %>
-</SELECT><BR><BR>
-
-    CSV Filename: <INPUT TYPE="file" NAME="csvfile"><BR><BR>
-    <INPUT TYPE="submit" VALUE="Import">
-    </FORM>
-  </BODY>
-<HTML>
+
+<!--
+<TR>
+  <TH>First package</TH>
+  <TD>
+    <SELECT NAME="pkgpart"><OPTION VALUE="">(none)</OPTION>
+      <% foreach my $part_pkg ( qsearch('part_pkg',{'disabled'=>'' }) ) { %>
+       <OPTION VALUE="<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkg. ' - '. $part_pkg->comment %></OPTION>
+      <% } %>
+    </SELECT>
+  </TD>
+</TR>
+-->
+
+</TABLE>
+<BR><BR>
+
+<INPUT TYPE="submit" VALUE="Import">
+</FORM>
+
+<%= include('/elements/footer.html') %>
 
diff --git a/httemplate/misc/process/cust_main-import.cgi b/httemplate/misc/process/cust_main-import.cgi
index 371929a5e..aff6b39ef 100644
--- a/httemplate/misc/process/cust_main-import.cgi
+++ b/httemplate/misc/process/cust_main-import.cgi
@@ -10,8 +10,9 @@
         agentnum   => scalar($cgi->param('agentnum')),
         refnum     => scalar($cgi->param('refnum')),
         pkgpart    => scalar($cgi->param('pkgpart')),
-        'fields'    => [qw( cust_pkg.setup dayphone first last address1 address2
-                           city state zip comments                          )],
+        #'fields'    => [qw( cust_pkg.setup dayphone first last address1 address2
+        #                   city state zip comments                          )],
+        'format'   => scalar($cgi->param('format')),
       } )
     : 'No file';
 
-- 
cgit v1.2.1


From 020d74d3e1ce242990486a3fc7b61be5d666c2de Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Aug 2006 08:19:47 +0000
Subject: get rid of too-verbose debugging

---
 FS/bin/freeside-adduser | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 3976caece..b955902ba 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -27,7 +27,7 @@ if ( $opt_h ) {
   push @args, '-c' if $opt_c;
   push @args, $opt_h, $user;
   push @args, shift if $opt_b;
-  warn join(', ', 'htpasswd', @args)."\n";
+  #warn join(', ', @args)."\n";
   system(@args) == 0 or die "htpasswd failed: $?";
 }
 
-- 
cgit v1.2.1


From 8d1ba54d93d8b4b12395fcc2a45632ffa59546c5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 08:33:47 +0000
Subject: first try at skeleton feature for mg

---
 FS/FS/Conf.pm      |  14 +++++
 FS/FS/cust_main.pm | 175 +++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 157 insertions(+), 32 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 68ca49d0b..f6495119e 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1738,6 +1738,20 @@ httemplate/docs/config.html
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'cust_main-skeleton_tables',
+    'section'     => '',
+    'description' => 'Tables which will have skeleton records inserted into them for each customer.  Syntax for specifying tables is unfortunately a tricky perl data structure for now.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'cust_main-skeleton_custnum',
+    'section'     => '',
+    'description' => 'Customer number specifying the source data to copy into skeleton tables for new customers.',
+    'type'        => 'text',
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index c40d54aac..f9d7be1c8 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -416,6 +416,20 @@ sub insert {
     $self->invoicing_list( $invoicing_list );
   }
 
+  if (    $conf->config('cust_main-skeleton_tables')
+       && $conf->config('cust_main-skeleton_custnum') ) {
+
+    warn "  inserting skeleton records\n"
+      if $DEBUG > 1;
+
+    my $error = $self->start_copy_skel;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+
+  }
+
   warn "  ordering packages\n"
     if $DEBUG > 1;
 
@@ -458,6 +472,102 @@ sub insert {
 
 }
 
+sub start_copy_skel {
+  my $self = shift;
+
+  #'mg_user_preference' => {},
+  #'mg_user_indicator_profile' => { 'mg_profile_indicator' => { 'mg_profile_details' }, },
+  #'mg_watchlist_header' => { 'mg_watchlist_details' },
+  #'mg_user_grid_header' => { 'mg_user_grid_details' },
+  #'mg_portfolio_header' => { 'mg_portfolio_trades' => { 'mg_portfolio_trades_positions' } },
+  my @tables = eval($conf->config('cust_main-skeleton_tables'));
+  die $@ if $@;
+
+  _copy_skel( 'cust_main',                                 #tablename
+              $conf->config('cust_main-skeleton_custnum'), #sourceid
+              $self->custnum,                              #destid
+              @tables,                                     #child tables
+            );
+}
+
+#recursive subroutine, not a method
+sub _copy_skel {
+  my( $table, $sourceid, $destid, %child_tables ) = @_;
+
+  my $dbdef_table = dbdef->table($table);
+  my $primary_key = $dbdef_table->primary_key
+    or return "$table has no primary key".
+              " (or do you need to run dbdef-create?)";
+
+  foreach my $child_table ( keys %child_tables ) {
+
+    my $child_pkey = dbdef->table($child_table)->primary_key;
+    #  or return "$table has no primary key".
+    #            " (or do you need to run dbdef-create?)\n";
+    my $sequence = '';
+    if ( keys %{ $child_tables{$child_table} } ) {
+
+      return "$child_table has no primary key\n" unless $child_pkey;
+
+      #false laziness w/Record::insert and only works on Pg
+      #refactor the proper last-inserted-id stuff out of Record::insert if this
+      # ever gets use for anything besides a quick kludge for one customer
+      my $default = dbdef->table($child_table)->column($child_pkey)->default;
+      $default =~ /^nextval\(\(?'"?([\w\.]+)"?'/i
+        or return "can't parse $child_table.$child_pkey default value ".
+                  " for sequence name: $default";
+      $sequence = $1;
+
+    }
+  
+    my @sel_columns = grep { $_ ne $primary_key } dbdef->table($table)->columns;
+    my $sel_columns = ' ( '. join(', ', @sel_columns ). ' ) ';
+
+    my @ins_columns = grep { $_ ne $child_pkey } @sel_columns;
+    my $ins_columns = ' ( ', join(', ', $primary_key, @ins_columns ). ' ) ', 
+    my $placeholders = ' ( ?, '. join(', ', map '?', @ins_columns ). ' ) ';
+
+    my $sel_sth = dbh->prepare( "SELECT $sel_columns FROM $child_table".
+                                " WHERE $primary_key = $sourceid")
+      or return dbh->errstr;
+  
+    $sel_sth->execute or return $sel_sth->errstr;
+
+    while ( my $row = $sel_sth->fetchrow_hashref ) {
+
+      my $ins_sth =
+        dbh->prepare("INSERT INTO $child_table $ins_columns".
+                     " VALUES $placeholders")
+          or return dbh->errstr;
+      $ins_sth->execute( $destid, map $row->{$_}, @ins_columns )
+        or return $ins_sth->errstr;
+
+      #next unless keys %{ $child_tables{$child_table} };
+      next unless $sequence;
+      
+      #another section of that laziness
+      my $seq_sql = "SELECT currval('$sequence')";
+      my $seq_sth = dbh->prepare($seq_sql) or return dbh->errstr;
+      $seq_sth->execute or return $seq_sth->errstr;
+      my $insertid = $seq_sth->fetchrow_arrayref->[0];
+  
+      # don't drink soap!  recurse!  recurse!  okay!
+      my $error =
+        _copy_skel( $child_table,
+                    $row->{$child_pkey}, #sourceid
+                    $insertid, #destid
+                    %{ $child_tables{$child_table} },
+                  );
+      return $error if $error;
+
+    }
+
+  }
+
+  return '';
+
+}
+
 =item order_pkgs HASHREF, [ SECONDSREF, [ , OPTION => VALUE ... ] ]
 
 Like the insert method on an existing record, this method orders a package
@@ -1023,15 +1133,19 @@ sub queue_fuzzyfiles_update {
   my $dbh = dbh;
 
   my $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
-  my $error = $queue->insert($self->getfield('last'), $self->company);
+  my $error = $queue->insert( map $self->getfield($_),
+                                  qw(first last company)
+                            );
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return "queueing job (transaction rolled back): $error";
   }
 
-  if ( defined $self->dbdef_table->column('ship_last') && $self->ship_last ) {
+  if ( $self->ship_last ) {
     $queue = new FS::queue { 'job' => 'FS::cust_main::append_fuzzyfiles' };
-    $error = $queue->insert($self->getfield('ship_last'), $self->ship_company);
+    $error = $queue->insert( map $self->getfield("ship_$_"),
+                                 qw(first last company)
+                           );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "queueing job (transaction rolled back): $error";
@@ -4146,14 +4260,21 @@ sub rebuild_fuzzyfiles {
       or die "can't open $dir/cust_main.$fuzzy: $!";
     flock(LOCK,LOCK_EX)
       or die "can't lock $dir/cust_main.$fuzzy: $!";
-  
-    my @all = map $_->getfield($fuzzy), qsearch('cust_main', {});
-    push @all,
-      grep $_, map $_->getfield("ship_$fuzzy"), qsearch('cust_main',{});
-  
+
     open (CACHE,">$dir/cust_main.$fuzzy.tmp")
       or die "can't open $dir/cust_main.$fuzzy.tmp: $!";
-    print CACHE join("\n", @all), "\n";
+
+    foreach my $field ( $fuzzy, "ship_$fuzzy" ) {
+      my $sth = dbh->prepare("SELECT $field FROM cust_main".
+                             " WHERE $field != '' AND $field IS NOT NULL");
+      $sth->execute or die $sth->errstr;
+
+      while ( my $row = $sth->fetchrow_arrayref ) {
+        print CACHE $row->[0]. "\n";
+      }
+
+    } 
+
     close CACHE or die "can't close $dir/cust_main.$fuzzy.tmp: $!";
   
     rename "$dir/cust_main.$fuzzy.tmp", "$dir/cust_main.$fuzzy";
@@ -4181,7 +4302,7 @@ sub all_X {
 =cut
 
 sub append_fuzzyfiles {
-  my( $last, $company ) = @_;
+  #my( $first, $last, $company ) = @_;
 
   &check_and_rebuild_fuzzyfiles;
 
@@ -4189,33 +4310,23 @@ sub append_fuzzyfiles {
 
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
 
-  if ( $last ) {
-
-    open(LAST,">>$dir/cust_main.last")
-      or die "can't open $dir/cust_main.last: $!";
-    flock(LAST,LOCK_EX)
-      or die "can't lock $dir/cust_main.last: $!";
-
-    print LAST "$last\n";
+  foreach my $field (qw( first last company )) {
+    my $value = shift;
 
-    flock(LAST,LOCK_UN)
-      or die "can't unlock $dir/cust_main.last: $!";
-    close LAST;
-  }
-
-  if ( $company ) {
+    if ( $value ) {
 
-    open(COMPANY,">>$dir/cust_main.company")
-      or die "can't open $dir/cust_main.company: $!";
-    flock(COMPANY,LOCK_EX)
-      or die "can't lock $dir/cust_main.company: $!";
+      open(CACHE,">>$dir/cust_main.$field")
+        or die "can't open $dir/cust_main.$field: $!";
+      flock(CACHE,LOCK_EX)
+        or die "can't lock $dir/cust_main.$field: $!";
 
-    print COMPANY "$company\n";
+      print CACHE "$value\n";
 
-    flock(COMPANY,LOCK_UN)
-      or die "can't unlock $dir/cust_main.company: $!";
+      flock(CACHE,LOCK_UN)
+        or die "can't unlock $dir/cust_main.$field: $!";
+      close CACHE;
+    }
 
-    close COMPANY;
   }
 
   1;
-- 
cgit v1.2.1


From 44c2490342f14b64acbd9fce3bf7df8df4e64aff Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 09:50:03 +0000
Subject: add debugging to _copy_skel to get some idea what's going on

---
 FS/FS/cust_main.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index f9d7be1c8..2617d10b0 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -499,6 +499,10 @@ sub _copy_skel {
     or return "$table has no primary key".
               " (or do you need to run dbdef-create?)";
 
+  warn "  _copy_skel: $table.$primary_key $sourceid to $destid for ".
+       join (', ', keys %child_tables). "\n"
+    if $DEBUG > 2;
+
   foreach my $child_table ( keys %child_tables ) {
 
     my $child_pkey = dbdef->table($child_table)->primary_key;
-- 
cgit v1.2.1


From 7bac56be80a6323073566c6e3c0d87c90801036b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 09:58:11 +0000
Subject: oops, want CHILD table for skeleton inserts, not parent

---
 FS/FS/cust_main.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2617d10b0..270c544ef 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -524,7 +524,8 @@ sub _copy_skel {
 
     }
   
-    my @sel_columns = grep { $_ ne $primary_key } dbdef->table($table)->columns;
+    my @sel_columns = grep { $_ ne $primary_key }
+                           dbdef->table($child_table)->columns;
     my $sel_columns = ' ( '. join(', ', @sel_columns ). ' ) ';
 
     my @ins_columns = grep { $_ ne $child_pkey } @sel_columns;
-- 
cgit v1.2.1


From 99c0907183fd9fbfb62a9dbd27d72013a95ca64a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 10:00:20 +0000
Subject: skeleton typo

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 270c544ef..a52145b19 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -529,7 +529,7 @@ sub _copy_skel {
     my $sel_columns = ' ( '. join(', ', @sel_columns ). ' ) ';
 
     my @ins_columns = grep { $_ ne $child_pkey } @sel_columns;
-    my $ins_columns = ' ( ', join(', ', $primary_key, @ins_columns ). ' ) ', 
+    my $ins_columns = ' ( '. join(', ', $primary_key, @ins_columns ). ' ) ';
     my $placeholders = ' ( ?, '. join(', ', map '?', @ins_columns ). ' ) ';
 
     my $sel_sth = dbh->prepare( "SELECT $sel_columns FROM $child_table".
-- 
cgit v1.2.1


From 3500f6c6f1c42b39139cdedc12dc96ee5f6b8e57 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 10:10:33 +0000
Subject: what's going on with the parameters for skeleton inserts??

---
 FS/FS/cust_main.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a52145b19..59295f3ee 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -540,11 +540,14 @@ sub _copy_skel {
 
     while ( my $row = $sel_sth->fetchrow_hashref ) {
 
-      my $ins_sth =
-        dbh->prepare("INSERT INTO $child_table $ins_columns".
-                     " VALUES $placeholders")
+      my $statement =
+        "INSERT INTO $child_table $ins_columns VALUES $placeholders";
+      my $ins_sth =dbh->prepare($statement)
           or return dbh->errstr;
-      $ins_sth->execute( $destid, map $row->{$_}, @ins_columns )
+      my @param = ( $destid, map $row->{$_}, @ins_columns );
+      warn "    $statement: [ ". join(', ', @param). " ]\n"
+        if $DEBUG > 2;
+      $ins_sth->execute( @param )
         or return $ins_sth->errstr;
 
       #next unless keys %{ $child_tables{$child_table} };
-- 
cgit v1.2.1


From a54563b7d5cbac55d89ddd1f11e6c9a12c46b6f1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 10:18:13 +0000
Subject: even more skeleton debugging, ugh

---
 FS/FS/cust_main.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 59295f3ee..73afe2183 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -540,6 +540,10 @@ sub _copy_skel {
 
     while ( my $row = $sel_sth->fetchrow_hashref ) {
 
+      warn "    selected row: ".
+           join(', ', map { "$_=".$row->{$_} } keys %$row ). "\n"
+        if $DEBUG > 2;
+
       my $statement =
         "INSERT INTO $child_table $ins_columns VALUES $placeholders";
       my $ins_sth =dbh->prepare($statement)
-- 
cgit v1.2.1


From a131a3f3f8872ba175d4e213aac25624616e3b7d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 10:26:29 +0000
Subject: W T F

---
 FS/FS/cust_main.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 73afe2183..b7545dee7 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -532,8 +532,11 @@ sub _copy_skel {
     my $ins_columns = ' ( '. join(', ', $primary_key, @ins_columns ). ' ) ';
     my $placeholders = ' ( ?, '. join(', ', map '?', @ins_columns ). ' ) ';
 
-    my $sel_sth = dbh->prepare( "SELECT $sel_columns FROM $child_table".
-                                " WHERE $primary_key = $sourceid")
+    my $sel_st = "SELECT $sel_columns FROM $child_table".
+                 " WHERE $primary_key = $sourceid";
+    warn "    $sel_st\n"
+      if $DEBUG > 2;
+    my $sel_sth = dbh->prepare( $sel_st )
       or return dbh->errstr;
   
     $sel_sth->execute or return $sel_sth->errstr;
-- 
cgit v1.2.1


From 78b0e4c62ec84a5e4082ee3d73f9825e498d3462 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 10:27:46 +0000
Subject: that was it, the sql had to be fixed...

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b7545dee7..94564dc80 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -526,7 +526,7 @@ sub _copy_skel {
   
     my @sel_columns = grep { $_ ne $primary_key }
                            dbdef->table($child_table)->columns;
-    my $sel_columns = ' ( '. join(', ', @sel_columns ). ' ) ';
+    my $sel_columns = join(', ', @sel_columns );
 
     my @ins_columns = grep { $_ ne $child_pkey } @sel_columns;
     my $ins_columns = ' ( '. join(', ', $primary_key, @ins_columns ). ' ) ';
-- 
cgit v1.2.1


From 25e1618079cfd1001b71288e2504e9eeb8887c05 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 10:31:41 +0000
Subject: want ALL of cust_main-skeleton tables config, not just the first line

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 94564dc80..8b0f1b5b4 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -480,7 +480,7 @@ sub start_copy_skel {
   #'mg_watchlist_header' => { 'mg_watchlist_details' },
   #'mg_user_grid_header' => { 'mg_user_grid_details' },
   #'mg_portfolio_header' => { 'mg_portfolio_trades' => { 'mg_portfolio_trades_positions' } },
-  my @tables = eval($conf->config('cust_main-skeleton_tables'));
+  my @tables = eval($conf->config_binary('cust_main-skeleton_tables'));
   die $@ if $@;
 
   _copy_skel( 'cust_main',                                 #tablename
-- 
cgit v1.2.1


From a5fa93bd476f0f0e2c4ca265dc5a1ab20f7d26dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 10:34:44 +0000
Subject: suggestion to run dbdef-create here, yes...

---
 FS/FS/cust_main.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8b0f1b5b4..f7e16cfd3 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -511,7 +511,8 @@ sub _copy_skel {
     my $sequence = '';
     if ( keys %{ $child_tables{$child_table} } ) {
 
-      return "$child_table has no primary key\n" unless $child_pkey;
+      return "$child_table has no primary key".
+             " (or do you need to run dbdef-create?)\n" unless $child_pkey;
 
       #false laziness w/Record::insert and only works on Pg
       #refactor the proper last-inserted-id stuff out of Record::insert if this
-- 
cgit v1.2.1


From 893ba3c4c659154ec34d30fb96853977a4479f09 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 11:36:57 +0000
Subject: allow explicitly specified primary keys (to get around big 8.1 Pg
 changes wrt reverse engineering

---
 FS/FS/cust_main.pm | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index f7e16cfd3..07b2c1157 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -476,10 +476,10 @@ sub start_copy_skel {
   my $self = shift;
 
   #'mg_user_preference' => {},
-  #'mg_user_indicator_profile' => { 'mg_profile_indicator' => { 'mg_profile_details' }, },
-  #'mg_watchlist_header' => { 'mg_watchlist_details' },
-  #'mg_user_grid_header' => { 'mg_user_grid_details' },
-  #'mg_portfolio_header' => { 'mg_portfolio_trades' => { 'mg_portfolio_trades_positions' } },
+  #'mg_user_indicator_profile.user_indicator_profile_id' => { 'mg_profile_indicator.profile_indicator_id' => { 'mg_profile_details.profile_detail_id' }, },
+  #'mg_watchlist_header.watchlist_header_id' => { 'mg_watchlist_details.watchlist_details_id' },
+  #'mg_user_grid_header.grid_header_id' => { 'mg_user_grid_details.user_grid_details_id' },
+  #'mg_portfolio_header.portfolio_header_id' => { 'mg_portfolio_trades.portfolio_trades_id' => { 'mg_portfolio_trades_positions.portfolio_trades_positions_id' } },
   my @tables = eval($conf->config_binary('cust_main-skeleton_tables'));
   die $@ if $@;
 
@@ -494,25 +494,40 @@ sub start_copy_skel {
 sub _copy_skel {
   my( $table, $sourceid, $destid, %child_tables ) = @_;
 
-  my $dbdef_table = dbdef->table($table);
-  my $primary_key = $dbdef_table->primary_key
-    or return "$table has no primary key".
-              " (or do you need to run dbdef-create?)";
+  my $primary_key;
+  if ( $table =~ /^(\w+)\.(\w+)$/ ) {
+    ( $table, $primary_key ) = ( $1, $2 );
+  } else {
+    my $dbdef_table = dbdef->table($table);
+    $primary_key = $dbdef_table->primary_key
+      or return "$table has no primary key".
+                " (or do you need to run dbdef-create?)";
+  }
 
   warn "  _copy_skel: $table.$primary_key $sourceid to $destid for ".
        join (', ', keys %child_tables). "\n"
     if $DEBUG > 2;
 
-  foreach my $child_table ( keys %child_tables ) {
+  foreach my $child_table_def ( keys %child_tables ) {
+
+    my $child_table;
+    my $child_pkey = '';
+    if ( $child_table =~ /^(\w+)\.(\w+)$/ ) {
+      ( $child_table, $child_pkey ) = ( $1, $2 );
+    } else {
+      $child_table = $child_table_def;
+
+      $child_pkey = dbdef->table($child_table)->primary_key;
+      #  or return "$table has no primary key".
+      #            " (or do you need to run dbdef-create?)\n";
+    }
 
-    my $child_pkey = dbdef->table($child_table)->primary_key;
-    #  or return "$table has no primary key".
-    #            " (or do you need to run dbdef-create?)\n";
     my $sequence = '';
     if ( keys %{ $child_tables{$child_table} } ) {
 
       return "$child_table has no primary key".
-             " (or do you need to run dbdef-create?)\n" unless $child_pkey;
+             " (run dbdef-create or try specifying it?)\n"
+        unless $child_pkey;
 
       #false laziness w/Record::insert and only works on Pg
       #refactor the proper last-inserted-id stuff out of Record::insert if this
@@ -572,7 +587,7 @@ sub _copy_skel {
         _copy_skel( $child_table,
                     $row->{$child_pkey}, #sourceid
                     $insertid, #destid
-                    %{ $child_tables{$child_table} },
+                    %{ $child_tables{$child_table_def} },
                   );
       return $error if $error;
 
-- 
cgit v1.2.1


From bde46a1e81ab59c0068399903c5efe30c9ffc618 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 11:40:34 +0000
Subject: fix the  explicitly specified primary keys

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 07b2c1157..e2bc95f70 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -512,7 +512,7 @@ sub _copy_skel {
 
     my $child_table;
     my $child_pkey = '';
-    if ( $child_table =~ /^(\w+)\.(\w+)$/ ) {
+    if ( $child_table_def =~ /^(\w+)\.(\w+)$/ ) {
       ( $child_table, $child_pkey ) = ( $1, $2 );
     } else {
       $child_table = $child_table_def;
-- 
cgit v1.2.1


From 960253f3d34e0e782214b47cf4b71b3178360ffa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 11:52:13 +0000
Subject: alas, now try with recursion

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index e2bc95f70..75ad1ef5c 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -523,7 +523,7 @@ sub _copy_skel {
     }
 
     my $sequence = '';
-    if ( keys %{ $child_tables{$child_table} } ) {
+    if ( keys %{ $child_tables{$child_table_def} } ) {
 
       return "$child_table has no primary key".
              " (run dbdef-create or try specifying it?)\n"
-- 
cgit v1.2.1


From aa69b255a6b5abe6117ad864b7521d498a618a3c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 11:56:26 +0000
Subject: pass through the explicitly specified pkeys

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 75ad1ef5c..fd66f145c 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -584,7 +584,7 @@ sub _copy_skel {
   
       # don't drink soap!  recurse!  recurse!  okay!
       my $error =
-        _copy_skel( $child_table,
+        _copy_skel( $child_table_def,
                     $row->{$child_pkey}, #sourceid
                     $insertid, #destid
                     %{ $child_tables{$child_table_def} },
-- 
cgit v1.2.1


From 96301defaaafd4260c7282a3a4e1b4d29fcd85c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Aug 2006 12:18:19 +0000
Subject: and a slight fix to the CSV import

---
 FS/FS/cust_main.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index fd66f145c..96241801e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4395,7 +4395,7 @@ sub batch_import {
                   cust_pkg.pkgpart
                   svc_acct.username svc_acct._password 
                 );
-    $payby = 'CARD';
+    $payby = 'BILL';
   } else {
     die "unknown format $format";
   }
@@ -4484,6 +4484,8 @@ sub batch_import {
       }
     }
 
+    $cust_main{'payby'} = 'CARD' if length($cust_main{'payinfo'});
+
     my $invoicing_list = $cust_main{'invoicing_list'}
                            ? [ delete $cust_main{'invoicing_list'} ]
                            : [];
-- 
cgit v1.2.1


From 0a632c6bfa376fbcfdf311122669991565877d2b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Aug 2006 09:47:49 +0000
Subject: we're off to see the wiki, the wonderful wiki of oz

---
 httemplate/docs/index.html      |   2 +-
 httemplate/docs/install-rt.html |  78 ------------------
 httemplate/docs/install.html    | 173 ----------------------------------------
 3 files changed, 1 insertion(+), 252 deletions(-)
 delete mode 100644 httemplate/docs/install-rt.html
 delete mode 100644 httemplate/docs/install.html

diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index 1693b6d9b..ee290ee0f 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -7,7 +7,7 @@
 <h3>Installation and upgrades</h3>
 <ul>
   <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Installation">New Installation</a>
-  <li><a href="install-rt.html">Installing integrated RT ticketing</a>
+  <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:RT_Installation">Installing integrated RT ticketing</a>
   <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
   <li><a href="upgrade-1.4.2.html">Upgrading from 1.4.1 to 1.4.2</a>
   <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2) to 1.5.8</a>
diff --git a/httemplate/docs/install-rt.html b/httemplate/docs/install-rt.html
deleted file mode 100644
index da0941a09..000000000
--- a/httemplate/docs/install-rt.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<head>
-  <title>Installing integrated RT ticketing</title>
-</head>
-<body>
-<h1>Installing integrated RT ticketing</h1>
-
-<p><i>Integrated ticketing is an new feature and these instructions are preliminary.  Documentation contributions are welcome.</i>
-
-<p><i>There is also support for running this integration against an external RT installation, but it is not (yet) documented.</i>
-
-<p>Perl minimum version 5.8.3 is required.  HTML::Mason is required.
-
-<p>Install the following perl modules:
-  <ul>
-    <li><a href="http://search.cpan.org/search?dist=Apache-Session">Apache::Session</a>
-    <li><a href="http://search.cpan.org/search?dist=HTML-Tree">HTML::TreeBuilder (HTML-Tree)</a>
-    <li><a href="http://search.cpan.org/search?dist=HTML-Format">HTML::FormatText (HTML-Format)</a>
-    <li><a href="http://search.cpan.org/search?dist=Test-Inline">Test::Inline</a>
-    <li><a href="http://search.cpan.org/search?dist=Class-ReturnValue">Class::ReturnValue</a>
-    <li><a href="http://search.cpan.org/search?dist=DBIx-SearchBuilder">DBIx::SearchBuilder</a>
-    <li><a href="http://search.cpan.org/search?dist=Log-Dispatch">Log::Dispatch</a>
-    <li><a href="http://search.cpan.org/search?dist=Locale-Maketext-Lexicon">Locale::Maketext::Lexicon</a>
-    <li><a href="http://search.cpan.org/search?dist=Locale-Maketext-Fuzzy">Locale::Maketext::Fuzzy</a>
-    <li><a href="http://search.cpan.org/search?dist=Text-Wrapper">Text::Wrapper</a>
-    <li><a href="http://search.cpan.org/search?dist=Time-modules">Time::ParseDate (Time-modules)</a>
-    <li><a href="http://search.cpan.org/search?dist=TermReadKey">Term::ReadKey (TermReadKey)</a>
-    <li><a href="http://search.cpan.org/search?dist=Text-Autoformat">Text::Autoformat</a>
-    <li><a href="http://search.cpan.org/search?dist=Text-Quoted">Text::Quoted</a>
-    <li><a href="http://search.cpan.org/search?dist=Regexp-Common">Regexp::Common</a>
-    <li><a href="http://search.cpan.org/search?dist=HTML-Scrubber">HTML::Scrubber</a>
-    <li><a href="http://search.cpan.org/search?dist=Tree-Simple">Tree::Simple</a>
-  </ul>
-
-<p>Create a new Unix group called 'rt'
-
-<p>Edit the top-level Makefile, set RT_ENABLED to 1 and set the RT_DOMAIN, RT_TIMEZONE, and FREESIDE_URL variables.
-
-<p><pre>make configure-rt
-make create-rt
-make install-rt
-</pre>
-
-<p>Add the following to your httpd.conf:
-<pre>
-# replace /var/www/freeside with your freeside document root
-&lt;DirectoryMatch "^/var/www/freeside/rt/.*NoAuth"&gt;
-&lt;Limit GET POST&gt;
-allow from all
-Satisfy any   
-SetHandler perl-script
-PerlHandler HTML::Mason
-&lt;/Limit&gt;
-&lt;/DirectoryMatch&gt;
-# replace /var/www/freeside with your freeside document root
-&lt;DirectoryMatch "^/var/www/freeside/rt/.*NoAuth/images"&gt;
-SetHandler None
-&lt;/DirectoryMatch&gt;
-# replace /var/www/freeside with your freeside document root
-&lt;Directory /var/www/freeside/rt/Ticket/Attachment&gt; 
-SetHandler perl-script 
-PerlHandler HTML::Mason 
-&lt;/Directory&gt;
-</pre>
-
-<p>Set the <b>ticket_system</b> configuration value to <b>RT_Internal</b>.  You may also wish to set <b>ticket_system-default_queueid</b> once you have RT configured.
-
-<p>Bootstrap RT's permissions:
-  <ul>
-    <li>Click on "Ticketing Main" on the Freeside main menu to auto-create an RT login for your username
-    <li>Run <code>freeside-adduser -h /usr/local/etc/freeside/htpasswd root</code> and set a (temporary) password
-    <li>Log into your Freeside installation as the "root" user you just created, by closing your browser or using <code>https://root@yourmachone/freeside/</code> syntax.
-    <li>Click on "Ticketing Main" on the Freeside main menu.  Click on "Configuration", then "Global", and then "User Rights".  Grant the "SuperUser" right to your RT login.
-    <li>Remove the temporary "root" user from /usr/local/etc/freeside/mapsecrets and /usr/local/etc/freeside/htpasswd
-  </ul>
-
-<p>Follow the <A HREF="http://wiki.bestpractical.com/">regular RT documentation</A> to configure RT, setup the mailgate, etc.
-
-</body>
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
deleted file mode 100644
index 78172e8e4..000000000
--- a/httemplate/docs/install.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<head>
-  <title>Installation</title>
-</head>
-<body>
-<h1>Installation</h1>
-<i>Note: Install Freeside on a firewalled, private server, not a public (web, RADIUS, etc.) server.</i><br><br>
-Before installing, you need:
-<ul>
-  <li><a href="http://www.perl.com/">Perl</a>, minimum version 5.005_03. (5.8.3 for the integrated RT ticketing)
-  <li><a href="http://www.apache.org">Apache</a> (<a href="http://www.modssl.org/">mod_ssl</a> or <a href="http://www.apache-ssl.org">Apache-SSL</a> highly recommended)
-  <li><a href="http://perl.apache.org/">mod_perl</a> (if compiling your own mod_perl, make sure you set the <a href="http://perl.apache.org/guide/install.html#EVERYTHING">EVERYTHING</a>=1 compile-time option)
-  <li><a href="http://www.openssh.com/">SSH</a> (<a href="http://www.openssh.com//">OpenSSH</a> is recommended.  SSH Communications Security <a href="http://www.ssh.com/products/ssh/download.cfm">commercial SSH version 3</a> has been reported incompatible with Freeside.)
-  <li><a href="http://rsync.samba.org/">rsync</a>
-  <li>Optional, enables typeset invoices: teTeX and Ghostscript (included with most distributions).
-  <li>A <b>transactional</b> database engine <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">supported</a> by Perl's <a href="http://dbi.perl.org">DBI</a>.
-    <ul>
-      <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended (v7.2 or later, 7.4 or later recommended).
-      <li> <a href="http://www.mysql.com/">MySQL</a> is <b>not currently supported</b>.  <FONT SIZE="-1"><i>Developers intersted in maintaining MySQL support are welcome to ask on the -devel mailing list; many things work, but MySQL support needs a maintainer to update it for recent (and future) changes.</i></FONT>
-      <!-- <li><a href="http://www.mysql.com/">MySQL</a> <b>MINIMUM VERSION 4.1</b> is untested but may work.   Versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.
-<!--       <li>MySQL has been reported to work.
-         MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported.  You <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>.  Set it as the default table type using the <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
--->
-    </ul>
-    <i>Note: the above only applies to the database used by the Freeside software itself. Freeside can integrate with RADIUS and other servers running MySQL <!--(any version)--> or any other DBI-supported database.</i>
-  <li>Perl modules (<a href="http://search.cpan.org/~andk/CPAN/lib/CPAN.pm">CPAN</a> will query, download and build perl modules automatically)
-    <ul>
-<!--      <li><a href="http://search.cpan.org/dist/Array-PrintCols">Array-PrintCols</a>
-      <li><a href="http://search.cpan.org/dist/Term-Query">Term-Query</a> (make test broken; install manually) -->
-      <li><a href="http://search.cpan.org/dist/MIME-Base64">MIME-Base64</a>
-      <li><a href="http://search.cpan.org/dist/Digest-MD5">Digest-MD5</a>
-<!--      <li><a href="http://search.cpan.org/dist/MD5">MD5</a> -->
-      <li><a href="http://search.cpan.org/dist/URI">URI</a>
-      <li><a href="http://search.cpan.org/dist/HTML-Tagset">HTML-Tagset</a>
-      <li><a href="http://search.cpan.org/dist/HTML-Parser">HTML-Parser</a>
-      <li><a href="http://search.cpan.org/dist/libnet">libnet</a>
-      <li><a href="http://search.cpan.org/dist/Locale-Codes">Locale-Codes</a>
-      <li><a href="http://search.cpan.org/dist/Net-Whois-Raw">Net-Whois-Raw</a>
-      <li><a href="http://search.cpan.org/dist/libwww-perl">libwww-perl</a>
-      <li><a href="http://search.cpan.org/dist/Business-CreditCard">Business-CreditCard</a>
-<!--      <li><a href="http://search.cpan.org/dist/Data-ShowTable">Data-ShowTable</a> -->
-      <li><a href="http://search.cpan.org/dist/MailTools">MailTools</a>
-      <li><a href="http://search.cpan.org/dist/TimeDate">TimeDate</a>
-      <li><a href="http://search.cpan.org/dist/DateManip">DateManip</a>
-      <li><a href="http://search.cpan.org/dist/File-CounterFile">File-CounterFile</a>
-      <li><a href="http://search.cpan.org/dist/FreezeThaw">FreezeThaw</a>
-      <li><a href="http://search.cpan.org/dist/String-Approx">String-Approx</a>
-      <li><a href="http://search.cpan.org/dist/Text-Template">Text-Template</a>
-      <li><a href="http://search.cpan.org/dist/DBI">DBI</a>
-      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/dist/DBD-Pg">DBD::Pg</a> for PostgreSQL<!--, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL-->)
-<!--      <li><a href="http://search.cpan.org/dist/DBIx-DataSource">DBIx-DataSource</a> -->
-      <li><a href="http://search.cpan.org/dist/DBIx-DBSchema">DBIx-DBSchema</a>
-      <li><a href="http://search.cpan.org/dist/Net-SSH">Net-SSH</a>
-      <li><a href="http://search.cpan.org/dist/String-ShellQuote">String-ShellQuote</a>
-      <li><a href="http://search.cpan.org/dist/Net-SCP">Net-SCP</a>
-      <li><a href="http://www.masonhq.com/">HTML::Mason</a>
-      <li><a href="http://search.cpan.org/dist/Tie-IxHash">Tie-IxHash</a>
-      <li><a href="http://search.cpan.org/dist/Time-Duration">Time-Duration</a>
-      <li><a href="http://search.cpan.org/dist/HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
-      <li><a href="http://search.cpan.org/dist/Storable">Storable</a>
-      <li><a href="http://search.cpan.org/dist/Cache-Cache">Cache::Cache</a>
-      <li><a href="http://search.cpan.org/dist/NetAddr-IP">NetAddr-IP</a>
-      <li><a href="http://search.cpan.org/dist/Chart">Chart</a>
-      <li><a href="http://search.cpan.org/dist/Crypt-PasswdMD5">Crypt::PasswdMD5</a>
-      <li><a href="http://search.cpan.org/dist/Locale-SubCountry">Locale::SubCountry</a>
-      <li><a href="http://search.cpan.org/dist/Frontier-RPC">Frontier::RPC</a>
-      <li><a href="http://search.cpan.org/dist/Text-CSV_XS">Text::CSV_XS</a>
-      <li><a href="http://search.cpan.org/dist/Spreadsheet-WriteExcel">Spreadsheet::WriteExcel</a>
-      <li><a href="http://search.cpan.org/dist/IO-stringy">IO-stringy (IO::Scalar)</a>
-      <li><a href="http://search.cpan.org/dist/Frontier-RPC">Frontier::RPC (Frontier::RPC2)</a>
-      <li><a href="http://search.cpan.org/dist/MIME-tools">MIME::Entity (MIME-tools)</a>
-      <li><a href="http://search.cpan.org/dist/IPC-Run3">IPC::Run3</a>
-      <li><a href="http://search.cpan.org/dist/Term-ReadKey">Term::ReadKey</a>
-<!--      <li><a href="http://search.cpan.org/dist/Crypt-YAPassGen">Crypt::YAPassGen</a> -->
-      <li><a href="http://search.cpan.org/dist/JSON">JSON</a>
-      <li><a href="http://search.cpan.org/search?mode=module&query=MIME::Entity">Fax::Hylafax::Client</a> <i>(Required if using FAX invoice destinations)</i>
-      <li><a href="http://search.cpan.org/dist/ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
-    </ul>
-</ul>
-Install the Freeside distribution:
-<ul>
-  <li>Add the user and group `freeside' to your system.
-  <li>Allow the freeside user full access to the freeside database.
-    <ul>
-      <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>:
-        <pre>
-$ su postgres (pgsql on some distributions)
-$ createuser -P freeside
-Enter password for user "freeside": 
-Enter it again: 
-Shall the new user be allowed to create databases? (y/n) y
-Shall the new user be allowed to create more new users? (y/n) n
-CREATE USER</pre>
-      <li> with <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#User_Account_Management">MySQL</a>:
-        <pre>
-$ mysqladmin -u root password '<i>set_a_root_database_password</i>'
-$ mysql -u root -p
-mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* TO freeside@localhost IDENTIFIED BY '<i>set_a_freeside_database_password</i>';</pre>
-    </ul>
-<!--  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>-->
-  <li>Edit the top-level Makefile:
-    <ul>
-      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:dbname=freeside</tt> for PostgresSQL or <tt>DBI:mysql:freeside</tt> for MySQL.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
-      <li>Set <tt>DB_PASSWORD</tt> to the freeside database user's password.
-    </ul>
-  <li>Add the freeside database to your database engine:
-    <ul>
-      <li>with Postgres:
-        <pre>
-$ su freeside
-$ createdb -E sql_ascii freeside</pre>
-      <li>with MySQL:
-        <pre>
-$ mysqladmin -u freeside -p create freeside </pre>
-    </ul>
-  <li>Build and install the Perl modules:
-    <pre>
-$ make perl-modules
-$ su
-# make install-perl-modules</pre>
-    <li>Create the necessary configuration files:<pre>
-$ su
-# make create-config
-</pre>
-    <li>Run a <b>separate</b> iteration of Apache[-SSL] with mod_perl enabled <b>as the freeside user</b>.
-    <li>Edit the <tt>Makefile</tt> and set <tt>TEMPLATE</tt> to <tt>asp</tt> or <tt>mason</tt>.  Also set <tt>FREESIDE_DOCUMENT_ROOT</tt>.
-    <li>Run <tt> make install-docs</tt>.
-<li>Configure Apache:
-<font size="-1"><pre>
-PerlModule HTML::Mason
-# your freeside docuemnt root
-&lt;Directory&nbsp;/var/www/freeside&gt;
-&lt;Files ~ (\.cgi|\.html)&gt;
-AddHandler perl-script .cgi .html
-PerlHandler HTML::Mason
-&lt;/Files&gt;
-&lt;Perl&gt;
-require&nbsp;"/usr/local/etc/freeside/handler.pl";
-&lt;/Perl&gt;
-&lt;/Directory&gt;
-</pre></font>
-<li>Restrict access to this web interface - see the <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache documentation on user authentication</a>.    For example, to configure user authentication with <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files), add something like the following to your Apache httpd.conf file, adjusting for your actual paths:
-<pre>
-#your freeside document root
-&lt;Directory /var/www/freeside&gt;
-AuthName Freeside
-AuthType Basic
-AuthUserFile /usr/local/etc/freeside/htpasswd
-require valid-user
-&lt;/Directory&gt;
-</pre>
-  <li>Create one or more Freeside users (your internal sales/tech folks, not customer accounts).  These users are setup using using Apache authentication, not UNIX user accounts.  For example, using <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
-    <ul>
-      <li>First user:<font size="-1">
-<pre>$ su
-# <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -c -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
-      <li>Additional users:<font size="-1">
-<pre>$ su
-# <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
-    </ul>
-  <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt>)</i>
-  <li>Create the Freeside system users:
-<pre>$ su
-# <a href="man/bin/freeside-adduser.html">freeside-adduser</a> fs_queue
-# <a href="man/bin/freeside-adduser.html">freeside-adduser</a> fs_selfservice</pre>
-  <li>As the freeside UNIX user, run <tt>freeside-setup -d <b>domain.name</b> <b>username</b></tt> to create the database tables and initial data, passing the username of a Freeside user you created above:
-<pre>
-$ su freeside
-$ freeside-setup -d </b>example.com</b> <b>username</b>
-</pre>
-  <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your systemand QUEUED_USER with the username of a Freeside user you created above, and run <tt>make install-init</tt>)
-  <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation.
-</ul>
-</body>
-- 
cgit v1.2.1


From 620cfcdb419e8bcdcbaecb2b011e5abd0ecc34e0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Aug 2006 12:38:15 +0000
Subject: better RT hint for smarter smart search

---
 rt/html/Ticket/Elements/EditCustomers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rt/html/Ticket/Elements/EditCustomers b/rt/html/Ticket/Elements/EditCustomers
index 47d1aa222..c5a6f708c 100644
--- a/rt/html/Ticket/Elements/EditCustomers
+++ b/rt/html/Ticket/Elements/EditCustomers
@@ -43,7 +43,7 @@
 <&|/l&>Find customer</&><BR>
 <input name="CustomerString">
 <input type=submit name="OnlySearchForCustomers" value="<&|/l&>Go!</&>">
-<br><i>cust #, last name, or company</i>
+<br><i>cust #, name, company or phone</i>
 <BR>
 %#<BR>
 %#<&|/l&>Find service</&><BR>
-- 
cgit v1.2.1