Changeset 398
- Timestamp:
- 05/15/08 13:23:14
- Files:
-
- trunk/phpbms/include/common_functions.php (modified) (1 diff)
- trunk/phpbms/modules/bms/report/invoices_pdf_class.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/phpbms/include/common_functions.php
r384 r398 513 513 514 514 function htmlQuotes($string){ 515 return htmlspecialchars($string,ENT_COMPAT,"UTF-8"); 516 } 515 516 global $sqlEncoding; 517 if(!isset($sqlEncoding)) 518 $sqlEncoding = ""; 519 520 switch ($sqlEncoding){ 521 522 case "latin1": 523 $encoding = "ISO-8859-15"; 524 break; 525 526 case "utf8": 527 default: 528 $encoding = "UTF-8"; 529 break; 530 531 }//endswitch 532 533 return htmlspecialchars($string, ENT_COMPAT, $encoding); 534 535 } 536 517 537 518 538 trunk/phpbms/modules/bms/report/invoices_pdf_class.php
r384 r398 440 440 if($value == "·") 441 441 $value = " "; 442 443 442 if($column->fieldname == $this->lineitems[count($this->lineitems)-1]->fieldname) 444 443 $ln = 2; … … 550 549 switch($column->fieldname){ 551 550 case "shipping": 552 case "discountamount": 551 case "discountamount": 553 552 if($this->invoicerecord[$column->fieldname]) 554 553 $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
