X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main.pm;h=7ac8c6214cc40029e10006c48db1f126758d16ab;hb=093fbb43eb8cfa3f94c8416ac9d2b7b078d8ee18;hp=a36273be7c5d7d1b54dd1e0826d074fb97e69016;hpb=11f1a064f3618bac4078c8ae86654b3182ec0e07;p=freeside.git

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a36273be7..7ac8c6214 100644
--- 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'
-               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
@@ -5803,6 +5803,7 @@ sub _agent_plandata {
       #'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