diff options
| author | ivan <ivan> | 2005-11-21 15:24:39 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2005-11-21 15:24:39 +0000 |
| commit | c934eb18a66126faab43459780940bfdb19b30ad (patch) | |
| tree | f6bba4812ed18dd02cb2aeed96fe297191b1e71c /FS/FS | |
| parent | 30ceabb9d40844452fae8e7c5535fd6a6738b0cd (diff) | |
when editing exports and there's a duplicate error, show all conflicting accounts not just the ones for different customers
Diffstat (limited to 'FS/FS')
| -rw-r--r-- | FS/FS/export_svc.pm | 4 | ||||
| -rw-r--r-- | FS/FS/part_svc.pm | 2 | ||||
| -rw-r--r-- | FS/FS/rate.pm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/FS/FS/export_svc.pm b/FS/FS/export_svc.pm index e5c7ed8..0370f5f 100644 --- a/FS/FS/export_svc.pm +++ b/FS/FS/export_svc.pm @@ -198,8 +198,8 @@ sub insert { ' on '. $self->part_export->machine. ' : '. scalar(@dup_svc). " duplicate $label". ' ('. scalar(@diff_customer_svc). " from different customers)". - #": ". join(', ', sort $sortby map { $_->$method() } @dup_svc ) - ": ". join(', ', sort $sortby map { $_->$method() } @diff_customer_svc ) + ": ". join(', ', sort $sortby map { $_->$method() } @dup_svc ) + #": ". join(', ', sort $sortby map { $_->$method() } @diff_customer_svc ) ; } diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm index d3073f9..1a478a9 100644 --- a/FS/FS/part_svc.pm +++ b/FS/FS/part_svc.pm @@ -562,7 +562,7 @@ sub process { $param->{'svcpart'} = $new->getfield('svcpart'); } - die $error if $error; + die "$error\n" if $error; } =item process_bulk_cust_svc diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm index f19ebf0..a471e2e 100644 --- a/FS/FS/rate.pm +++ b/FS/FS/rate.pm @@ -363,7 +363,7 @@ sub process { #$ratenum = $rate->getfield('ratenum'); } - die $error if $error; + die "$error\n" if $error; } |