projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
674e425
)
this might fix agent-specific invoicing when migrated from 1.7?
author
ivan
<ivan>
Sun, 30 Sep 2007 00:23:46 +0000
(
00:23
+0000)
committer
ivan
<ivan>
Sun, 30 Sep 2007 00:23:46 +0000
(
00:23
+0000)
FS/FS/cust_main.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
a36273b
..
7ac8c62
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-5793,7
+5793,7
@@
sub _agent_plandata {
LEFT JOIN part_event_option AS peo_agentnum
ON ( part_event.eventpart = peo_agentnum.eventpart
AND peo_agentnum.optionname = 'agentnum'
LEFT JOIN part_event_option AS peo_agentnum
ON ( part_event.eventpart = peo_agentnum.eventpart
AND peo_agentnum.optionname = 'agentnum'
- AND peo_agentnum.optionvalue ~ '(^|,)agentnum(,|$)'
+ AND peo_agentnum.optionvalue ~ '(^|,)
}. $agentnum. q{
agentnum(,|$)'
)
LEFT JOIN part_event_option AS peo_cust_bill_age
ON ( part_event.eventpart = peo_cust_bill_age.eventpart
)
LEFT JOIN part_event_option AS peo_cust_bill_age
ON ( part_event.eventpart = peo_cust_bill_age.eventpart
@@
-5803,6
+5803,7
@@
sub _agent_plandata {
#'hashref' => { 'optionname' => $option },
'hashref' => { 'part_event_option.optionname' => $option },
'extra_sql' => " AND event = 'cust_bill_send_agent' ".
#'hashref' => { 'optionname' => $option },
'hashref' => { 'part_event_option.optionname' => $option },
'extra_sql' => " AND event = 'cust_bill_send_agent' ".
+ " AND disabled != 'Y' ".
" AND peo_agentnum.optionname = 'agentnum' ".
" AND agentnum IS NULL OR agentnum = $agentnum ".
" ORDER BY
" AND peo_agentnum.optionname = 'agentnum' ".
" AND agentnum IS NULL OR agentnum = $agentnum ".
" ORDER BY