Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8

This commit is contained in:
Laurent Destailleur 2015-11-26 00:47:29 +01:00
commit 1608fec937

View File

@ -510,6 +510,8 @@ foreach ($listofreferent as $key => $value)
$idtofilterthirdparty=0; $idtofilterthirdparty=0;
if (! in_array($tablename, array('facture_fourn', 'commande_fourn'))) $idtofilterthirdparty=$object->thirdparty->id; if (! in_array($tablename, array('facture_fourn', 'commande_fourn'))) $idtofilterthirdparty=$object->thirdparty->id;
if (empty($conf->global->PROJECT_LINK_DISABLE))
{
$selectList=$formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth200'); $selectList=$formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth200');
if (! $selectList || ($selectList<0)) if (! $selectList || ($selectList<0))
{ {
@ -529,6 +531,7 @@ foreach ($listofreferent as $key => $value)
$addform.='</tr></table>'; $addform.='</tr></table>';
$addform.='</form>'; $addform.='</form>';
} }
}
print_fiche_titre($langs->trans($title), $addform, ''); print_fiche_titre($langs->trans($title), $addform, '');