Merge pull request #1393 from julceslauhub/master
BUG 10958 La funcion PMF GenerateOutputDocuemnt no esta generando el output document SOLVED
This commit is contained in:
@@ -980,6 +980,13 @@ class Cases
|
|||||||
require_once 'classes/model/AdditionalTables.php';
|
require_once 'classes/model/AdditionalTables.php';
|
||||||
$oReportTables = new ReportTables();
|
$oReportTables = new ReportTables();
|
||||||
$addtionalTables = new additionalTables();
|
$addtionalTables = new additionalTables();
|
||||||
|
|
||||||
|
if (!isset($Fields['APP_NUMBER'])) {
|
||||||
|
$Fields['APP_NUMBER'] = $appFields['APP_NUMBER'];
|
||||||
|
}
|
||||||
|
if (!isset($Fields['APP_STATUS'])) {
|
||||||
|
$Fields['APP_STATUS'] = $appFields['APP_STATUS'];
|
||||||
|
}
|
||||||
|
|
||||||
$oReportTables->updateTables($appFields['PRO_UID'], $sAppUid, $Fields['APP_NUMBER'], $aApplicationFields);
|
$oReportTables->updateTables($appFields['PRO_UID'], $sAppUid, $Fields['APP_NUMBER'], $aApplicationFields);
|
||||||
$addtionalTables->updateReportTables(
|
$addtionalTables->updateReportTables(
|
||||||
|
|||||||
@@ -892,7 +892,12 @@ class OutputDocument extends BaseOutputDocument
|
|||||||
|
|
||||||
// Print text using writeHTMLCell()
|
// Print text using writeHTMLCell()
|
||||||
// $pdf->writeHTMLCell($w=0, $h=0, $x='', $y='', $html, $border=0, $ln=1, $fill=0, $reseth=true, $align='', $autopadding=true);
|
// $pdf->writeHTMLCell($w=0, $h=0, $x='', $y='', $html, $border=0, $ln=1, $fill=0, $reseth=true, $align='', $autopadding=true);
|
||||||
$pdf->writeHTML($sContent, false, false, false, false, '');
|
if (mb_detect_encoding($sContent) == 'UTF-8') {
|
||||||
|
$sContent = utf8_decode($sContent);
|
||||||
|
}
|
||||||
|
$doc = new DOMDocument('1.0', 'UTF-8');
|
||||||
|
$doc->loadHtml($sContent);
|
||||||
|
$pdf->writeHTML($doc->saveXML(), false, false, false, false, '');
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
// Close and output PDF document
|
// Close and output PDF document
|
||||||
|
|||||||
Reference in New Issue
Block a user