From 9d79e2fe9863088d2649b4f0d9c4d3e70fd8d0bf Mon Sep 17 00:00:00 2001 From: dave Date: Thu, 8 Apr 2010 07:38:22 +0000 Subject: [PATCH] Add TCPDF label, but call it experimental to discourage use. Convert ISO-8859 -> UTF-8 before printing text on the TCPDF label... happily only the GVRSF is using this right now so we don't need to update everyone. --- admin/reports.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/admin/reports.inc.php b/admin/reports.inc.php index 9c08fae..6aa4d38 100644 --- a/admin/reports.inc.php +++ b/admin/reports.inc.php @@ -49,7 +49,7 @@ $report_options = array(); $report_options['type'] = array('desc' => 'Report Format', - 'values' => array('pdf'=>'PDF', 'csv'=>'CSV', 'label'=>'Label'/*, 'tcpdf_label'=>'TCPDF Label'*/) + 'values' => array('pdf'=>'PDF', 'csv'=>'CSV', 'label'=>'Label', 'tcpdf_label'=>'TCPDF Label (experimental)') ); $report_options['group_new_page'] = array('desc' => 'Start each new grouping on a new page', 'values' => array('no'=>'No', 'yes'=>'Yes') @@ -890,6 +890,8 @@ foreach($report_stock as $n=>$v) { } else { if($f == 'static_text') $v = $d['value']; + $v = iconv("ISO-8859-1//TRANSLIT", "UTF-8", $v); + $rep->label_text($d['x'], $d['y'], $d['w'], $d['h'], $v, $show_box, $d['align'], $d['valign'], $d['fontname'],$d['fontstyle'],$d['fontsize'],