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

13
htdocs/fichinter/class/api_interventions.class.php
View File

@@ -35,7 +35,7 @@ class Interventions extends DolibarrApi
static $FIELDS = array(
'socid',
'fk_project',
'description'
'description',
);
/**
@@ -44,7 +44,7 @@ class Interventions extends DolibarrApi
static $FIELDSLINE = array(
'description',
'date',
'duree'
'duree',
);
/**
@@ -106,7 +106,8 @@ class Interventions extends DolibarrApi
*
* @throws RestException
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@@ -217,7 +218,8 @@ class Interventions extends DolibarrApi
* @return int
*/
/* TODO
function getLines($id) {
function getLines($id)
{
if(! DolibarrApiAccess::$user->rights->ficheinter->lire) {
throw new RestException(401);
}
@@ -424,7 +426,8 @@ class Interventions extends DolibarrApi
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);

1
htdocs/fichinter/class/fichinter.class.php
View File

@@ -279,6 +279,7 @@ class Fichinter extends CommonObject
*/
function update($user, $notrigger=0)
{
global $conf;
if (! is_numeric($this->duration)) {
$this->duration = 0;
}