diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index cfa6e331daf..d0a5f12727a 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -455,7 +455,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) print ''; print ''; - $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?1000:$conf->global->MAIN_MAXLIST_OVERLOAD)); + $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); while ($i < $nbofloop) { $obj = $db->fetch_object($result); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index b7f55bd80b7..b0a4f0d751f 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1645,7 +1645,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers * @return int <0 if KO, >0 if OK */ - function reopen($user, $statut, $note, $notrigger=0) + function reopen($user, $statut, $note='', $notrigger=0) { global $langs,$conf; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index cdd7e6840c9..409d76f2505 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -315,7 +315,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) print '
'.$langs->trans("ProposalsOpened").' ('.$num.')
'; print ''; - $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?1000:$conf->global->MAIN_MAXLIST_OVERLOAD)); + $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); while ($i < $nbofloop) { $obj = $db->fetch_object($result); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index e429c57a1ae..35f09944ef7 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2335,7 +2335,7 @@ abstract class CommonObject $label = ''.$label.''; $out .= ''; - $out .=''; // Other attributes - $parameters=array('colspan' => ' colspan="3"'); + $parameters=array('colspan' => 3); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook if (empty($reshook) && ! empty($extrafields->attribute_label)) { - print $object->showOptionals($extrafields,'edit'); + print $object->showOptionals($extrafields,'edit',$parameters); } // Note (private, no output on invoices, propales...)
'.$langs->trans("ProposalsOpened").' ('.$num.')
'.$label.''; + $out .=''; switch($mode) { case "view": diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index ed2d83e9bc5..ca47227e1f0 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -846,11 +846,11 @@ else print '