minor internationalization modification and clean up dos carriage ret…

…urns

interface/reports/receipts_by_method_report.php

@@ -190,7 +190,7 @@ function payerCmp($a, $b) {
 
  <tr>
  <td>
- Report by
+ <?php xl('Report by','e'); ?>
 <?php
 echo " <select name='form_report_by'>\n";
 foreach (array(1 => 'Payer', 2 => 'Payment Method', 3 => 'Check Number') as $key => $value) {
@@ -483,29 +483,29 @@ function payerCmp($a, $b) {
  if ($form_report_by != '1' || $_POST['form_details']) {
 
  if ($form_report_by == '1') { // by payer with details
- // Sort and dump saved info, and consolidate items with all key
+ // Sort and dump saved info, and consolidate items with all key
  // fields being the same.
  usort($insarray, 'payerCmp');
- $b = array();
+ $b = array();
  foreach ($insarray as $a) {
  if (empty($a[4])) $a[4] = xl('Patient');
- if (empty($b)) {
- $b = $a;
- }
- else {
- $match = true;
+ if (empty($b)) {
+ $b = $a;
+ }
+ else {
+ $match = true;
  foreach (array(4,3,0,1,2,7) as $i) if ($a[$i] != $b[$i]) $match = false;
- if ($match) {
- $b[5] += $a[5];
- $b[6] += $a[6];
- } else {
- showLineItem($b[0], $b[1], $b[2], $b[3], $b[4], $b[5], $b[6], $b[7]);
+ if ($match) {
+ $b[5] += $a[5];
+ $b[6] += $a[6];
+ } else {
+ showLineItem($b[0], $b[1], $b[2], $b[3], $b[4], $b[5], $b[6], $b[7]);
  $b = $a;
- }
- }
- }
+ }
+ }
+ }
  if (!empty($b)) {
- showLineItem($b[0], $b[1], $b[2], $b[3], $b[4], $b[5], $b[6], $b[7]);
+ showLineItem($b[0], $b[1], $b[2], $b[3], $b[4], $b[5], $b[6], $b[7]);
  }
  } // end by payer with details