Merge remote-tracking branch 'upstream/develop' into socialnetworks

htdocs/core/modules/DolibarrModules.class.php

@@ -61,7 +61,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
     /**
      * @var string Family
-     * @see familyinfo
+     * @see $familyinfo
      *
      * Native values: 'crm', 'financial', 'hr', 'projects', 'products', 'ecm', 'technic', 'other'.
      * Use familyinfo to declare a custom value.
@@ -70,7 +70,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
     /**
      * @var array Custom family informations
-     * @see family
+     * @see $family
      *
      * e.g.:
      * array(
@@ -259,26 +259,6 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
      */
     public $core_enabled;
 
-    /**
-     * @var        string Relative path to module style sheet
-     * @deprecated
-     * @see        module_parts
-     */
-    public $style_sheet = '';
-
-    /**
-     * @var        0|1|2|3 Where to display the module in setup page
-     * @deprecated @since 4.0.0
-     * @see        family
-     * @see        familyinfo
-     *
-     * 0: common
-     * 1: interface
-     * 2: others
-     * 3: very specific
-     */
-    public $special;
-
     /**
      * @var string Name of image file used for this module
      *
@@ -297,20 +277,20 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 
     /**
-     * @var string[] List of module class names that must be enabled if this module is enabled.
-     *
-     * e.g.: array('modAnotherModule', 'FR'=>'modYetAnotherModule')
+     * @var string[] List of module class names that must be enabled if this module is enabled. e.g.: array('modAnotherModule', 'FR'=>'modYetAnotherModule')
+	 * @see $requiredby
      */
     public $depends;
 
     /**
-     * @var int[] List of module ids to disable if this one is disabled.
+     * @var string[] List of module class names to disable if the module is disabled.
+     * @see $depends
      */
     public $requiredby;
 
     /**
      * @var string[] List of module class names as string this module is in conflict with.
-     * @see depends
+     * @see $depends
      */
     public $conflictwith;
 
@@ -915,7 +895,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     /**
      * Gives the last date of activation
      *
-     * @return timestamp|string       Date of last activation
+     * @return 	int|string       	Date of last activation or '' if module was never activated
      */
     public function getLastActivationDate()
     {