From 1525b4a42b83e76ec7d4c775a142eab71f807ed5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 5 Aug 2006 18:38:22 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Liste=20des=20projets=20sur=20contrat=20?=
=?UTF-8?q?mal=20affich=E9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/html.form.class.php | 5 ++++-
htdocs/soc.php | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 06528788cd0..cc1ac676c6d 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 2cac966db7e..6114a35dc39 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>';
--
GitLab