X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main.pm;h=f275d10fec27af4d88faf275278b640467416e9e;hb=bc10c7592866836b56d12b4e8b18f5fa67785a24;hp=34dfac5bf7bbab1e29ea2be97692a4fe84844cb1;hpb=953a05aefc990758f185d5284cdcbe8566b0229d;p=freeside.git diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 34dfac5bf..f275d10fe 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -1537,7 +1537,7 @@ sub collect { || $a->weight <=> $b->weight || $a->eventpart <=> $b->eventpart } grep { $_->seconds <= ( $invoice_time - $cust_bill->_date ) - && ! qsearchs( 'cust_bill_event', { + && ! qsearch( 'cust_bill_event', { 'invnum' => $cust_bill->invnum, 'eventpart' => $_->eventpart, 'status' => 'done', @@ -2696,7 +2696,7 @@ sub batch_import { my %cust_main = ( agentnum => $agentnum, refnum => $refnum, - country => 'US', #default + country => $conf->config('countrydefault') || 'US', payby => 'BILL', #default paydate => '12/2037', #default );