lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

translate livraison2delivery => change folder, filename and class ref into all dependencies #14697

Browse Source
This commit is contained in:
Aurélien 2020-10-05 13:59:06 +02:00
parent 8a079cf716
commit bdd095f6bb
No known key found for this signature in database
GPG Key ID: 296611B615F8FDF3
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/livraison.php
View File

@ -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 '</td>';
$livraison = new Livraison($db);
$livraison = new Delivery($db);
$livraison->initAsSpecimen();
// Info

2
htdocs/core/lib/sendings.lib.php
View File

@ -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);

2
htdocs/core/modules/livraison/doc/pdf_storm.modules.php
View File

@ -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';

2
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
View File

@ -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';

6
htdocs/livraison/card.php → htdocs/delivery/card.php
View File

@ -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))

22
htdocs/livraison/class/livraison.class.php → htdocs/delivery/class/delivery.class.php
View File

@ -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.

0
htdocs/livraison/class/index.html → htdocs/delivery/class/index.html
View File

0
htdocs/livraison/index.html → htdocs/delivery/index.html
View File

4
htdocs/expedition/class/expedition.class.php
View File

@ -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)
{

2
htdocs/societe/card.php
View File

@ -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',

2
htdocs/societe/class/api_thirdparties.class.php
View File

@ -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',