From 391c595ddac012ff6958fda9bcbd8aac143e34d3 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Thu, 29 Apr 2010 08:50:46 +0000 Subject: [PATCH] according to new tree directory --- htdocs/cashdesk/tpl/menu.tpl.php | 2 +- htdocs/commande/class/commande.class.php | 4 ++-- htdocs/compta/facture/class/facture.class.php | 4 ++-- htdocs/expedition/class/expedition.class.php | 4 ++-- htdocs/expedition/fiche.php | 2 +- htdocs/expedition/shipment.php | 2 +- htdocs/fourn/class/fournisseur.commande.class.php | 6 +++--- htdocs/fourn/class/fournisseur.facture.class.php | 4 ++-- htdocs/fourn/commande/dispatch.php | 2 +- htdocs/livraison/class/livraison.class.php | 2 +- htdocs/livraison/fiche.php | 2 +- htdocs/product/class/product.class.php | 4 ++-- htdocs/product/stock/{ => class}/entrepot.class.php | 0 htdocs/product/stock/{ => class}/mouvementstock.class.php | 0 htdocs/product/stock/fiche-valo.php | 2 +- htdocs/product/stock/fiche.php | 2 +- htdocs/product/stock/index.php | 2 +- htdocs/product/stock/info.php | 2 +- htdocs/product/stock/liste.php | 2 +- htdocs/product/stock/mouvement.php | 2 +- htdocs/product/stock/product.php | 2 +- htdocs/product/stock/user.php | 2 +- htdocs/product/stock/valo.php | 2 +- htdocs/user/user.class.php | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-) rename htdocs/product/stock/{ => class}/entrepot.class.php (100%) rename htdocs/product/stock/{ => class}/mouvementstock.class.php (100%) diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 356fb3870bb..17609772a96 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -20,7 +20,7 @@ include_once(DOL_DOCUMENT_ROOT.'/societe/societe.class.php'); include_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/product/stock/entrepot.class.php'); +include_once(DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'); if (!empty($conf->global->CASHDESK_ID_THIRDPARTY)) { diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 98cf7489c7a..88bf556956c 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -277,7 +277,7 @@ class Commande extends CommonObject // If stock is incremented on validate order, we must increment it if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php"); + require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); // Loop on each line for ($i = 0 ; $i < sizeof($this->lignes) ; $i++) @@ -383,7 +383,7 @@ class Commande extends CommonObject // If stock is decremented on validate order, we must reincrement it if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php"); + require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); for ($i = 0 ; $i < sizeof($this->lignes) ; $i++) { diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 60acbe4206e..6c898ac020b 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1405,7 +1405,7 @@ class Facture extends CommonObject // Si active on decremente le produit principal et ses composants a la validation de facture if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php"); + require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); // Loop on each line for ($i = 0 ; $i < sizeof($this->lignes) ; $i++) @@ -1514,7 +1514,7 @@ class Facture extends CommonObject // Si active on decremente le produit principal et ses composants a la validation de facture if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php"); + require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); for ($i = 0 ; $i < sizeof($this->lignes) ; $i++) { diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 7b66c071650..4f563e88435 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -81,7 +81,7 @@ class Expedition extends CommonObject { global $conf; - require_once DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php"; + require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php"; $error = 0; // Clean parameters @@ -370,7 +370,7 @@ class Expedition extends CommonObject // If stock increment is done on sending (recommanded choice) if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SHIPMENT) { - require_once DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php"; + require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php"; // Loop on each product line to add a stock movement // TODO possibilite d'expedier a partir d'une propale ou autre origine diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index c5386ec2691..493a87b1400 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -37,7 +37,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); $langs->load("sendings"); $langs->load("companies"); diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index f196bb4460d..9b3b6ce176d 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -35,7 +35,7 @@ if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUME if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); $langs->load('orders'); $langs->load("companies"); diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index ca3ffa33375..67a5e54232b 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -566,7 +566,7 @@ class CommandeFournisseur extends Commande // If stock is incremented on validate order, we must increment it if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER == 1) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php"); + require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); for ($i = 0 ; $i < sizeof($this->lignes) ; $i++) { @@ -923,7 +923,7 @@ class CommandeFournisseur extends Commande function DispatchProducts($user, $products, $qtys, $entrepots) { global $conf; - require_once DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php"; + require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php"; $this->db->begin(); @@ -945,7 +945,7 @@ class CommandeFournisseur extends Commande { global $conf; $error = 0; - require_once DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php"; + require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php"; dol_syslog("CommandeFournisseur::DispatchProduct"); diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 1f0b9fedfea..dbc6ebcac90 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -589,7 +589,7 @@ class FactureFournisseur extends Facture // Si activé on décrémente le produit principal et ses composants à la validation de facture if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php"); + require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); for ($i = 0 ; $i < sizeof($this->lignes) ; $i++) { @@ -663,7 +663,7 @@ class FactureFournisseur extends Facture // Si active on decremente le produit principal et ses composants a la validation de facture if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php"); + require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); for ($i = 0 ; $i < sizeof($this->lignes) ; $i++) { diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index d3aa9b2ee3e..b7bd0b6585d 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index 414d1684c9f..4248bae0c93 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index ec2e008ada0..6f1164a8baa 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); if ($conf->expedition_bon->enabled) require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); -if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); if (!$user->rights->expedition->livraison->lire) accessforbidden(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 9b3a3b709e6..50fad237af9 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2291,7 +2291,7 @@ class Product extends CommonObject */ function ajust_stock($user, $id_entrepot, $nbpiece, $movement, $label='') { - require_once(DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php"); + require_once(DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php"); $op[0] = "+".trim($nbpiece); $op[1] = "-".trim($nbpiece); @@ -2314,7 +2314,7 @@ class Product extends CommonObject */ function create_stock($user, $id_entrepot, $nbpiece, $movement=0, $label='') { - require_once(DOL_DOCUMENT_ROOT ."/product/stock/mouvementstock.class.php"); + require_once(DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php"); $op[0] = "+".trim($nbpiece); $op[1] = "-".trim($nbpiece); diff --git a/htdocs/product/stock/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php similarity index 100% rename from htdocs/product/stock/entrepot.class.php rename to htdocs/product/stock/class/entrepot.class.php diff --git a/htdocs/product/stock/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php similarity index 100% rename from htdocs/product/stock/mouvementstock.class.php rename to htdocs/product/stock/class/mouvementstock.class.php diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php index d4f19fe65aa..70d51e4e1d0 100644 --- a/htdocs/product/stock/fiche-valo.php +++ b/htdocs/product/stock/fiche-valo.php @@ -25,7 +25,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); $langs->load("products"); diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index 9ec6dac6a63..cd8e47ae46a 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index 3d283f2914c..f858511cdb7 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -28,7 +28,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); $langs->load("stocks"); diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php index 7bc22b42a4d..c16f09a82d6 100644 --- a/htdocs/product/stock/info.php +++ b/htdocs/product/stock/info.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/liste.php index 4a1e3a7693d..017f3c548a7 100644 --- a/htdocs/product/stock/liste.php +++ b/htdocs/product/stock/liste.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); $langs->load("stocks"); diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 08b827039f4..608d6cfa394 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index b7cc8ebdbd0..97fd18650c5 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -28,7 +28,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); diff --git a/htdocs/product/stock/user.php b/htdocs/product/stock/user.php index 57f923082d9..c771fe9d476 100644 --- a/htdocs/product/stock/user.php +++ b/htdocs/product/stock/user.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index 351a9e1c446..9ce6a16bcc6 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); $langs->load("stocks"); diff --git a/htdocs/user/user.class.php b/htdocs/user/user.class.php index 68c8a41334c..5d653d98f2a 100644 --- a/htdocs/user/user.class.php +++ b/htdocs/user/user.class.php @@ -750,7 +750,7 @@ class User extends CommonObject if (! empty($conf->global->STOCK_USERSTOCK) && ! empty($conf->global->STOCK_USERSTOCK_AUTOCREATE)) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); + require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); $entrepot = new Entrepot($this->db); $entrepot->libelle = 'Stock Personnel '.$this->nom; $entrepot->description = 'Cet entrepot represente le stock personnel de '.$this->prenom.' '.$this->nom;