projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 80488 Block billing for customer missing tax district
[freeside.git]
/
FS
/
FS
/
phone_device.pm
diff --git
a/FS/FS/phone_device.pm
b/FS/FS/phone_device.pm
index
b891bb2
..
2afad91
100644
(file)
--- a/
FS/FS/phone_device.pm
+++ b/
FS/FS/phone_device.pm
@@
-90,12
+90,12
@@
sub insert {
my $dbh = dbh;
my $error = $self->SUPER::insert;
my $dbh = dbh;
my $error = $self->SUPER::insert;
+ $error ||= $self->export('device_insert');
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
}
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
}
- $self->export('device_insert');
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';
@@
-122,9
+122,8
@@
sub delete {
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
- $self->export('device_delete');
- my $error = $self->SUPER::delete;
+ my $error = $self->
export('device_delete') || $self->
SUPER::delete;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
@@
-159,13
+158,13
@@
sub replace {
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
- my $error = $new->SUPER::replace($old);
+ my $error = $new->SUPER::replace($old)
+ || $new->export('device_replace', $old);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
}
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
}
- $new->export('device_replace', $old);
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';