diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 06528788cd06f54cf7750157c906d57b2ea5a12a..cc1ac676c6d5edcecdd582c3754c9c7ebedae04c 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -651,7 +651,7 @@ class Form * \param htmlname Nom de la zone html * \return int Nbre de projet si ok, <0 si ko */ - function select_projects($socid='', $selected='', $htmlname='projectid') + function select_projects($socid, $selected='', $htmlname='projectid') { // On recherche les projets $sql = 'SELECT p.rowid, p.title FROM '; @@ -659,6 +659,8 @@ class Form $sql.= " WHERE fk_soc='".$socid."'"; $sql.= " ORDER BY p.title ASC"; + dolibarr_syslog("html.form.class::select_projects sql=$sql"); + $result=$this->db->query($sql); if ($result) { @@ -1513,6 +1515,7 @@ class Form function form_project($page, $socid, $selected='', $htmlname='projectid') { global $langs; + $langs->load("project"); if ($htmlname != "none") { diff --git a/htdocs/soc.php b/htdocs/soc.php index 2cac966db7ee36c11b3c8a838b9eb506bfe8bda8..6114a35dc39cd087e5707eec4d7d1daf01360d44 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -395,7 +395,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] || $form->select_array("effectif_id",$soc->effectif_array(), $soc->effectif_id); print '</td></tr>'; - print '<tr><td nowrap><div id="particulier4" class="visible">'.$langs->trans('VATIntraShort').'</div></td><td colspan="3">'; + print '<tr><td nowrap><div id="particulier4" class="visible">'.$langs->trans('VATIntraShort').'</div></td><td>'; print '<div id="particulier5" class="visible">'; print '<input type="text" name="tva_intra_code" size="3" maxlength="2" value="'.$soc->tva_intra_code.'">'; @@ -803,7 +803,7 @@ else print '</td><td>'; print yn($soc->tva_assuj); print '</td>'; - print '<td nowrap="nowrpa">'.$langs->trans('VATIntraShort').'</td><td colspan="3">'; + print '<td nowrap="nowrpa">'.$langs->trans('VATIntraShort').'</td><td>'; print $soc->tva_intra; print '</td></tr>';