[freeside-commits] freeside/FS/FS part_pkg.pm,1.121,1.122
Mark Wells
mark at wavetail.420.am
Fri Jun 17 02:47:05 PDT 2011
- Previous message: [freeside-commits] freeside/httemplate/search report_cdr.html, 1.15, 1.15.2.1 cdr.html, 1.24.2.2, 1.24.2.3
- Next message: [freeside-commits] freeside/FS/FS/part_pkg cdr_termination.pm, 1.9, 1.10 flat.pm, 1.64, 1.65 prorate.pm, 1.28, 1.29 prorate_Mixin.pm, 1.14, 1.15 recur_Common.pm, 1.11, 1.12 sql_external.pm, 1.14, 1.15 voip_cdr.pm, 1.122, 1.123 voip_inbound.pm, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv14176
Modified Files:
part_pkg.pm
Log Message:
add prorate options to recur_Common packages, #10630
Index: part_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg.pm,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -w -d -r1.121 -r1.122
--- part_pkg.pm 17 Jun 2011 02:48:44 -0000 1.121
+++ part_pkg.pm 17 Jun 2011 09:47:03 -0000 1.122
@@ -1630,6 +1630,10 @@
my $parents = $info{$name}->{'inherit_fields'} || [];
my (%fields, %field_exists, @fieldorder);
foreach my $parent ($name, @$parents) {
+ if ( !exists($info{$parent}) ) {
+ warn "$name tried to inherit from nonexistent '$parent'\n";
+ next;
+ }
%fields = ( # avoid replacing existing fields
%{ $info{$parent}->{'fields'} || {} },
%fields
@@ -1639,7 +1643,8 @@
next if $field_exists{$_};
$field_exists{$_} = 1;
# allow inheritors to remove inherited fields from the fieldorder
- push @fieldorder, $_ if !exists($fields{$_}->{'disabled'});
+ push @fieldorder, $_ if !exists($fields{$_}) or
+ !exists($fields{$_}->{'disabled'});
}
}
$plans{$name}->{'fields'} = \%fields;
- Previous message: [freeside-commits] freeside/httemplate/search report_cdr.html, 1.15, 1.15.2.1 cdr.html, 1.24.2.2, 1.24.2.3
- Next message: [freeside-commits] freeside/FS/FS/part_pkg cdr_termination.pm, 1.9, 1.10 flat.pm, 1.64, 1.65 prorate.pm, 1.28, 1.29 prorate_Mixin.pm, 1.14, 1.15 recur_Common.pm, 1.11, 1.12 sql_external.pm, 1.14, 1.15 voip_cdr.pm, 1.122, 1.123 voip_inbound.pm, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list