diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 63ca86191d3..bb6d2d78571 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1592,7 +1592,7 @@ if ($action == 'create' && $user->rights->commande->creer) } // What trigger creation - print '' . $langs->trans('Source') . ''; + print '' . $langs->trans('Channel') . ''; $form->selectInputReason($demand_reason_id, 'demand_reason_id', '', 1); print ''; @@ -1604,7 +1604,7 @@ if ($action == 'create' && $user->rights->commande->creer) $langs->load("projects"); print ''; print '' . $langs->trans("Project") . ''; - $numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0); + $numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0); print '   id).'">' . $langs->trans("AddProject") . ''; print ''; print ''; @@ -2234,7 +2234,7 @@ if ($action == 'create' && $user->rights->commande->creer) // Source reason (why we have an ordrer) print ''; print ''; if ($action != 'editdemandreason') print ''; diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index 9adf5adcd5d..0afae8e358f 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -127,9 +127,10 @@ class FormProjets * @param int $nooutput No print output. Return it only. * @param int $forceaddid Force to add project id in list, event if not qualified * @param int $htmlid Html id to use instead of htmlname + * @param string $morecss More CSS * @return int Nb of project if OK, <0 if KO */ - function select_projects_list($socid=-1, $selected='', $htmlname='projectid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode=0, $filterkey = '', $nooutput=0, $forceaddid=0, $htmlid='') + function select_projects_list($socid=-1, $selected='', $htmlname='projectid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode=0, $filterkey = '', $nooutput=0, $forceaddid=0, $htmlid='', $morecss='maxwidth500') { global $user,$conf,$langs; @@ -170,15 +171,13 @@ class FormProjets $resql=$this->db->query($sql); if ($resql) { - $morecss='maxwidth500'; - // Use select2 selector if (! empty($conf->use_javascript_ajax)) { include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; $comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus); $out.=$comboenhancement; - $morecss='minwidth100 maxwidth300'; + $morecss='minwidth100 maxwidth500'; } if (empty($option_only)) { diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index b7893ec1217..a5488959016 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1108,7 +1108,7 @@ if ($action == 'create') $projectid = ($originid ? $originid : 0); print ''; - print '
'; - print $langs->trans('Source'); + print $langs->trans('Channel'); print 'id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '
' . $langs->trans("Project") . ''; + print '' . $langs->trans("Project") . ''; $numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1); print '   id).'">' . $langs->trans("AddProject") . '';