From: ivan <ivan>
Date: Sun, 30 Sep 2007 00:23:46 +0000 (+0000)
Subject: this might fix agent-specific invoicing when migrated from 1.7?
X-Git-Tag: TRIXBOX_2_6~334
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=59c5af8de6c599ca58fef9db19c89f483e5ed897

this might fix agent-specific invoicing when migrated from 1.7?
---

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