X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill.pm;h=6a72862948590a6fa0f71b42f02b9995efe99804;hb=b5c4237a34aef94976bc343c8d9e138664fc3984;hp=f673b76a3cea7ea9c2b17cd3817e43b0c471bb38;hpb=45976742f83a9809c66ef02cd3d266963c0537f2;p=freeside.git

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index f673b76a3..6a7286294 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -681,11 +681,10 @@ sub cust_bill_pay_pkg {
   qsearch({
     'select'    => 'cust_bill_pay_pkg.*',
     'table'     => 'cust_bill_pay_pkg',
-    'addl_from' => ' LEFT JOIN cust_bill_pay USING billpaynum '.
-                   ' LEFT JOIN cust_bill_pkg USING billpkgnum ',
-    'hashref'   => { 'invnum' => $self->invnum,
-                     'pkgnum' => $pkgnum,
-                   },
+    'addl_from' => ' LEFT JOIN cust_bill_pay USING ( billpaynum ) '.
+                   ' LEFT JOIN cust_bill_pkg USING ( billpkgnum ) ',
+    'extra_sql' => ' WHERE cust_bill_pkg.invnum = '. $self->invnum.
+                   "   AND cust_bill_pkg.pkgnum = $pkgnum",
   });
 
 }
@@ -726,11 +725,10 @@ sub cust_credit_bill_pkg {
   qsearch({
     'select'    => 'cust_credit_bill_pkg.*',
     'table'     => 'cust_credit_bill_pkg',
-    'addl_from' => ' LEFT JOIN cust_credit_bill USING creditbillnum '.
-                   ' LEFT JOIN cust_bill_pkg    USING billpkgnum ',
-    'hashref'   => { 'invnum' => $self->invnum,
-                     'pkgnum' => $pkgnum,
-                   },
+    'addl_from' => ' LEFT JOIN cust_credit_bill USING ( creditbillnum ) '.
+                   ' LEFT JOIN cust_bill_pkg    USING ( billpkgnum    ) ',
+    'extra_sql' => ' WHERE cust_bill_pkg.invnum = '. $self->invnum.
+                   "   AND cust_bill_pkg.pkgnum = $pkgnum",
   });
 
 }
@@ -2555,6 +2553,7 @@ sub print_generic {
     #invoice from info
     'company_name'    => scalar( $conf->config('company_name', $agentnum) ),
     'company_address' => join("\n", $conf->config('company_address', $agentnum) ). "\n",
+    'company_phonenum'=> scalar( $conf->config('company_phonenum', $agentnum) ),
     'returnaddress'   => $returnaddress,
     'agent'           => &$escape_function($cust_main->agent->agent),
 
@@ -3346,7 +3345,7 @@ sub print_ps {
   my ($file, $logofile, $barcodefile) = $self->print_latex(@_);
   my $ps = generate_ps($file);
   unlink($logofile);
-  unlink($barcodefile);
+  unlink($barcodefile) if $barcodefile;
 
   $ps;
 }
@@ -3375,7 +3374,7 @@ sub print_pdf {
   my ($file, $logofile, $barcodefile) = $self->print_latex(@_);
   my $pdf = generate_pdf($file);
   unlink($logofile);
-  unlink($barcodefile);
+  unlink($barcodefile) if $barcodefile;
 
   $pdf;
 }