Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

develop_dict
2017-07-16 07:51:20 +02:00
parent cb6b81d897 75ec7a309c
commit 200f232164
258 changed files with 7057 additions and 3412 deletions
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -65,9 +65,8 @@ class Commande extends CommonOrder
    public $contactid;

 	/**
-	 * Status of the order. Check the following constants:
+	 * Status of the order
 	 * @var int
-	 * @see Commande::STATUS_CANCELED, Commande::STATUS_DRAFT, Commande::STATUS_ACCEPTED, Commande::STATUS_CLOSED
 	 */
    public $statut;
 	/**