diff --git a/ChangeLog b/ChangeLog index 5c7a55ba349..0badc99c911 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice. Fix: [ bug #1399 ] [pgsql] Silent warning when setting a propal as "facturée" in propal.php Fix: When number reach 9999 with default numbering module, next number will be 10000 instead of 0000 and error. +Fix: element page on project give wrong href link ***** ChangeLog for 3.5.2 compared to 3.5.1 ***** Fix: Can't add user for a task. diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index 9e0d78118b0..2c371d4afcd 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -194,6 +194,7 @@ class FormProjets if (!empty($this->societe->id)) { $sql.= " AND fk_soc=".$this->societe->id; } + $sql.= ' AND entity='.$conf->entity; $sql.= " ORDER BY ref DESC"; dol_syslog(get_class($this).'::select_element sql='.$sql,LOG_DEBUG); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index e256fb45baa..6ca2be05271 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -114,7 +114,7 @@ print ''; print ''.$langs->trans("Label").''.$project->title.''; -print ''.$langs->trans("ThirdParty").''; +print ''.$langs->trans("Company").''; if (! empty($project->societe->id)) print $project->societe->getNomUrl(1); else print ' '; print ''; @@ -314,7 +314,7 @@ foreach ($listofreferent as $key => $value) } if ($key == 'invoice' && ! empty($conf->facture->enabled) && $user->rights->facture->creer) { - print ''.$langs->trans("AddCustomerInvoice").''; + print ''.$langs->trans("AddCustomerInvoice").''; } } if ($project->societe->fournisseur)