From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 20 Apr 2012 21:25:30 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=7dd79523c75c3cd238fb1c0cb7ccb346a6569811;hp=28b2b233e588f03a9d7966f29db918ace9382d26

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

diff --git a/FS/FS.pm b/FS/FS.pm
index 830a4a450..371621286 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -546,11 +546,35 @@ Commercial support is available; see
 
 =head1 AUTHORS
 
-Primarily Ivan Kohler, with help from many kind folks, including core
-contributors Jeff Finucane, Kristian Hoffman, Jason Hall and Peter Bowen.
+=head2 CORE TEAM
 
-See the CREDITS file in the Freeside distribution for a (hopefully) complete
-list and the individal files for details.
+Jeremy Davis
+
+Ivan Kohler
+
+Mark Wells
+
+=head2 CORE EMERITUS
+
+Peter Bowen
+
+Jeff Finucane
+
+Jason Hall
+
+Kristian Hoffman
+
+Erik Levinson
+
+Brian McCane
+
+Richard Siddall
+
+Matt Simerson
+
+=head2 CONTRIBUTORS
+
+See httemplate/docs/credits.html
 
 =head1 SEE ALSO
 
diff --git a/bin/cust_pkg-revert b/bin/cust_pkg-revert
new file mode 100755
index 000000000..1a4d456f5
--- /dev/null
+++ b/bin/cust_pkg-revert
@@ -0,0 +1,118 @@
+#!/usr/bin/perl
+
+use strict;
+use vars qw( $opt_d $opt_u $opt_r );
+use Getopt::Std;
+use Date::Parse qw(str2time);
+use FS::UID qw(adminsuidsetup dbh);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_pkg;
+use FS::h_cust_pkg;
+
+getopts('d:u:r');
+
+my $user = shift or &usage;
+adminsuidsetup $user;
+
+my $sdate = str2time($opt_d);
+my $edate = $sdate + 86399;
+
+my $oldAutoCommit = $FS::UID::AutoCommit;
+local $FS::UID::AutoCommit = 0;
+my $dbh = dbh;
+
+my $fuzz = 1;
+
+my $changed = 0;
+
+foreach my $h_cust_pkg (
+  qsearch({ table       => 'h_cust_pkg',
+            hashref     => { history_user   => $opt_u,
+                             history_action => 'replace_new',
+                           },
+            extra_sql   => ' AND history_date >= ? AND history_date <= ? ',
+            extra_param => [ [$sdate,'int'], [$edate,'int'] ],
+            #order_by    => 'ORDER BY history_date asc',
+         })
+) {
+  my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $h_cust_pkg->pkgnum } );
+  next if $cust_pkg->get('cancel');
+
+  my($s, $e) = ($h_cust_pkg->history_date-$fuzz, $h_cust_pkg->history_date+$fuzz);
+
+  my $old = qsearchs({
+            table       => 'h_cust_pkg',
+            hashref     => { history_user   => $opt_u,
+                             history_action => 'replace_old',
+                             pkgnum         => $h_cust_pkg->pkgnum,
+                           },
+            extra_sql   => ' AND history_date >= ? AND history_date <= ? ',
+            extra_param => [ [$s,'int'], [$e,'int'] ],
+  });
+
+  my $diff = $h_cust_pkg->get('bill') - $old->get('bill');
+  if ( $diff < 0 ) {
+    warn "next bill date was decremented (not incremented) for pkgnum ". $cust_pkg->pkgnum. "; skipping\n";
+    next;
+  } elsif ( $diff == 0 ) {
+    warn "next bill date was not changed for pkgnum ". $cust_pkg->pkgnum. "; skipping\n";
+    next;
+  }
+
+  $changed++;
+
+  #if ( $opt_r ) {
+    my $days = ($diff / 86400);
+    print "decrementing next bill for pkgnum ". $cust_pkg->pkgnum.
+          " (custnum ". $cust_pkg->custnum. ") by $days days\n";
+  #}
+
+  $cust_pkg->set('bill', $cust_pkg->get('bill') - $diff );
+  my $error = $cust_pkg->replace;
+  die $error if $error;
+
+}
+
+if ( $opt_r ) {
+  $dbh->rollback or die $dbh->errstr; #if $oldAutoCommit;
+} else {
+  $dbh->commit or die $dbh->errstr; #if $oldAutoCommit;
+}
+
+print "changed $changed packages\n";
+
+sub usage {
+  die "usage: cust_pkg-revert -d date -u history_username [ -r ] employee_username\n";
+}
+
+=head1 NAME
+
+cust_pkg-revert
+
+=head1 SYNOPSIS
+
+  cust_pkg-revert -d date -u history_username [ -r ] employee_username
+
+=head1 DESCRIPTION
+
+Command-line tool to revert customer package changes from a specific day and user.
+Currently only incrementing the next bill date (cust_pkg.bill) is reverted.
+
+-d: Date of the changes to revert
+
+-u: Username of the changes to revert
+
+-r: dRy run
+
+employee_username
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::part_pkg>
+
+=cut
+
+1;
+
diff --git a/bin/part_pkg-bulk_change b/bin/part_pkg-bulk_change
index aecfea580..64670debc 100755
--- a/bin/part_pkg-bulk_change
+++ b/bin/part_pkg-bulk_change
@@ -50,7 +50,7 @@ cust_main-bulk_change
 
 =head1 DESCRIPTION
 
-Command-line tool to change the payby field for a group of customers.
+Command-line tool to change a set of package definitions.
 
 -r: recurring package definitions only