projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better name for svc_acct events
[freeside.git]
/
FS
/
FS
/
part_event.pm
diff --git
a/FS/FS/part_event.pm
b/FS/FS/part_event.pm
index
a740bb8
..
d2ec8ab
100644
(file)
--- a/
FS/FS/part_event.pm
+++ b/
FS/FS/part_event.pm
@@
-285,7
+285,9
@@
sub targets {
}
# this is the 'event' side
}
# this is the 'event' side
- my $join = FS::part_event_condition->join_conditions_sql( $eventtable );
+ my $join = FS::part_event_condition->join_conditions_sql( $eventtable,
+ 'time' => $time
+ );
my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
'time' => $time
);
my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
'time' => $time
);
@@
-382,9
+384,10
@@
sub eventtable_labels {
'cust_pkg' => 'Package',
'cust_bill' => 'Invoice',
'cust_main' => 'Customer',
'cust_pkg' => 'Package',
'cust_bill' => 'Invoice',
'cust_main' => 'Customer',
+ 'cust_pay' => 'Payment',
'cust_pay_batch' => 'Batch payment',
'cust_statement' => 'Statement', #too general a name here? "Invoice group"?
'cust_pay_batch' => 'Batch payment',
'cust_statement' => 'Statement', #too general a name here? "Invoice group"?
- 'svc_acct' => '
Login service
',
+ 'svc_acct' => '
Account service (svc_acct)
',
;
\%hash
;
\%hash
@@
-421,6
+424,7
@@
sub eventtable_pkey {
'cust_main' => 'custnum',
'cust_bill' => 'invnum',
'cust_pkg' => 'pkgnum',
'cust_main' => 'custnum',
'cust_bill' => 'invnum',
'cust_pkg' => 'pkgnum',
+ 'cust_pay' => 'paynum',
'cust_pay_batch' => 'paybatchnum',
'cust_statement' => 'statementnum',
'svc_acct' => 'svcnum',
'cust_pay_batch' => 'paybatchnum',
'cust_statement' => 'statementnum',
'svc_acct' => 'svcnum',