X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=115fa929d24ab9a34469ed9bffab0707fba42b7d;hb=59840905a38c4e08e5b13fdb7af71ea6dea7b1f0;hp=9b0c9d4584029006a684ecf0535e5d7a4373767a;hpb=9967d9b22e1200e516aadf98ffcbcc65ac1c35bb;p=fa-stable.git
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 9b0c9d45..115fa929 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -3,7 +3,9 @@
$page_security = 8;
//include_once($path_to_root . "reporting/includes/class.pdf.inc");
include_once(dirname(__FILE__)."/class.pdf.inc");
+include_once(dirname(__FILE__)."/printer_class.inc");
include_once($path_to_root . "admin/db/company_db.inc");
+include_once($path_to_root . "admin/db/printers_db.inc");
include_once($path_to_root . "config.php");
class FrontReport extends Cpdf
{
@@ -278,12 +280,12 @@ class FrontReport extends Cpdf
function SetDrawColor($r, $g, $b)
{
- $this->setStrokeColor($r / 255, $g / 255, $b / 255);
+ $this->setStrokeColor($r, $g, $b);
}
function SetTextColor($r, $g, $b)
{
- TCPDF::SetTextColor($r / 255, $g / 255, $b / 255);
+ TCPDF::SetTextColor($r, $g, $b);
}
function Text($c, $txt, $n=0, $corr=0, $r=0)
@@ -314,7 +316,13 @@ class FrontReport extends Cpdf
return $this->TextWrap($this->cols2[$c], $this->row - $r, $this->cols2[$n] - $this->cols2[$c] + $corr, $txt, $this->aligns2[$c]);
}
- function TextColLines($c, $n, $txt, $corr=0)
+ function TextColLines($c, $n, $txt, $corr=0, $r=0)
+ {
+ $this->row -= $r;
+ $this->TextWrapLines($this->cols[$c], $this->cols[$n] - $this->cols[$c] + $corr, $txt, $this->aligns[$c]);
+ }
+
+ function TextWrapLines($c, $width, $txt, $align='left')
{
$str = Explode("\n", $txt);
for ($i = 0; $i < count($str); $i++)
@@ -322,7 +330,7 @@ class FrontReport extends Cpdf
$l = $str[$i];
do
{
- $l = $this->TextCol($c, $n, $l, $corr);
+ $l = $this->TextWrap($c, $this->row , $width, $l, $align);
$this->NewLine();
}
while ($l != '');
@@ -349,13 +357,11 @@ class FrontReport extends Cpdf
function End($email=0, $subject=null, $myrow=null, $doctype = 0)
{
- global $go_debug, $path_to_root, $comp_path;
+ global $pdf_debug, $path_to_root, $comp_path;
- if ($go_debug == 1)
+ if ($pdf_debug == 1)
{
- $buf = $this->Output();
- $len = strlen($buf);
- $pdfcode = $buf;
+ $pdfcode = $this->Output('','S');
$pdfcode = str_replace("\n", "\n
", htmlspecialchars($pdfcode));
echo '