lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Liste des projets sur contrat mal affiche

Browse Source
This commit is contained in:
Laurent Destailleur 2006-08-05 18:38:22 +00:00
parent 94073a2ca7
commit 1525b4a42b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/html.form.class.php
View File

@ -651,7 +651,7 @@ class Form
* \param htmlname Nom de la zone html * \param htmlname Nom de la zone html
* \return int Nbre de projet si ok, <0 si ko * \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 // On recherche les projets
$sql = 'SELECT p.rowid, p.title FROM '; $sql = 'SELECT p.rowid, p.title FROM ';
@ -659,6 +659,8 @@ class Form
$sql.= " WHERE fk_soc='".$socid."'"; $sql.= " WHERE fk_soc='".$socid."'";
$sql.= " ORDER BY p.title ASC"; $sql.= " ORDER BY p.title ASC";
dolibarr_syslog("html.form.class::select_projects sql=$sql");
$result=$this->db->query($sql); $result=$this->db->query($sql);
if ($result) if ($result)
{ {
@ -1513,6 +1515,7 @@ class Form
function form_project($page, $socid, $selected='', $htmlname='projectid') function form_project($page, $socid, $selected='', $htmlname='projectid')
{ {
global $langs; global $langs;
$langs->load("project"); $langs->load("project");
if ($htmlname != "none") if ($htmlname != "none")
{ {

4
htdocs/soc.php
View File

@ -395,7 +395,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
$form->select_array("effectif_id",$soc->effectif_array(), $soc->effectif_id); $form->select_array("effectif_id",$soc->effectif_array(), $soc->effectif_id);
print '</td></tr>'; 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 '<div id="particulier5" class="visible">';
print '<input type="text" name="tva_intra_code" size="3" maxlength="2" value="'.$soc->tva_intra_code.'">'; 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 '</td><td>';
print yn($soc->tva_assuj); print yn($soc->tva_assuj);
print '</td>'; 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 $soc->tva_intra;
print '</td></tr>'; print '</td></tr>';