lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for travis

Browse Source
This commit is contained in:
atm-quentin 2018-07-31 10:02:36 +02:00
parent 1297470c99
commit 37a4a0c488
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/html.formprojet.class.php
View File

@ -456,6 +456,7 @@ class FormProjets
* @param string $socid If of thirdparty to use as filter or 'id1,id2,...' * @param string $socid If of thirdparty to use as filter or 'id1,id2,...'
* @param string $morecss More CSS * @param string $morecss More CSS
* @param int $limitonstatus Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement * @param int $limitonstatus Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement
* @param string $projectkey Equivalent key to fk_projet for actual table_element
* @return int|string The HTML select list of element or '' if nothing or -1 if KO * @return int|string The HTML select list of element or '' if nothing or -1 if KO
*/ */
function select_element($table_element, $socid=0, $morecss='', $limitonstatus=-2,$projectkey="fk_projet") function select_element($table_element, $socid=0, $morecss='', $limitonstatus=-2,$projectkey="fk_projet")

5
htdocs/projet/class/project.class.php
View File

@ -516,9 +516,10 @@ class Project extends CommonObject
* @param string $datefieldname name of date field for filter * @param string $datefieldname name of date field for filter
* @param int $dates Start date * @param int $dates Start date
* @param int $datee End date * @param int $datee End date
* @param string $projectkey Equivalent key to fk_projet for actual type
* @return mixed Array list of object ids linked to project, < 0 or string if error * @return mixed Array list of object ids linked to project, < 0 or string if error
*/ */
function get_element_list($type, $tablename, $datefieldname='', $dates='', $datee='', $project_field='fk_projet') function get_element_list($type, $tablename, $datefieldname='', $dates='', $datee='', $projectkey='fk_projet')
{ {
$elements = array(); $elements = array();
@ -548,7 +549,7 @@ class Project extends CommonObject
} }
else else
{ {
$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE ".$project_field." IN (". $ids .")"; $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE ".$projectkey." IN (". $ids .")";
} }
if ($dates > 0) if ($dates > 0)