Added support for customized doctext.inc/header2.inc

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 627031f587f550923034774d4bb72b339bef9499..9c86c2ec949ce9966aca6ec2914c4af3e3f0d387 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -363,16 +363,19 @@ class FrontReport extends Cpdf
                if ($this->pageNumber > 1)
                        $this->newPage();
                $header2type = true;
+               
+                // leave layout files names without path to enable including
+                // modified versions from comapny/x/reporting directory
                if (isset($myrow['curr_code']) && $this->currency != $myrow['curr_code'])
                {
-                       include($path_to_root . "/reporting/includes/doctext2.inc");
+                       include("includes/doctext2.inc");
                }
                else
                {
-                       include($path_to_root . "/reporting/includes/doctext.inc");
+                       include("includes/doctext.inc");
                }
 
-               include($path_to_root . "/reporting/includes/header2.inc");
+               include("includes/header2.inc");
 
                $this->row = $temp;
        }
@@ -916,11 +919,11 @@ class FrontReport extends Cpdf
                                $emailtype = true;
                                if ($this->currency != $myrow['curr_code'])
                                {
-                                       include("doctext2.inc");
+                                       include("includes/doctext2.inc");
                                }
                                else
                                {
-                                       include("doctext.inc");
+                                       include("includes/doctext.inc");
                                }
                                require_once($path_to_root . "/reporting/includes/class.mail.inc");
                        $mail = new email($this->company['coy_name'], $this->company['email']);

diff --git a/reporting/prn_redirect.php b/reporting/prn_redirect.php
index 9018e0fd424be98585075561fb44a8f02b3d4fea..3f38f70889b36319a98925fd7acdb193c485322a 100644 (file)
--- a/reporting/prn_redirect.php
+++ b/reporting/prn_redirect.php
@@ -17,27 +17,29 @@ $path_to_root = "..";
 $page_security = 'SA_OPEN';    // this level is later overriden in rep file
 include_once($path_to_root . "/includes/session.inc");
 
-/*
-       Find report definition file.
-       Standard reports can be superseded by report with the same id
-       included in active extension, or company customized report.
-*/
 function find_report_file($rep) {
        global $installed_extensions, $comp_path, $path_to_root;
 
        // customized per company versions 
-       $rep_file = $comp_path.'/'.user_company()."/reporting/rep$rep.php";
-       if (file_exists($rep_file)) 
+       $path = $comp_path.'/'.user_company()."/reporting";
+       $rep_file = $path."/rep$rep.php";
+       if (file_exists($rep_file)) {
+               // add local include path for custom reports
+               set_include_path($path.PATH_SEPARATOR.get_include_path());
                return $rep_file;
+       }
        // reports added by active extension modules
        if (count($installed_extensions) > 0)
        {
                $extensions = $installed_extensions;
                foreach ($extensions as $ext)
                        if (($ext['active'] && $ext['type'] == 'module')) {
-                               $rep_file = $path_to_root.'/'.$ext['path']."/reporting/rep$rep.php";
-                               if (file_exists($rep_file))
+                               $path = $path_to_root.'/'.$ext['path']."/reporting";
+                               $rep_file = $path."/rep$rep.php";
+                               if (file_exists($rep_file)) {
+                                       set_include_path($path.PATH_SEPARATOR.get_include_path());
                                        return $rep_file;
+                               }
                        }
        }
        // standard reports