Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git

into task498_objectline

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql

htdocs/install/mysql/migration/3.2.0-3.3.0.sql

@@ -74,6 +74,8 @@ ALTER TABLE llx_c_barcode_type ADD UNIQUE INDEX uk_c_barcode_type(code, entity);
 
 ALTER TABLE llx_socpeople ADD column no_email SMALLINT NOT NULL DEFAULT 0 AFTER priv;
 
+ALTER TABLE llx_commande_fournisseur ADD COLUMN date_livraison date NULL;
+
 ALTER TABLE llx_propaldet ADD COLUMN label varchar(255) DEFAULT NULL AFTER fk_product;
 ALTER TABLE llx_commandedet ADD COLUMN label varchar(255) DEFAULT NULL AFTER fk_product;
 ALTER TABLE llx_facturedet ADD COLUMN label varchar(255) DEFAULT NULL AFTER fk_product;