diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2018-09-19 02:31:52 -0400 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2018-09-20 13:07:37 -0400 |
| commit | dcf1ad84924e58127a42e0c905e940eb4e076ac7 (patch) | |
| tree | f2c91dc7637a8aa8bd68c8389e649980c93d2ff9 | |
| parent | 9ea31f98372bc897fd0b4d7e63284eecabf27aa2 (diff) | |
RT# 78547 Future autobill report - sql bugfix
| -rw-r--r-- | FS/FS/cust_payby.pm | 4 | ||||
| -rw-r--r-- | httemplate/search/future_autobill.html | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/FS/FS/cust_payby.pm b/FS/FS/cust_payby.pm index 9d8be120a..4e9f04f51 100644 --- a/FS/FS/cust_payby.pm +++ b/FS/FS/cust_payby.pm @@ -931,7 +931,7 @@ sub has_autobill_cards { weight => { op => '>', value => 0 }, }, extra_sql => - "AND payby IN ('CARD', 'DCRD') ". + "AND cust_payby.payby IN ('CARD', 'DCRD') ". 'AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( table => 'cust_main' ), }); @@ -952,7 +952,7 @@ sub has_autobill_checks { weight => { op => '>', value => 0 }, }, extra_sql => - "AND payby IN ('CHEK','DCHEK','DCHK') ". + "AND cust_payby.payby IN ('CHEK','DCHEK','DCHK') ". 'AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( table => 'cust_main' ), }); diff --git a/httemplate/search/future_autobill.html b/httemplate/search/future_autobill.html index 1f3862fbc..3385dd880 100644 --- a/httemplate/search/future_autobill.html +++ b/httemplate/search/future_autobill.html @@ -121,8 +121,8 @@ there will be 1,400 billing and payment cycles simulated order_by => " ORDER BY weight DESC ", extra_sql => "AND ( - payby IN ('CHEK','DCHK','DCHEK') - OR ( paydate > '".$target_dt->ymd."') + cust_payby.payby IN ('CHEK','DCHK','DCHEK') + OR ( cust_payby.paydate > '".$target_dt->ymd."') ) AND " . $FS::CurrentUser::CurrentUser->agentnums_sql . ($agentnum ? "AND cust_main.agentnum = $agentnum" : ''), |