From 79bd8fbcea024ada97179a5e22e25bd3e430d802 Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Sat, 3 Dec 2016 10:56:01 -0800
Subject: [PATCH] fixes to prior statements improvements

When using the new pdf/modern statements, turned off option to print/download
the text statements (since it will show html output).

for the global billing number. will use this if set. otherwise will
use the facility billing number.
---
 interface/billing/sl_eob_search.php | 10 ++++++----
 sites/default/statement.inc.php     | 10 +++++-----
 version.php                         |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/interface/billing/sl_eob_search.php b/interface/billing/sl_eob_search.php
index c33f212c9..9f2c1fe3d 100644
--- a/interface/billing/sl_eob_search.php
+++ b/interface/billing/sl_eob_search.php
@@ -220,7 +220,7 @@ if (($_POST['form_print'] || $_POST['form_download'] || $_POST['form_pdf']) && $
     //    detail  = array of details, see invoice_summary.inc.php
     //
     if ($stmt['cid'] != $row['pid']) {
-      if (!empty($stmt)) ++$stmt_count; 
+      if (!empty($stmt)) ++$stmt_count;
       $stmt['cid'] = $row['pid'];
       $stmt['pid'] = $row['pid'];
       $stmt['dun_count'] = $row['stmt_count'];
@@ -283,7 +283,7 @@ if (($_POST['form_print'] || $_POST['form_download'] || $_POST['form_pdf']) && $
         "WHERE id = " . $row['id']);
     }
     fwrite($fhprint, make_statement($stmt));
-    
+
   } // end while
 
     if (!empty($stmt)) ++$stmt_count;
@@ -725,8 +725,10 @@ while ($row = sqlFetchArray($t_res)) {
   <?php } else { ?>
   <input type='button' value='<?php xl('Select All','e')?>' onclick='checkAll(true)' /> &nbsp;
   <input type='button' value='<?php xl('Clear All','e')?>' onclick='checkAll(false)' /> &nbsp;
-  <input type='submit' name='form_print' value='<?php xl('Print Selected Statements','e'); ?>' /> &nbsp;
-  <input type='submit' name='form_download' value='<?php xl('Download Selected Statements','e'); ?>' /> &nbsp;
+  <?php if ($GLOBALS['statement_appearance'] != '1') { ?>
+    <input type='submit' name='form_print' value='<?php xl('Print Selected Statements','e'); ?>' /> &nbsp;
+    <input type='submit' name='form_download' value='<?php xl('Download Selected Statements','e'); ?>' /> &nbsp;
+  <?php } ?>
   <input type='submit' name='form_pdf' value='<?php xl('PDF Download Selected Statements','e'); ?>' /> &nbsp;
   <?php } ?>
   <input type='checkbox' name='form_without' value='1' /> <?php xl('Without Update','e'); ?>
diff --git a/sites/default/statement.inc.php b/sites/default/statement.inc.php
index 85cdfd725..4fc17c4fd 100644
--- a/sites/default/statement.inc.php
+++ b/sites/default/statement.inc.php
@@ -34,7 +34,7 @@ $STMT_PRINT_CMD = $GLOBALS['print_command'];
  *
  *  2.  Branded Statement, whose core is build from 1., the original statement, using HTML2PDF.
  *
- *      To customize 2., add your practice location/images/practice_logo.gif 
+ *      To customize 2., add your practice location/images/practice_logo.gif
  *      In the base/default install this is located at '/openemr/sites/default/images/practice_logo.gif',
  *      Adjust directory paths per your installation.
  *      Further customize 2. manually in functions report_2() and create_HTML_statement(), below.
@@ -268,7 +268,7 @@ function create_HTML_statement($stmt) {
     #
   $ageline = xl('Current') .': ' . sprintf("%.2f", $aging[0]);
   for ($age_index = 1; $age_index < ($num_ages - 1); ++$age_index) {
-    $ageline .= ' | ' . ($age_index * 30 + 1) . '-' . ($age_index * 30 + 30) . ':' . 
+    $ageline .= ' | ' . ($age_index * 30 + 1) . '-' . ($age_index * 30 + 30) . ':' .
                 sprintf(" %.2f", $GLOBALS['gbl_currency_symbol'].''.$aging[$age_index]);
   }
 
@@ -280,7 +280,7 @@ function create_HTML_statement($stmt) {
   $label_call = xl('Please call if any of the above information is incorrect.');
   $label_prompt = xl('We appreciate prompt payment of balances due.');
   $label_dept = xl('Billing Department');
-  $label_bill_phone = $GLOBALS['billing_phone_number'];
+  $label_bill_phone = (!empty($GLOBALS['billing_phone_number']) ? $GLOBALS['billing_phone_number'] : $billing_phone );
   $label_appointments = xl('Future Appointments').':';
 
   // This is the top portion of the page.
@@ -555,7 +555,7 @@ function create_statement($stmt) {
   // Note that "\n" is a line feed (new line) character.
   // reformatted to handle i8n by tony
   $out = "\n\n";
-  $providerNAME = getProviderName($stmt['providerID']);  
+  $providerNAME = getProviderName($stmt['providerID']);
   $out .= sprintf("%-30s %s %-s\n",$clinic_name,$stmt['patient'],$stmt['today']);
   $out .= sprintf("%-30s %s: %-s\n",$providerNAME,$label_chartnum,$stmt['pid']);
   $out .= sprintf("%-30s %s\n",$clinic_addr,$label_insinfo);
@@ -674,7 +674,7 @@ function create_statement($stmt) {
   $label_call = xl('Please call if any of the above information is incorrect.');
   $label_prompt = xl('We appreciate prompt payment of balances due.');
   $label_dept = xl('Billing Department');
-  $label_bill_phone = $GLOBALS['billing_phone_number'];
+  $label_bill_phone = (!empty($GLOBALS['billing_phone_number']) ? $GLOBALS['billing_phone_number'] : $billing_phone );
   $label_appointments = xl('Future Appointments').':';
 
   // This is the bottom portion of the page.
diff --git a/version.php b/version.php
index 75ef41b4c..b67723338 100644
--- a/version.php
+++ b/version.php
@@ -17,7 +17,7 @@ $v_realpatch = '0';
 // is a database change in the course of development.  It is used
 // internally to determine when a database upgrade is needed.
 //
-$v_database = 202;
+$v_database = 203;
 
 // Access control version identifier, this is to be incremented whenever there
 // is a access control change in the course of development.  It is used
-- 
2.11.4.GIT