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

htdocs/core/modules/action/modules_action.php

@@ -28,7 +28,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
  */
 abstract class ModeleAction extends CommonDocGenerator
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 
     /**
      *  Return list of active generation modules