From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Thu, 24 Apr 2008 11:11:09 +0000 (+0000)
Subject: Added using per company customized report files.
X-Git-Tag: v2.4.2~19^2~2087
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=4e8059dc88b25b27dfbe08e99fc882a214802083;p=fa-stable.git

Added using per company customized report files.
---

diff --git a/admin/create_coy.php b/admin/create_coy.php
index e8cd7222..af3cffd2 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -11,7 +11,7 @@ include_once($path_to_root . "/includes/ui.inc");
 
 page(_("Create/Update Company"));
 
-$comp_subdirs = array('images', 'pdf_files', 'backup','js_cache');
+$comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting');
 
 //---------------------------------------------------------------------------------------------
 
diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 761ef43c..995a39d7 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -85,7 +85,13 @@ class Report
 	}
 	function getDisplay() 
 	{
-		global $path_to_root, $use_date_picker;
+		global $comp_path, $path_to_root, $use_date_picker;
+
+	        $rep_file = $comp_path.'/'.user_company().
+		     "/reporting/rep".$this->id.".php";	 
+		if (!file_exists($rep_file))
+		    $rep_file = $path_to_root ."/reporting/rep".$this->id.".php";
+		    
 		$st = "
 <script language='javascript'>
 	function displayReport_" . $this->id . "() {
@@ -98,7 +104,7 @@ class Report
 
 		window.open('','REP_WINDOW','toolbar=no,scrollbar=no,resizable=yes,menubar=no');
 		document.forms[0].target='REP_WINDOW';
-		document.forms[0].action= '" . $path_to_root . "/reporting/rep" . $this->id . ".php';
+		document.forms[0].action= '$rep_file';
 		document.forms[0].submit();
 	}
 	function checkDate(pObj) {