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

3 files changed, 13 insertions, 13 deletions

diff --git a/rt/etc/initialdata b/rt/etc/initialdata
index 9b2af3744..96255b5ed 100644
--- a/rt/etc/initialdata
+++ b/rt/etc/initialdata
@@ -247,16 +247,16 @@
     },
 
     #freeside
-    {  Name                 => 'On Custom Field Transaction',
-       Description          => 'When a custom field is changed',
-       ExecModule           => 'CustomFieldTransaction',
-       ApplicableTransTypes => 'Any',
-    },
-    {  Name                 => 'On Custom Field Change',
-       Description          => 'When a custom field is changed to some value',
-       ExecModule           => 'CustomFieldChange',
-       ApplicableTransTypes => 'Any',
-    },
+    #{  Name                 => 'On Custom Field Transaction',
+    #   Description          => 'When a custom field is changed',
+    #   ExecModule           => 'CustomFieldTransaction',
+    #   ApplicableTransTypes => 'Any',
+    #},
+    #{  Name                 => 'On Custom Field Change',
+    #   Description          => 'When a custom field is changed to some value',
+    #   ExecModule           => 'CustomFieldChange',
+    #   ApplicableTransTypes => 'Any',
+    #},
 
 );
 
diff --git a/rt/etc/upgrade/4.0-customfield-checkbox-extension b/rt/etc/upgrade/4.0-customfield-checkbox-extension
index dc8904e43..a83ac3e14 100755
--- a/rt/etc/upgrade/4.0-customfield-checkbox-extension
+++ b/rt/etc/upgrade/4.0-customfield-checkbox-extension
@@ -53,7 +53,7 @@ use warnings;
 use lib "/opt/rt3/local/lib";
 use lib "/opt/rt3/lib";
 
-use RT -init
+use RT -init;
 
 $| = 1;
 
diff --git a/rt/etc/upgrade/upgrade-articles b/rt/etc/upgrade/upgrade-articles
index 6ff4a2a13..a3852dfb3 100755
--- a/rt/etc/upgrade/upgrade-articles
+++ b/rt/etc/upgrade/upgrade-articles
@@ -56,8 +56,8 @@ use lib "/opt/rt3/lib";
 use RT::Interface::CLI qw(Init);
 Init();
 
- my $db_name = RT->Config->Get('DatabaseName');
- my $db_type = RT->Config->Get('DatabaseType');
+my $db_name = RT->Config->Get('DatabaseName');
+my $db_type = RT->Config->Get('DatabaseType');
 
 my $dbh = $RT::Handle->dbh;