projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
41d528f
)
fix multiple services w/cust_bill_has_service condition, RT#17035
author
Ivan Kohler
<ivan@freeside.biz>
Tue, 20 Mar 2012 23:37:31 +0000
(16:37 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Tue, 20 Mar 2012 23:37:31 +0000
(16:37 -0700)
FS/FS/part_event/Condition/cust_bill_has_service.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_event/Condition/cust_bill_has_service.pm
b/FS/FS/part_event/Condition/cust_bill_has_service.pm
index
61e32ce
..
65c9964
100644
(file)
--- a/
FS/FS/part_event/Condition/cust_bill_has_service.pm
+++ b/
FS/FS/part_event/Condition/cust_bill_has_service.pm
@@
-16,9
+16,6
@@
sub eventtable_hashref {
};
}
};
}
-# could not find component for path '/elements/tr-select-part_svc.html'
-# sub disabled { 1; }
-
sub option_fields {
(
'has_service' => { 'label' => 'Has service',
sub option_fields {
(
'has_service' => { 'label' => 'Has service',
@@
-44,14
+41,16
@@
sub condition {
sub condition_sql {
my( $class, $table, %opt ) = @_;
sub condition_sql {
my( $class, $table, %opt ) = @_;
- my $servicenum =
- $class->condition_sql_option_option('has_service');
+ my $servicenums =
+ $class->condition_sql_option_option_integer( 'has_service',
+ $opt{'driver_name'},
+ );
my $sql = qq| 0 < ( SELECT COUNT(cs.svcpart)
FROM cust_bill_pkg cbp, cust_svc cs
WHERE cbp.invnum = cust_bill.invnum
AND cs.pkgnum = cbp.pkgnum
my $sql = qq| 0 < ( SELECT COUNT(cs.svcpart)
FROM cust_bill_pkg cbp, cust_svc cs
WHERE cbp.invnum = cust_bill.invnum
AND cs.pkgnum = cbp.pkgnum
- AND cs.svcpart IN $servicenum
+ AND cs.svcpart IN $servicenum
s
)
|;
return $sql;
)
|;
return $sql;