diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index f3477e151a2..0a315897081 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -26,13 +26,13 @@ /** * \file htdocs/admin/livraison.php * \ingroup livraison - * \brief Page d'administration/configuration du module Livraison + * \brief Page d'administration/configuration du module Delivery */ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; +require_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php'; // Load translation files required by the page $langs->loadLangs(array("admin", "sendings", "deliveries", "other")); @@ -87,7 +87,7 @@ if ($action == 'specimen') { $modele = GETPOST('module', 'alpha'); - $sending = new Livraison($db); + $sending = new Delivery($db); $sending->initAsSpecimen(); // Search template files @@ -245,7 +245,7 @@ foreach ($dirmodels as $reldir) } print ''; - $livraison = new Livraison($db); + $livraison = new Delivery($db); $livraison->initAsSpecimen(); // Info diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index b81757f261f..554332fe4db 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -405,7 +405,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '') // Informations on receipt if (!empty($conf->livraison_bon->enabled)) { - include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; + include_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php'; $expedition->id = $objp->sendingid; $expedition->fetchObjectLinked($expedition->id, $expedition->element); //var_dump($expedition->linkedObjects); diff --git a/htdocs/core/modules/livraison/doc/pdf_storm.modules.php b/htdocs/core/modules/livraison/doc/pdf_storm.modules.php index 2019de478eb..404e27b429f 100644 --- a/htdocs/core/modules/livraison/doc/pdf_storm.modules.php +++ b/htdocs/core/modules/livraison/doc/pdf_storm.modules.php @@ -29,7 +29,7 @@ */ require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'; -require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; +require_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php index 34b66066f54..8ea980fbd5c 100644 --- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php @@ -28,7 +28,7 @@ */ require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'; -require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; +require_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; diff --git a/htdocs/livraison/card.php b/htdocs/delivery/card.php similarity index 99% rename from htdocs/livraison/card.php rename to htdocs/delivery/card.php index 2a1646a5d80..7c796b70a97 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/delivery/card.php @@ -28,7 +28,7 @@ */ require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; +require_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php'; @@ -59,7 +59,7 @@ $id = GETPOST('id', 'int'); if ($user->socid) $socid = $user->socid; $result = restrictedArea($user, 'expedition', $id, 'livraison', 'livraison'); -$object = new Livraison($db); +$object = new Delivery($db); $extrafields = new ExtraFields($db); // fetch optionals attributes and labels @@ -306,7 +306,7 @@ if ($action == 'create') // Create. Seems to no be used /* - * Livraison + * Delivery */ if ($typeobject == 'commande' && $expedition->origin_id > 0 && !empty($conf->commande->enabled)) diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/delivery/class/delivery.class.php similarity index 98% rename from htdocs/livraison/class/livraison.class.php rename to htdocs/delivery/class/delivery.class.php index c612dbf6fe2..d7bd0856e74 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/delivery/class/delivery.class.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/livraison/class/livraison.class.php + * \file htdocs/livraison/class/delivery.class.php * \ingroup delivery * \brief Delivery Order Management Class File */ @@ -37,7 +37,7 @@ if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/ /** * Class to manage receptions */ -class Livraison extends CommonObject +class Delivery extends CommonObject { /** * @var string ID to identify managed object @@ -114,7 +114,7 @@ class Livraison extends CommonObject { global $conf; - dol_syslog("Livraison::create"); + dol_syslog("Delivery::create"); if (empty($this->model_pdf)) $this->model_pdf = $conf->global->LIVRAISON_ADDON_PDF; @@ -158,7 +158,7 @@ class Livraison extends CommonObject $sql .= ", '".$this->db->escape($this->location_incoterms)."'"; $sql .= ")"; - dol_syslog("Livraison::create", LOG_DEBUG); + dol_syslog("Delivery::create", LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -170,7 +170,7 @@ class Livraison extends CommonObject $sql .= "SET ref = '".$this->db->escape($numref)."'"; $sql .= " WHERE rowid = ".$this->id; - dol_syslog("Livraison::create", LOG_DEBUG); + dol_syslog("Delivery::create", LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -526,7 +526,7 @@ class Livraison extends CommonObject $num = count($expedition->lines); for ($i = 0; $i < $num; $i++) { - $line = new LivraisonLigne($this->db); + $line = new DeliveryLigne($this->db); $line->origin_line_id = $expedition->lines[$i]->origin_line_id; $line->libelle = $expedition->lines[$i]->libelle; $line->description = $expedition->lines[$i]->description; @@ -570,7 +570,7 @@ class Livraison extends CommonObject if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used { - $livraisonline = new LivraisonLigne($this->db); + $livraisonline = new DeliveryLigne($this->db); $livraisonline->array_options = $array_options; $livraisonline->id = $id; $result = $livraisonline->insertExtraFields(); @@ -597,7 +597,7 @@ class Livraison extends CommonObject public function addline($origin_id, $qty) { $num = count($this->lines); - $line = new LivraisonLigne($this->db); + $line = new DeliveryLigne($this->db); $line->origin_id = $origin_id; $line->qty = $qty; @@ -773,7 +773,7 @@ class Livraison extends CommonObject $i = 0; while ($i < $num) { - $line = new LivraisonLigne($this->db); + $line = new DeliveryLigne($this->db); $obj = $this->db->fetch_object($resql); @@ -911,7 +911,7 @@ class Livraison extends CommonObject $this->note_private = 'Private note'; $i = 0; - $line = new LivraisonLigne($this->db); + $line = new DeliveryLigne($this->db); $line->fk_product = $prodids[0]; $line->qty_asked = 10; $line->qty_shipped = 9; @@ -1083,7 +1083,7 @@ class Livraison extends CommonObject /** * Management class of delivery note lines */ -class LivraisonLigne extends CommonObjectLine +class DeliveryLigne extends CommonObjectLine { /** * @var DoliDB Database handler. diff --git a/htdocs/livraison/class/index.html b/htdocs/delivery/class/index.html similarity index 100% rename from htdocs/livraison/class/index.html rename to htdocs/delivery/class/index.html diff --git a/htdocs/livraison/index.html b/htdocs/delivery/index.html similarity index 100% rename from htdocs/livraison/index.html rename to htdocs/delivery/index.html diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 9b6a07a5435..e5ae22d5f91 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -878,8 +878,8 @@ class Expedition extends CommonObject if ($this->statut == self::STATUS_VALIDATED || $this->statut == self::STATUS_CLOSED) { // Expedition validee - include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; - $delivery = new Livraison($this->db); + include_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php'; + $delivery = new Delivery($this->db); $result = $delivery->create_from_sending($user, $this->id); if ($result > 0) { diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 9e6ad514da6..6dad894cd38 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -236,7 +236,7 @@ if (empty($reshook)) 'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php', 'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php', 'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php', - 'Livraison' => '/livraison/class/livraison.class.php', + 'Livraison' => '/delivery/class/delivery.class.php', 'Product' => '/product/class/product.class.php', 'Project' => '/projet/class/project.class.php', 'User' => '/user/class/user.class.php', diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php index 8551cb61f10..e6895b367cb 100644 --- a/htdocs/societe/class/api_thirdparties.class.php +++ b/htdocs/societe/class/api_thirdparties.class.php @@ -417,7 +417,7 @@ class Thirdparties extends DolibarrApi 'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php', 'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php', 'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php', - 'Livraison' => '/livraison/class/livraison.class.php', + 'Livraison' => '/delivery/class/delivery.class.php', 'Product' => '/product/class/product.class.php', 'Project' => '/projet/class/project.class.php', 'User' => '/user/class/user.class.php',