From 8e32de74f1679af7d5165f38873b779381d53ac2 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 30 Mar 2010 13:32:30 +0000
Subject: [PATCH] Fix: rename "templates" to "tpl" and add class directory

---
 htdocs/admin/multicompany.php                           | 2 +-
 htdocs/includes/modules/modMultiCompany.class.php       | 2 +-
 htdocs/multicompany/{ => class}/multicompany.class.php  | 0
 htdocs/multicompany/{templates => tpl}/add-entity.tpl   | 0
 htdocs/multicompany/{templates => tpl}/admin-entity.tpl | 0
 htdocs/multicompany/{templates => tpl}/edit-entity.tpl  | 0
 htdocs/multicompany/{templates => tpl}/index.php        | 0
 htdocs/multicompany/{templates => tpl}/view-entity.tpl  | 0
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename htdocs/multicompany/{ => class}/multicompany.class.php (100%)
 rename htdocs/multicompany/{templates => tpl}/add-entity.tpl (100%)
 rename htdocs/multicompany/{templates => tpl}/admin-entity.tpl (100%)
 rename htdocs/multicompany/{templates => tpl}/edit-entity.tpl (100%)
 rename htdocs/multicompany/{templates => tpl}/index.php (100%)
 rename htdocs/multicompany/{templates => tpl}/view-entity.tpl (100%)

diff --git a/htdocs/admin/multicompany.php b/htdocs/admin/multicompany.php
index ce4ca7ae54c..d453bb4067a 100644
--- a/htdocs/admin/multicompany.php
+++ b/htdocs/admin/multicompany.php
@@ -26,7 +26,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/multicompany/multicompany.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/multicompany/class/multicompany.class.php');
 
 $langs->load("admin");
 
diff --git a/htdocs/includes/modules/modMultiCompany.class.php b/htdocs/includes/modules/modMultiCompany.class.php
index d2248943b05..d4039147f25 100644
--- a/htdocs/includes/modules/modMultiCompany.class.php
+++ b/htdocs/includes/modules/modMultiCompany.class.php
@@ -68,7 +68,7 @@ class modMultiCompany extends DolibarrModules
 		$this->picto='globe';
 
 		// Data directories to create when module is enabled.
-		$this->dirs = array('/smarty/cache/temp','/smarty/templates/temp');
+		$this->dirs = array();
 
 		// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
 		$this->style_sheet = '';
diff --git a/htdocs/multicompany/multicompany.class.php b/htdocs/multicompany/class/multicompany.class.php
similarity index 100%
rename from htdocs/multicompany/multicompany.class.php
rename to htdocs/multicompany/class/multicompany.class.php
diff --git a/htdocs/multicompany/templates/add-entity.tpl b/htdocs/multicompany/tpl/add-entity.tpl
similarity index 100%
rename from htdocs/multicompany/templates/add-entity.tpl
rename to htdocs/multicompany/tpl/add-entity.tpl
diff --git a/htdocs/multicompany/templates/admin-entity.tpl b/htdocs/multicompany/tpl/admin-entity.tpl
similarity index 100%
rename from htdocs/multicompany/templates/admin-entity.tpl
rename to htdocs/multicompany/tpl/admin-entity.tpl
diff --git a/htdocs/multicompany/templates/edit-entity.tpl b/htdocs/multicompany/tpl/edit-entity.tpl
similarity index 100%
rename from htdocs/multicompany/templates/edit-entity.tpl
rename to htdocs/multicompany/tpl/edit-entity.tpl
diff --git a/htdocs/multicompany/templates/index.php b/htdocs/multicompany/tpl/index.php
similarity index 100%
rename from htdocs/multicompany/templates/index.php
rename to htdocs/multicompany/tpl/index.php
diff --git a/htdocs/multicompany/templates/view-entity.tpl b/htdocs/multicompany/tpl/view-entity.tpl
similarity index 100%
rename from htdocs/multicompany/templates/view-entity.tpl
rename to htdocs/multicompany/tpl/view-entity.tpl