Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-08-21 20:57:58 +02:00
parent d68f176e7e db3c17668e
commit 6b6daf178f
216 changed files with 1840 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/resource/class/dolresource.class.php
View File

@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
/**
* DAO Resource object
* DAO Resource object
*/
class Dolresource extends CommonObject
{
@@ -60,14 +60,14 @@ class Dolresource extends CommonObject
/**
* Create object into database
*
* @param User $user User that creates
* @param User $user User that creates
* @param int $notrigger 0=launch triggers after, 1=disable triggers
* @return int <0 if KO, Id of created object if OK
*/
function create($user, $notrigger=0)
{
global $conf, $langs, $hookmanager;
$error=0;
global $conf, $langs, $hookmanager;
$error=0;
// Clean parameters
@@ -735,7 +735,8 @@ class Dolresource extends CommonObject
* @see getElementResources()
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function fetch_all_available() {
function fetch_all_available()
{
global $conf;
if (! empty($conf->modules_parts['resources']))