projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't enable 'Void invoices' by default, being overused in lieu of more accounting...
[freeside.git]
/
FS
/
FS
/
part_pkg_taxrate.pm
diff --git
a/FS/FS/part_pkg_taxrate.pm
b/FS/FS/part_pkg_taxrate.pm
index
c83f700
..
a732720
100644
(file)
--- a/
FS/FS/part_pkg_taxrate.pm
+++ b/
FS/FS/part_pkg_taxrate.pm
@@
-5,8
+5,7
@@
use vars qw( @ISA );
use Date::Parse;
use DateTime;
use DateTime::Format::Strptime;
use Date::Parse;
use DateTime;
use DateTime::Format::Strptime;
-use FS::UID qw(dbh);
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearch qsearchs dbh );
use FS::part_pkg_taxproduct;
use FS::Misc qw(csv_from_fixed);
use FS::part_pkg_taxproduct;
use FS::Misc qw(csv_from_fixed);
@@
-310,8
+309,8
@@
sub batch_import {
}
}
}
}
- my
$part_pkg_taxrate = qsearchs
('part_pkg_taxrate', $hash);
- unless (
$part_pkg_taxrate
) {
+ my
@part_pkg_taxrate = qsearch
('part_pkg_taxrate', $hash);
+ unless (
scalar(@part_pkg_taxrate) || $param->{'delete_only'}
) {
if ( $hash->{taxproductnum} ) {
my $taxproduct =
qsearchs( 'part_pkg_taxproduct',
if ( $hash->{taxproductnum} ) {
my $taxproduct =
qsearchs( 'part_pkg_taxproduct',
@@
-324,8
+323,10
@@
sub batch_import {
join(" ", map { "$_ => *". $hash->{$_}. '*' } keys(%$hash) );
}
join(" ", map { "$_ => *". $hash->{$_}. '*' } keys(%$hash) );
}
- my $error = $part_pkg_taxrate->delete;
- return $error if $error;
+ foreach my $part_pkg_taxrate (@part_pkg_taxrate) {
+ my $error = $part_pkg_taxrate->delete;
+ return $error if $error;
+ }
delete($hash->{$_}) foreach (keys %$hash);
}
delete($hash->{$_}) foreach (keys %$hash);
}