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

htdocs/core/class/commonsocialnetworks.class.php

@@ -16,9 +16,9 @@
  */
 
 /**
- *       \file       htdocs/core/class/commonincoterm.class.php
+ *       \file       htdocs/core/class/commonsocialnetworks.class.php
  *       \ingroup    core
- *       \brief      File of the superclass of object classes that support incoterm (customer and supplier)
+ *       \brief      File of the superclass of object classes that support socialnetworks
  */
 
 

htdocs/core/class/conf.class.php

@@ -79,6 +79,10 @@ class Conf
 	// An array to store cache results ->cache['nameofcache']=...
 	public $cache;
 
+	/**
+	 * @var int To tell header was output
+	 */
+	public $headerdone;
 
 	/**
 	 * @var string[]

htdocs/core/class/cstate.class.php

@@ -49,6 +49,11 @@ class Cstate // extends CommonObject
 	 */
 	public $id;
 
+	/**
+	 * @var int ID
+	 */
+	public $rowid;
+
 	public $code_departement;
 	public $code;
 

htdocs/core/class/doleditor.class.php

@@ -43,6 +43,7 @@ class DolEditor
 	public $cols;
 	public $height;
 	public $width;
+	public $uselocalbrowser;
 	public $readonly;
 	public $posx;
 	public $posy;

htdocs/core/class/menubase.class.php

@@ -152,6 +152,10 @@ class Menubase
 	 */
 	public $tms;
 
+	/**
+	 * @var Menu menu
+	 */
+	public $newmenu;
 
 	/**
 	 *  Constructor