Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr

into aternatik-dol_resource

Conflicts:
	dev/initdata/img/printcompany.png
	htdocs/compta/bank/card.php

htdocs/core/lib/functions2.lib.php

@@ -1963,6 +1963,11 @@ function getElementProperties($element_type)
         $module='ficheinter';
         $subelement='fichinter';
     }
+    if ($element_type == 'dolresource') {
+        $classpath = 'resource/class';
+        $module='resource';
+        $subelement='dolresource';
+    }
     $classfile = strtolower($subelement);
     $classname = ucfirst($subelement);