From c73003b3b126400245ace982a3c7e5e15f3590c8 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 27 Apr 2010 14:48:11 +0000 Subject: [PATCH] according to new tree directory --- htdocs/categories/categorie.php | 2 +- htdocs/categories/{ => class}/categorie.class.php | 0 htdocs/categories/docreate.php | 2 +- htdocs/categories/domodif.php | 2 +- htdocs/categories/edit.php | 2 +- htdocs/categories/fiche.php | 2 +- htdocs/categories/index.php | 2 +- htdocs/categories/liste.php | 2 +- htdocs/categories/photos.php | 2 +- htdocs/categories/viewcat.php | 2 +- htdocs/fourn/index.php | 2 +- htdocs/html.formother.class.php | 2 +- htdocs/product/composition/fiche.php | 2 +- htdocs/product/liste.php | 2 +- htdocs/product/product.class.php | 2 +- htdocs/product/reassort.php | 2 +- htdocs/societe/societe.class.php | 2 +- 17 files changed, 16 insertions(+), 16 deletions(-) rename htdocs/categories/{ => class}/categorie.class.php (100%) diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 1e2b279b9fb..5f349721a28 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); $langs->load("categories"); diff --git a/htdocs/categories/categorie.class.php b/htdocs/categories/class/categorie.class.php similarity index 100% rename from htdocs/categories/categorie.class.php rename to htdocs/categories/class/categorie.class.php diff --git a/htdocs/categories/docreate.php b/htdocs/categories/docreate.php index bf959a9f3f9..7b3606b5425 100644 --- a/htdocs/categories/docreate.php +++ b/htdocs/categories/docreate.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); $langs->load("categories"); diff --git a/htdocs/categories/domodif.php b/htdocs/categories/domodif.php index 0e1f02ee812..8834027ea9d 100644 --- a/htdocs/categories/domodif.php +++ b/htdocs/categories/domodif.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); if (!isset ($_REQUEST["id"]) || !isset ($_REQUEST["nom"]) || !isset ($_REQUEST["description"])) accessforbidden(); diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 9b18bcb0f03..7ccc2b70156 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); // If socid provided by ajax company selector if (! empty($_REQUEST['socid_id'])) diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index f23e33cb060..c6e3a00b5f0 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); // If socid provided by ajax company selector if (! empty($_REQUEST['socid_id'])) diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index a643d86220c..afe41e82b13 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); $type=isset($_GET['type'])?$_GET['type']:$_POST['type']; diff --git a/htdocs/categories/liste.php b/htdocs/categories/liste.php index 0484b226b62..b0632cdc595 100644 --- a/htdocs/categories/liste.php +++ b/htdocs/categories/liste.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); if (!$user->rights->categorie->lire) accessforbidden(); diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index cea6591a7fa..780104a50cd 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); $langs->load("category"); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 313b2f41adf..dae7d883fcc 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); // Security check if (! $user->rights->categorie->lire) diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index f55b780fc11..e299bffc51d 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -28,7 +28,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/categories/categorie.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'); $langs->load("suppliers"); $langs->load("orders"); diff --git a/htdocs/html.formother.class.php b/htdocs/html.formother.class.php index 01cf1382f80..6f268037a2f 100644 --- a/htdocs/html.formother.class.php +++ b/htdocs/html.formother.class.php @@ -242,7 +242,7 @@ class FormOther function select_categories($type,$selected=0,$htmlname='search_categ') { global $langs; - require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); + require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); // Load list of "categories" $static_categs = new Categorie($this->db); diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php index b1da406a5ca..af4b3e14a8b 100644 --- a/htdocs/product/composition/fiche.php +++ b/htdocs/product/composition/fiche.php @@ -31,7 +31,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); $langs->load("bills"); $langs->load("products"); diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 53f411e69fe..09d8d85c651 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -28,7 +28,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/product/product.class.php'); require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php"); -if ($conf->categorie->enabled) require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +if ($conf->categorie->enabled) require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); $langs->load("products"); diff --git a/htdocs/product/product.class.php b/htdocs/product/product.class.php index 86098e25d9a..5d58744c5b0 100644 --- a/htdocs/product/product.class.php +++ b/htdocs/product/product.class.php @@ -304,7 +304,7 @@ class Product extends CommonObject { if ($this->catid > 0) { - require_once(DOL_DOCUMENT_ROOT ."/categories/categorie.class.php"); + require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php"); $cat = new Categorie($this->db, $this->catid); $cat->add_type($this,"product"); } diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index fafbb8c83e7..f6fd576cbbb 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/product/product.class.php'); -require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); +require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); $langs->load("products"); $langs->load("stocks"); diff --git a/htdocs/societe/societe.class.php b/htdocs/societe/societe.class.php index 06a73fb407d..b7346ba7069 100644 --- a/htdocs/societe/societe.class.php +++ b/htdocs/societe/societe.class.php @@ -806,7 +806,7 @@ class Societe extends CommonObject { // Added by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-third-party-deleting.html) // Removing every "categorie" link with this company - require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); + require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); $static_cat = new Categorie($this->db); $toute_categs = array();