diff --git a/ChangeLog b/ChangeLog index cfe4950e2f1..502cbc40536 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ Fix: [ bug #1461 ] LINEORDER_SUPPLIER_CREATE does not intercept supplier order l Fix: [ bug #1484 ] BILL_SUPPLIER_PAYED trigger action does not intercept failure under some circumstances Fix: [ bug #1482 ] Several supplier invoice triggers do not show trigger error messages Fix: [ bug #1486 ] LINEBILL_SUPPLIER_CREATE and LINEBILL_SUPPLIER_UPDATE triggers do not intercept trigger action +Fix: [ bug #1522 ] Element list into associate object into project are no more filterd by project thirdparty ***** ChangeLog for 3.5.3 compared to 3.5.2 ***** Fix: Error on field accountancy code for export profile of invoices. diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index b3228278261..7b8eefdbbae 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -164,9 +164,10 @@ class FormProjets * Build Select List of element associable to a project * * @param string $table_element Table of the element to update + * @param int $socid socid to filter * @return string The HTML select list of element */ - function select_element($table_element) + function select_element($table_element,$socid=0) { global $conf; @@ -193,8 +194,8 @@ class FormProjets $sql.= " FROM ".MAIN_DB_PREFIX.$table_element; $sql.= " WHERE ".$projectkey." is null"; - if (!empty($this->societe->id)) { - $sql.= " AND fk_soc=".$this->societe->id; + if (!empty($socid)) { + $sql.= " AND fk_soc=".$socid; } $sql.= ' AND entity='.getEntity('project'); $sql.= " ORDER BY ref DESC"; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 88330819349..4075113d625 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -216,7 +216,7 @@ foreach ($listofreferent as $key => $value) print_titre($langs->trans($title)); - $selectList=$formproject->select_element($tablename); + $selectList=$formproject->select_element($tablename,$project->societe->id); if ($selectList<0) { setEventMessage($formproject->error,'errors'); }