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

Merge pull request #1732 from FHenry/3.5

Browse Source 
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un projet
This commit is contained in:
Laurent Destailleur 2014-07-11 12:16:25 +02:00
commit 13cc8620b2
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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 #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 #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 #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 ***** ***** ChangeLog for 3.5.3 compared to 3.5.2 *****
Fix: Error on field accountancy code for export profile of invoices. Fix: Error on field accountancy code for export profile of invoices.

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

@ -164,9 +164,10 @@ class FormProjets
* Build Select List of element associable to a project * Build Select List of element associable to a project
* *
* @param string $table_element Table of the element to update * @param string $table_element Table of the element to update
* @param int $socid socid to filter
* @return string The HTML select list of element * @return string The HTML select list of element
*/ */
function select_element($table_element) function select_element($table_element,$socid=0)
{ {
global $conf; global $conf;
@ -193,8 +194,8 @@ class FormProjets
$sql.= " FROM ".MAIN_DB_PREFIX.$table_element; $sql.= " FROM ".MAIN_DB_PREFIX.$table_element;
$sql.= " WHERE ".$projectkey." is null"; $sql.= " WHERE ".$projectkey." is null";
if (!empty($this->societe->id)) { if (!empty($socid)) {
$sql.= " AND fk_soc=".$this->societe->id; $sql.= " AND fk_soc=".$socid;
} }
$sql.= ' AND entity='.getEntity('project'); $sql.= ' AND entity='.getEntity('project');
$sql.= " ORDER BY ref DESC"; $sql.= " ORDER BY ref DESC";

2
htdocs/projet/element.php
View File

@ -216,7 +216,7 @@ foreach ($listofreferent as $key => $value)
print_titre($langs->trans($title)); print_titre($langs->trans($title));
$selectList=$formproject->select_element($tablename); $selectList=$formproject->select_element($tablename,$project->societe->id);
if ($selectList<0) { if ($selectList<0) {
setEventMessage($formproject->error,'errors'); setEventMessage($formproject->error,'errors');
} }