From 383170a5c4bcb6f2f621f8d1f6dac5c2cb1d348d Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 18 Sep 2010 07:53:11 +0000 Subject: [PATCH] YA otaker upgrade kludge for old datasets: empty cust_credit.creasonnum --- FS/FS/cust_credit.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm index 1ebff3e87..0f8ac9703 100644 --- a/FS/FS/cust_credit.pm +++ b/FS/FS/cust_credit.pm @@ -2,7 +2,9 @@ package FS::cust_credit; use strict; use base qw( FS::otaker_Mixin FS::cust_main_Mixin FS::Record ); -use vars qw( $conf $unsuspendauto $me $DEBUG $otaker_upgrade_kludge ); +use vars qw( $conf $unsuspendauto $me $DEBUG + $otaker_upgrade_kludge $ignore_empty_reasonnum + ); use Date::Format; use FS::UID qw( dbh getotaker ); use FS::Misc qw(send_email); @@ -21,6 +23,7 @@ $me = '[ FS::cust_credit ]'; $DEBUG = 0; $otaker_upgrade_kludge = 0; +$ignore_empty_reasonnum = 0; #ask FS::UID to run this stuff for us later $FS::UID::callback{'FS::cust_credit'} = sub { @@ -300,7 +303,6 @@ sub check { || $self->ut_money('amount') || $self->ut_alphan('otaker') || $self->ut_textn('reason') - || $self->ut_foreign_key('reasonnum', 'reason', 'reasonnum') || $self->ut_textn('addlinfo') || $self->ut_enum('closed', [ '', 'Y' ]) || $self->ut_foreign_keyn('pkgnum', 'cust_pkg', 'pkgnum') @@ -308,6 +310,10 @@ sub check { ; return $error if $error; + my $method = $ignore_empty_reasonnum ? 'ut_foreign_keyn' : 'ut_foreign_key'; + $error = $self->$method('reasonnum', 'reason', 'reasonnum'); + return $error if $error; + return "amount must be > 0 " if $self->amount <= 0; return "amount must be greater or equal to amount applied" @@ -552,6 +558,7 @@ sub _upgrade_data { # class method } local($otaker_upgrade_kludge) = 1; + local($ignore_empty_reasonnum) = 1; $class->_upgrade_otaker(%opts); } -- 2.11.0