projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moving company data storage to company subdirectory
[fa-stable.git]
/
reporting
/
includes
/
pdf_report.inc
diff --git
a/reporting/includes/pdf_report.inc
b/reporting/includes/pdf_report.inc
index 4ccd6b4b75b9e1a7ebe7a6db79a4318a823e3a9c..71589758e8fd080c57cfb66d1d5fdace14fc3455 100644
(file)
--- a/
reporting/includes/pdf_report.inc
+++ b/
reporting/includes/pdf_report.inc
@@
-3,7
+3,7
@@
$page_security = 8;
include_once($path_to_root . "reporting/includes/class.pdf.inc");
include_once($path_to_root . "admin/db/company_db.inc");
$page_security = 8;
include_once($path_to_root . "reporting/includes/class.pdf.inc");
include_once($path_to_root . "admin/db/company_db.inc");
-
+include_once($path_to_root . "config.php");
class FrontReport extends Cpdf
{
var $size;
class FrontReport extends Cpdf
{
var $size;
@@
-265,7
+265,7
@@
class FrontReport extends Cpdf
function Header2($myrow, $branch, $sales_order, $bankaccount, $doctype)
{
function Header2($myrow, $branch, $sales_order, $bankaccount, $doctype)
{
- global $path_to_root, $print_as_quote, $print_invoice_no;
+ global $
comp_path, $
path_to_root, $print_as_quote, $print_invoice_no;
$this->pageNumber++;
if ($this->pageNumber > 1)
$this->pageNumber++;
if ($this->pageNumber > 1)
@@
-325,7
+325,7
@@
class FrontReport extends Cpdf
$this->row = $upper - 2 * $this->lineHeight - 2;
if ($this->company['coy_logo'] != '')
{
$this->row = $upper - 2 * $this->lineHeight - 2;
if ($this->company['coy_logo'] != '')
{
- $logo = $
path_to_root . "themes/default
/images/" . $this->company['coy_logo'];
+ $logo = $
comp_path .'/'. user_company() . "
/images/" . $this->company['coy_logo'];
$this->AddImage($logo, $ccol, $iline1 + 5, 250, 40);
}
else
$this->AddImage($logo, $ccol, $iline1 + 5, 250, 40);
}
else
@@
-450,7
+450,7
@@
class FrontReport extends Cpdf
$this->row = $iline5 - $this->lineHeight - 6;
$this->Text($ccol, $doc_Please_Quote . " - " . $myrow['curr_code']);
$this->NewLine();
$this->row = $iline5 - $this->lineHeight - 6;
$this->Text($ccol, $doc_Please_Quote . " - " . $myrow['curr_code']);
$this->NewLine();
- if ($
branch['disable_branch'] > 0 && $doctype == 1
0) // payment links
+ if ($
doctype == 10 && $branch['disable_branch'] >
0) // payment links
{
if ($branch['disable_branch'] == 1)
{
{
if ($branch['disable_branch'] == 1)
{
@@
-604,7
+604,7
@@
class FrontReport extends Cpdf
function End($email=0, $subject=null, $myrow=null, $doctype = 0)
{
function End($email=0, $subject=null, $myrow=null, $doctype = 0)
{
- global $go_debug, $path_to_root;
+ global $go_debug, $path_to_root
, $comp_path
;
// this is no good in IE so has been replaced, see down under
// but good for debugging purposes in IE
// this is no good in IE so has been replaced, see down under
// but good for debugging purposes in IE
@@
-631,7
+631,7
@@
class FrontReport extends Cpdf
{
$buf = $this->output();
$len = strlen($buf);
{
$buf = $this->output();
$len = strlen($buf);
- $dir =
'.
/pdf_files';
+ $dir =
$comp_path.'/'.user_company(). '
/pdf_files';
//save the file
if (!file_exists($dir))
{
//save the file
if (!file_exists($dir))
{