projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better invoice summary, RT#20601
[freeside.git]
/
FS
/
FS
/
pkg_svc.pm
diff --git
a/FS/FS/pkg_svc.pm
b/FS/FS/pkg_svc.pm
index
ea52176
..
f79bb5e
100644
(file)
--- a/
FS/FS/pkg_svc.pm
+++ b/
FS/FS/pkg_svc.pm
@@
-39,6
+39,8
@@
FS::Record. The following fields are currently supported:
=over 4
=over 4
+=item pkgsvcnum - primary key
+
=item pkgpart - Billing item definition (see L<FS::part_pkg>)
=item svcpart - Service definition (see L<FS::part_svc>)
=item pkgpart - Billing item definition (see L<FS::part_pkg>)
=item svcpart - Service definition (see L<FS::part_svc>)
@@
-48,6
+50,8
@@
definition includes
=item primary_svc - primary flag, empty or 'Y'
=item primary_svc - primary flag, empty or 'Y'
+=item hidden - 'Y' to hide this service on invoices, null otherwise.
+
=back
=head1 METHODS
=back
=head1 METHODS
@@
-80,7
+84,9
@@
returns the error, otherwise returns false.
=cut
sub replace {
=cut
sub replace {
- my ( $new, $old ) = ( shift, shift );
+ my( $new, $old ) = ( shift, shift );
+
+ $old = $new->replace_old unless defined($old);
return "Can't change pkgpart!" if $old->pkgpart != $new->pkgpart;
return "Can't change svcpart!" if $old->svcpart != $new->svcpart;
return "Can't change pkgpart!" if $old->pkgpart != $new->pkgpart;
return "Can't change svcpart!" if $old->svcpart != $new->svcpart;
@@
-101,9
+107,11
@@
sub check {
my $error;
$error =
my $error;
$error =
- $self->ut_number('pkgpart')
+ $self->ut_numbern('pkgsvcnum')
+ || $self->ut_number('pkgpart')
|| $self->ut_number('svcpart')
|| $self->ut_number('quantity')
|| $self->ut_number('svcpart')
|| $self->ut_number('quantity')
+ || $self->ut_enum('hidden', [ '', 'Y' ] )
;
return $error if $error;
;
return $error if $error;