Fix: warning when you rename fields !!!!

htdocs/expedition/class/expedition.class.php

@@ -186,7 +186,7 @@ class Expedition extends CommonObject
 		$sql.= ", date_delivery";
 		$sql.= ", fk_soc";
 		$sql.= ", fk_address";
-		$sql.= ", fk_expedition_methode";
+		$sql.= ", fk_shipping_method";
 		$sql.= ", tracking_number";
 		$sql.= ", weight";
 		$sql.= ", size";
@@ -380,7 +380,7 @@ class Expedition extends CommonObject
 				$this->date_delivery        = $this->db->jdate($obj->date_delivery);	// Date planed
 				$this->fk_delivery_address  = $obj->fk_address;
 				$this->modelpdf             = $obj->model_pdf;
-				$this->shipping_method_id	= $obj->fk_expedition_methode;
+				$this->shipping_method_id	= $obj->fk_shipping_method;
 				$this->tracking_number      = $obj->tracking_number;
 				$this->origin               = ($obj->origin?$obj->origin:'commande'); // For compatibility
 				$this->origin_id            = $obj->origin_id;

htdocs/install/mysql/tables/llx_expedition.key.sql

@@ -23,9 +23,9 @@ ALTER TABLE llx_expedition ADD UNIQUE INDEX idx_expedition_uk_ref (ref, entity);
 ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_soc (fk_soc);
 ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_author (fk_user_author);
 ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_valid (fk_user_valid);
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_expedition_methode (fk_expedition_methode);
+ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_shipping_method (fk_shipping_method);
 
 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_soc					FOREIGN KEY (fk_soc)				REFERENCES llx_societe (rowid);
 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_author			FOREIGN KEY (fk_user_author)		REFERENCES llx_user (rowid);
 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_valid 			FOREIGN KEY (fk_user_valid)			REFERENCES llx_user (rowid);
-ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_expedition_methode 	FOREIGN KEY (fk_expedition_methode) REFERENCES llx_c_shipment_mode (rowid);
\ No newline at end of file
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_shipping_method 		FOREIGN KEY (fk_shipping_method) 	REFERENCES llx_c_shipment_mode (rowid);
\ No newline at end of file

htdocs/install/mysql/tables/llx_expedition.sql

@@ -38,7 +38,7 @@ create table llx_expedition
   date_expedition       datetime,						-- shipping date
   date_delivery			datetime	DEFAULT NULL,		-- delivery date
   fk_address  			integer		DEFAULT NULL, 		-- delivery address (deprecated)
-  fk_expedition_methode integer,
+  fk_shipping_method	integer,
   tracking_number       varchar(50),
   fk_statut             smallint	DEFAULT 0,