X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=3aa5d050263f20af554f3028597d5887e6c61df5;hb=9561c66909d960cd75bcbb08bae2132f3de7e6da;hp=0ac5f03b803e9e0e82392da61263f08f10de7a1b;hpb=b0de7973950dd3f665839600b20141461c624614;p=fa-stable.git diff --git a/reporting/rep107.php b/reporting/rep107.php index 0ac5f03b..3aa5d050 100644 --- a/reporting/rep107.php +++ b/reporting/rep107.php @@ -61,8 +61,6 @@ print_invoices(); function print_invoices() { global $path_to_root, $SysPrefs; - - $show_this_payment = true; // include payments invoiced here in summary include_once($path_to_root . "/reporting/includes/pdf_report.inc"); @@ -143,8 +141,11 @@ function print_invoices() // calculate summary start row for later use $summary_start_row = $rep->bottomMargin + (15 * $rep->lineHeight); + $show_this_payment = $rep->formData['prepaid'] == 'partial'; // include payments invoiced here in summary + if ($rep->formData['prepaid']) { + $result = get_sales_order_invoices($myrow['order_']); $prepayments = array(); while($inv = db_fetch($result)) @@ -323,7 +324,7 @@ function print_invoices() $rep->Font(); if ($email == 1) { - $rep->End($email, sprintf(_("Invoice %s from %s"), $myrow['reference'], get_company_pref('coy_name'))); + $rep->End($email, sprintf(_("Invoice %s from %s"), $myrow['reference'], htmlspecialchars_decode(get_company_pref('coy_name')))); } } if ($email == 0)