change table into DB and ref #14697

dev/initdata/purge-data.php

@@ -120,8 +120,8 @@ $sqls=array(
         "DELETE FROM ".MAIN_DB_PREFIX."expedition where date_creation < '__DATE__'",
     ),
     'delivery'=>array(
-        "DELETE FROM ".MAIN_DB_PREFIX."livraisondet WHERE fk_livraison IN (select rowid FROM ".MAIN_DB_PREFIX."livraison where date_creation < '__DATE__')",
-        "DELETE FROM ".MAIN_DB_PREFIX."livraison where date_creation < '__DATE__'",
+        "DELETE FROM ".MAIN_DB_PREFIX."deliverydet WHERE fk_delivery IN (select rowid FROM ".MAIN_DB_PREFIX."delivery where date_creation < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."delivery where date_creation < '__DATE__'",
     ),
     'contract'=>array(
         "DELETE FROM ".MAIN_DB_PREFIX."contratdet_extrafields WHERE fk_object IN (select rowid FROM ".MAIN_DB_PREFIX."contratdet WHERE fk_contrat IN (select rowid FROM ".MAIN_DB_PREFIX."contrat where datec < '__DATE__'))",

dev/initdemo/mysqldump_dolibarr_12.0.0.sql

@@ -7522,13 +7522,13 @@ INSERT INTO `llx_links` VALUES (1,1,'2018-01-16 16:45:35','http://www.dolicloud.
 UNLOCK TABLES;
 
 --
--- Table structure for table `llx_livraison`
+-- Table structure for table `llx_delivery`
 --
 
-DROP TABLE IF EXISTS `llx_livraison`;
+DROP TABLE IF EXISTS `llx_delivery`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_livraison` (
+CREATE TABLE `llx_delivery` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
@@ -7554,61 +7554,61 @@ CREATE TABLE `llx_livraison` (
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
-  UNIQUE KEY `idx_livraison_uk_ref` (`ref`,`entity`),
-  KEY `idx_livraison_fk_soc` (`fk_soc`),
-  KEY `idx_livraison_fk_user_author` (`fk_user_author`),
-  KEY `idx_livraison_fk_user_valid` (`fk_user_valid`),
-  CONSTRAINT `fk_livraison_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
-  CONSTRAINT `fk_livraison_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
-  CONSTRAINT `fk_livraison_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+  UNIQUE KEY `idx_delivery_uk_ref` (`ref`,`entity`),
+  KEY `idx_delivery_fk_soc` (`fk_soc`),
+  KEY `idx_delivery_fk_user_author` (`fk_user_author`),
+  KEY `idx_delivery_fk_user_valid` (`fk_user_valid`),
+  CONSTRAINT `fk_delivery_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_delivery_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_delivery_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `llx_livraison`
+-- Dumping data for table `llx_delivery`
 --
 
-LOCK TABLES `llx_livraison` WRITE;
-/*!40000 ALTER TABLE `llx_livraison` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_livraison` ENABLE KEYS */;
+LOCK TABLES `llx_delivery` WRITE;
+/*!40000 ALTER TABLE `llx_delivery` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_delivery` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
--- Table structure for table `llx_livraison_extrafields`
+-- Table structure for table `llx_delivery_extrafields`
 --
 
-DROP TABLE IF EXISTS `llx_livraison_extrafields`;
+DROP TABLE IF EXISTS `llx_delivery_extrafields`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_livraison_extrafields` (
+CREATE TABLE `llx_delivery_extrafields` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_object` int(11) NOT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
-  KEY `idx_livraison_extrafields` (`fk_object`)
+  KEY `idx_delivery_extrafields` (`fk_object`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `llx_livraison_extrafields`
+-- Dumping data for table `llx_delivery_extrafields`
 --
 
-LOCK TABLES `llx_livraison_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_livraison_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_livraison_extrafields` ENABLE KEYS */;
+LOCK TABLES `llx_delivery_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_delivery_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_delivery_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
--- Table structure for table `llx_livraisondet`
+-- Table structure for table `llx_deliverydet`
 --
 
-DROP TABLE IF EXISTS `llx_livraisondet`;
+DROP TABLE IF EXISTS `llx_deliverydet`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_livraisondet` (
+CREATE TABLE `llx_deliverydet` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_livraison` int(11) DEFAULT NULL,
+  `fk_delivery` int(11) DEFAULT NULL,
   `fk_origin_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
   `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -7617,44 +7617,44 @@ CREATE TABLE `llx_livraisondet` (
   `total_ht` double(24,8) DEFAULT 0.00000000,
   `rang` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
-  KEY `idx_livraisondet_fk_expedition` (`fk_livraison`),
-  CONSTRAINT `fk_livraisondet_fk_livraison` FOREIGN KEY (`fk_livraison`) REFERENCES `llx_livraison` (`rowid`)
+  KEY `idx_deliverydet_fk_expedition` (`fk_delivery`),
+  CONSTRAINT `fk_deliverydet_fk_delivery` FOREIGN KEY (`fk_delivery`) REFERENCES `llx_delivery` (`rowid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `llx_livraisondet`
+-- Dumping data for table `llx_deliverydet`
 --
 
-LOCK TABLES `llx_livraisondet` WRITE;
-/*!40000 ALTER TABLE `llx_livraisondet` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_livraisondet` ENABLE KEYS */;
+LOCK TABLES `llx_deliverydet` WRITE;
+/*!40000 ALTER TABLE `llx_deliverydet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_deliverydet` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
--- Table structure for table `llx_livraisondet_extrafields`
+-- Table structure for table `llx_deliverydet_extrafields`
 --
 
-DROP TABLE IF EXISTS `llx_livraisondet_extrafields`;
+DROP TABLE IF EXISTS `llx_deliverydet_extrafields`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_livraisondet_extrafields` (
+CREATE TABLE `llx_deliverydet_extrafields` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_object` int(11) NOT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
-  KEY `idx_livraisondet_extrafields` (`fk_object`)
+  KEY `idx_deliverydet_extrafields` (`fk_object`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `llx_livraisondet_extrafields`
+-- Dumping data for table `llx_deliverydet_extrafields`
 --
 
-LOCK TABLES `llx_livraisondet_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_livraisondet_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_livraisondet_extrafields` ENABLE KEYS */;
+LOCK TABLES `llx_deliverydet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_deliverydet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_deliverydet_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --

htdocs/core/lib/sendings.lib.php

@@ -219,7 +219,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 	$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
 	$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
 	$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-	//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
+	//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 	//TODO Add link to expeditiondet_batch
 	$sql .= " WHERE e.entity IN (".getEntity('expedition').")";

htdocs/core/modules/livraison/mod_livraison_jade.php

@@ -98,7 +98,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
-		$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+		$sql .= " FROM ".MAIN_DB_PREFIX."delivery";
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 
@@ -132,7 +132,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 		// First, we get the max value
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
-		$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+		$sql .= " FROM ".MAIN_DB_PREFIX."delivery";
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 

htdocs/delivery/class/delivery.class.php

@@ -47,24 +47,24 @@ class Delivery extends CommonObject
 	/**
 	 * @var int Field with ID of parent key if this field has a parent
 	 */
-	public $fk_element = "fk_livraison";
+	public $fk_element = "fk_delivery";
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = "livraison";
+	public $table_element = "delivery";
 
 	/**
 	 * @var int    Name of subtable line
 	 */
-	public $table_element_line = "livraisondet";
+	public $table_element_line = "deliverydet";
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'sending';
 
-	public $brouillon;
+	public $draft;
 	public $socid;
 	public $ref_customer;
 
@@ -108,7 +108,7 @@ class Delivery extends CommonObject
 	 *  Create delivery receipt in database
 	 *
 	 *  @param 	User	$user       Objet du user qui cree
-	 *  @return int         		<0 si erreur, id livraison cree si ok
+	 *  @return int         		<0 si erreur, id delivery cree si ok
 	 */
     public function create($user)
 	{
@@ -122,14 +122,14 @@ class Delivery extends CommonObject
 
         $now = dol_now();
 
-		/* On positionne en mode brouillon le bon de livraison */
-		$this->brouillon = 1;
+		/* Delivery note as draft On positionne en mode draft le bon de livraison */
+		$this->draft = 1;
 
 		$this->user = $user;
 
 		$this->db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraison (";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."delivery (";
 		$sql .= "ref";
 		$sql .= ", entity";
 		$sql .= ", fk_soc";
@@ -162,11 +162,11 @@ class Delivery extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."livraison");
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."delivery");
 
 			$numref = "(PROV".$this->id.")";
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."livraison ";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."delivery ";
 			$sql .= "SET ref = '".$this->db->escape($numref)."'";
 			$sql .= " WHERE rowid = ".$this->id;
 
@@ -207,7 +207,7 @@ class Delivery extends CommonObject
 
 					if (!$conf->expedition_bon->enabled)
 					{
-						// TODO uniformiser les statuts
+						// TODO standardize status uniformiser les statuts
 						$ret = $this->setStatut(2, $this->origin_id, $this->origin);
 						if (!$ret)
 						{
@@ -257,7 +257,7 @@ class Delivery extends CommonObject
 		$idprod = $fk_product;
 		$j = 0;
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraisondet (fk_livraison, fk_origin_line,";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."deliverydet (fk_delivery, fk_origin_line,";
 		$sql .= " fk_product, description, qty)";
 		$sql .= " VALUES (".$this->id.",".$origin_id.",";
 		$sql .= " ".($idprod > 0 ? $idprod : "null").",";
@@ -292,7 +292,7 @@ class Delivery extends CommonObject
 		$sql .= ", el.fk_source as origin_id, el.sourcetype as origin";
         $sql .= ', l.fk_incoterms, l.location_incoterms';
         $sql .= ", i.libelle as label_incoterms";
-		$sql .= " FROM ".MAIN_DB_PREFIX."livraison as l";
+		$sql .= " FROM ".MAIN_DB_PREFIX."delivery as l";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
 		$sql .= " WHERE l.rowid = ".$id;
@@ -330,7 +330,7 @@ class Delivery extends CommonObject
 				$this->label_incoterms = $obj->label_incoterms;
 				$this->db->free($result);
 
-				if ($this->statut == 0) $this->brouillon = 1;
+				if ($this->statut == 0) $this->draft = 1;
 
 				// Retreive all extrafields
 				// fetch optionals attributes and labels
@@ -402,7 +402,7 @@ class Delivery extends CommonObject
 
 					// Test if is not already in valid status. If so, we stop to avoid decrementing the stock twice.
 					$sql = "SELECT ref";
-					$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+					$sql .= " FROM ".MAIN_DB_PREFIX."delivery";
 					$sql .= " WHERE ref = '".$this->db->escape($numref)."'";
 					$sql .= " AND fk_statut <> 0";
 					$sql .= " AND entity = ".$conf->entity;
@@ -417,7 +417,7 @@ class Delivery extends CommonObject
 						}
 					}
 
-					$sql = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
+					$sql = "UPDATE ".MAIN_DB_PREFIX."delivery SET";
 					$sql .= " ref='".$this->db->escape($numref)."'";
 					$sql .= ", fk_statut = 1";
 					$sql .= ", date_valid = '".$this->db->idate($now)."'";
@@ -570,14 +570,14 @@ class Delivery 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 DeliveryLigne($this->db);
-			$livraisonline->array_options = $array_options;
-			$livraisonline->id = $id;
-			$result = $livraisonline->insertExtraFields();
+			$line = new DeliveryLigne($this->db);
+			$line->array_options = $array_options;
+			$line->id = $id;
+			$result = $line->insertExtraFields();
 
 			if ($result < 0)
 			{
-				$this->error[] = $livraisonline->error;
+				$this->error[] = $line->error;
 				$error++;
 			}
 		}
@@ -643,8 +643,8 @@ class Delivery extends CommonObject
 
 		$error = 0;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraisondet";
-		$sql .= " WHERE fk_livraison = ".$this->id;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."deliverydet";
+		$sql .= " WHERE fk_delivery = ".$this->id;
 		if ($this->db->query($sql))
 		{
 			// Delete linked object
@@ -653,13 +653,13 @@ class Delivery extends CommonObject
 
 			if (!$error)
 			{
-				$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraison";
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."delivery";
 				$sql .= " WHERE rowid = ".$this->id;
 				if ($this->db->query($sql))
 				{
 					$this->db->commit();
 
-					// On efface le repertoire de pdf provisoire
+					// Deleting pdf folder's draft On efface le repertoire de pdf provisoire
 					$ref = dol_sanitizeFileName($this->ref);
 					if (!empty($conf->expedition->dir_output))
 					{
@@ -760,10 +760,10 @@ class Delivery extends CommonObject
 		$sql .= " cd.qty as qty_asked, cd.label as custom_label, cd.fk_unit,";
 		$sql .= " p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc,";
 		$sql .= " p.weight, p.weight_units,  p.width, p.width_units, p.length, p.length_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
-		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."deliverydet as ld";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on p.rowid = ld.fk_product";
 		$sql .= " WHERE ld.fk_origin_line = cd.rowid";
-		$sql .= " AND ld.fk_livraison = ".$this->id;
+		$sql .= " AND ld.fk_delivery = ".$this->id;
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -956,10 +956,10 @@ class Delivery extends CommonObject
 
 				// Get lines of sources alread delivered
 				$sql = "SELECT ld.fk_origin_line, sum(ld.qty) as qty";
-				$sql .= " FROM ".MAIN_DB_PREFIX."livraisondet as ld, ".MAIN_DB_PREFIX."livraison as l,";
+				$sql .= " FROM ".MAIN_DB_PREFIX."deliverydet as ld, ".MAIN_DB_PREFIX."delivery as l,";
 				$sql .= " ".MAIN_DB_PREFIX.$this->linked_object[0]['type']." as c";
 				$sql .= ", ".MAIN_DB_PREFIX.$this->linked_object[0]['type']."det as cd";
-				$sql .= " WHERE ld.fk_livraison = l.rowid";
+				$sql .= " WHERE ld.fk_delivery = l.rowid";
 				$sql .= " AND ld.fk_origin_line = cd.rowid";
 				$sql .= " AND cd.fk_".$this->linked_object[0]['type']." = c.rowid";
 				$sql .= " AND cd.fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
@@ -1009,7 +1009,7 @@ class Delivery extends CommonObject
         // phpcs:enable
 		if ($user->rights->expedition->creer)
 		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."livraison";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."delivery";
 			$sql .= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
@@ -1125,12 +1125,12 @@ class DeliveryLigne extends CommonObjectLine
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element = 'livraisondet';
+	public $element = 'deliverydet';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'livraisondet';
+	public $table_element = 'deliverydet';
 
     /**
      *	Constructor

htdocs/expedition/card.php

@@ -2052,7 +2052,7 @@ if ($action == 'create')
 			$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
 			$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
 			$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-			//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
+			//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
 			$sql .= " AND obj.fk_".$origin." = ".$origin_id;

htdocs/expedition/list.php

@@ -246,7 +246,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON e.fk_user_author = u.rowid';
 
 // We'll need this table joined to the select in order to filter by sale

htdocs/install/mysql/migration/repair.sql

@@ -91,8 +91,8 @@ delete from llx_commandedet where fk_commande in (select rowid from llx_commande
 delete from llx_commande where ref = '';
 delete from llx_propaldet where fk_propal in (select rowid from llx_propal where ref = '');
 delete from llx_propal where ref = '';
-delete from llx_livraisondet where fk_livraison in (select rowid from llx_livraison where ref = '');
-delete from llx_livraison where ref = '';
+delete from llx_deliverydet where fk_delivery in (select rowid from llx_delivery where ref = '');
+delete from llx_delivery where ref = '';
 delete from llx_expeditiondet where fk_expedition in (select rowid from llx_expedition where ref = '');
 delete from llx_expedition where ref = '';
 delete from llx_holiday_logs where fk_user_update not IN (select rowid from llx_user);
@@ -187,8 +187,8 @@ delete from llx_categorie_project where fk_categorie not in (select rowid from l
 delete from llx_ecm_files where src_object_type = 'expensereport' and src_object_id NOT IN (select rowid from llx_expensereport);
 
 -- Fix: delete orphelin deliveries. Note: deliveries are linked to shipment by llx_element_element only. No other links.
-delete from llx_livraisondet where fk_livraison not in (select fk_target from llx_element_element where targettype = 'delivery') AND fk_livraison not in (select fk_source from llx_element_element where sourcetype = 'delivery');
-delete from llx_livraison    where rowid not in (select fk_target from llx_element_element where targettype = 'delivery') AND rowid not in (select fk_source from llx_element_element where sourcetype = 'delivery');
+delete from llx_deliverydet where fk_delivery not in (select fk_target from llx_element_element where targettype = 'delivery') AND fk_delivery not in (select fk_source from llx_element_element where sourcetype = 'delivery');
+delete from llx_delivery    where rowid not in (select fk_target from llx_element_element where targettype = 'delivery') AND rowid not in (select fk_source from llx_element_element where sourcetype = 'delivery');
 
 
 -- Fix delete element_element orphelins (right side)

htdocs/install/mysql/tables/llx_livraison.key.sql → htdocs/install/mysql/tables/llx_delivery.key.sql

@@ -18,12 +18,12 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref, entity);
+ALTER TABLE llx_delivery ADD UNIQUE INDEX idx_delivery_uk_ref (ref, entity);
 
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_soc (fk_soc);
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_author (fk_user_author);
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_valid (fk_user_valid);
+ALTER TABLE llx_delivery ADD INDEX idx_delivery_fk_soc (fk_soc);
+ALTER TABLE llx_delivery ADD INDEX idx_delivery_fk_user_author (fk_user_author);
+ALTER TABLE llx_delivery ADD INDEX idx_delivery_fk_user_valid (fk_user_valid);
 
-ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_soc			FOREIGN KEY (fk_soc)			REFERENCES llx_societe (rowid);
-ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_author	FOREIGN KEY (fk_user_author)	REFERENCES llx_user (rowid);
-ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_valid	FOREIGN KEY (fk_user_valid)	REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_soc			FOREIGN KEY (fk_soc)			REFERENCES llx_societe (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_author	FOREIGN KEY (fk_user_author)	REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_valid	FOREIGN KEY (fk_user_valid)	REFERENCES llx_user (rowid);

htdocs/install/mysql/tables/llx_livraison.sql → htdocs/install/mysql/tables/llx_delivery.sql

@@ -17,7 +17,7 @@
 --
 -- ===================================================================
 
-create table llx_livraison
+create table llx_delivery
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
   tms                   timestamp,

htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql → htdocs/install/mysql/tables/llx_delivery_extrafields.key.sql

@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_livraison_extrafields ADD INDEX idx_livraison_extrafields (fk_object);
+ALTER TABLE llx_delivery_extrafields ADD INDEX idx_delivery_extrafields (fk_object);

htdocs/install/mysql/tables/llx_livraison_extrafields.sql → htdocs/install/mysql/tables/llx_delivery_extrafields.sql

@@ -16,7 +16,7 @@
 --
 -- ========================================================================
 
-create table llx_livraison_extrafields
+create table llx_delivery_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
   tms                       timestamp,

htdocs/install/mysql/tables/llx_livraisondet.key.sql → htdocs/install/mysql/tables/llx_deliverydet.key.sql

@@ -18,5 +18,5 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_livraisondet ADD INDEX idx_livraisondet_fk_expedition (fk_livraison);
-ALTER TABLE llx_livraisondet ADD CONSTRAINT fk_livraisondet_fk_livraison FOREIGN KEY (fk_livraison) REFERENCES llx_livraison (rowid);
+ALTER TABLE llx_deliverydet ADD INDEX idx_deliverydet_fk_expedition (fk_delivery);
+ALTER TABLE llx_deliverydet ADD CONSTRAINT fk_deliverydet_fk_delivery FOREIGN KEY (fk_delivery) REFERENCES llx_delivery (rowid);

htdocs/install/mysql/tables/llx_livraisondet.sql → htdocs/install/mysql/tables/llx_deliverydet.sql

@@ -17,10 +17,10 @@
 --
 -- ===================================================================
 
-create table llx_livraisondet
+create table llx_deliverydet
 (
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
-  fk_livraison      integer,
+  fk_delivery      integer,
   fk_origin_line    integer,                         -- Correspondance de la ligne avec le document d'origine (propal, commande)
   fk_product        integer,
   description       text,

htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql → htdocs/install/mysql/tables/llx_deliverydet_extrafields.key.sql

@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_livraisondet_extrafields ADD INDEX idx_livraisondet_extrafields (fk_object);
+ALTER TABLE llx_deliverydet_extrafields ADD INDEX idx_deliverydet_extrafields (fk_object);

htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql → htdocs/install/mysql/tables/llx_deliverydet_extrafields.sql

@@ -16,7 +16,7 @@
 --
 -- ===================================================================
 
-create table llx_livraisondet_extrafields
+create table llx_deliverydet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   tms              timestamp,

htdocs/install/pgsql/functions/functions.sql

@@ -124,7 +124,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_facturedet_extrafiel
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinter FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinter_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinterdet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_livraison FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_delivery FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_loan FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_localtax FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_mailing FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();

htdocs/reception/card.php

@@ -1671,7 +1671,7 @@ if ($action == 'create')
     		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
     		$sql .= ", ".MAIN_DB_PREFIX."reception as e";
     		$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-    		//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
+    		//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
     		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
     		$sql .= " WHERE e.entity IN (".getEntity('reception').")";
     		$sql .= " AND obj.fk_commande = ".$origin_id;

htdocs/reception/list.php

@@ -429,7 +429,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'reception' AND ee.targettype = 'delivery'";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";