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

2018-08-28 09:34:53 +02:00
parent d8bf4a0ecf 50d50c2e10
commit fe4260a014
335 changed files with 3278 additions and 1248 deletions
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -33,12 +33,18 @@ require_once DOL_DOCUMENT_ROOT ."/resource/class/dolresource.class.php";
 */
 class FormResource
 {
-    var $db;
+    /**
+     * @var DoliDB Database handler.
+     */
+    public $db;

    var $substit=array();
    var $param=array();

-    var $error;
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**