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

Fix: [ bug #237 ] Intervention status is not displayed on the client's

Browse Source 
form
This commit is contained in:
Laurent Destailleur 2011-12-21 15:30:32 +01:00
parent 8032f25487
commit b75688f76b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/comm/fiche.php
View File

@ -95,7 +95,7 @@ if ($action == 'setconditions' && $user->rights->societe->creer)
{ {
$object->fetch($id); $object->fetch($id);
$object->cond_reglement=$_POST['cond_reglement_id']; $object->cond_reglement=$_POST['cond_reglement_id'];
// TODO move to DAO class // TODO move to DAO class
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET cond_reglement='".$_POST['cond_reglement_id']; $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET cond_reglement='".$_POST['cond_reglement_id'];
$sql.= "' WHERE rowid='".$id."'"; $sql.= "' WHERE rowid='".$id."'";
@ -107,7 +107,7 @@ if ($action == 'setmode' && $user->rights->societe->creer)
{ {
$object->fetch($id); $object->fetch($id);
$object->mode_reglement=$_POST['mode_reglement_id']; $object->mode_reglement=$_POST['mode_reglement_id'];
// TODO move to DAO class // TODO move to DAO class
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET mode_reglement='".$_POST['mode_reglement_id']; $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET mode_reglement='".$_POST['mode_reglement_id'];
$sql.= "' WHERE rowid='".$id."'"; $sql.= "' WHERE rowid='".$id."'";
@ -119,7 +119,7 @@ if ($action == 'setassujtva' && $user->rights->societe->creer)
{ {
$object->fetch($id); $object->fetch($id);
$object->tva_assuj=$_POST['assujtva_value']; $object->tva_assuj=$_POST['assujtva_value'];
// TODO move to DAO class // TODO move to DAO class
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET tva_assuj='".$_POST['assujtva_value']."' WHERE rowid='".$id."'"; $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET tva_assuj='".$_POST['assujtva_value']."' WHERE rowid='".$id."'";
$result = $db->query($sql); $result = $db->query($sql);
@ -396,7 +396,7 @@ if ($id > 0)
} }
print '</td></tr></table>'; print '</td></tr></table>';
print '</td><td colspan="3">'; print '</td><td colspan="3">';
// TODO move to DAO class // TODO move to DAO class
$sql = "SELECT count(rowid) as nb"; $sql = "SELECT count(rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."societe_address"; $sql.= " FROM ".MAIN_DB_PREFIX."societe_address";
@ -641,7 +641,7 @@ if ($id > 0)
*/ */
if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire)
{ {
$sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.duree as duration, f.datei as startdate"; $sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.fk_statut, f.duree as duration, f.datei as startdate";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f";
$sql .= " WHERE f.fk_soc = s.rowid"; $sql .= " WHERE f.fk_soc = s.rowid";
$sql .= " AND s.rowid = ".$object->id; $sql .= " AND s.rowid = ".$object->id;
@ -666,9 +666,11 @@ if ($id > 0)
$i = 0; $i = 0;
while ($i < $num && $i < $MAXLIST) while ($i < $num && $i < $MAXLIST)
{ {
$fichinter_static->id=$objp->id;
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$fichinter_static->id=$objp->id;
$fichinter_static->statut=$objp->fk_statut;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/fiche.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a></td>'."\n"; print '<td nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/fiche.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a></td>'."\n";
//print '<td align="right">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n"; //print '<td align="right">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";