diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index df83d98f609d0d444c349604762423398854f567..da36cf4af04ce24bf2c1033c1aeb79f32586db5b 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -739,6 +739,9 @@ if ($socidp > 0) print "<br>"; + + $actionstatic=new ActionComm($db); + /* * Listes des actions a faire * @@ -746,14 +749,17 @@ if ($socidp > 0) print_titre($langs->trans("ActionsOnCompany")); print '<table width="100%" class="noborder">'; - print '<tr class="liste_titre"><td colspan="10"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&status=todo">'.$langs->trans("ActionsToDoShort").'</a></td><td align="right"> </td></tr>'; + print '<tr class="liste_titre">'; + print '<td colspan="11"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&status=todo">'.$langs->trans("ActionsToDoShort").'</a></td><td align="right"> </td>'; + print '</tr>'; - $sql = "SELECT a.id, a.label, ".$db->pdate("a.datep")." as dp, c.code as acode, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid "; - $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u "; - $sql .= " WHERE a.fk_soc = ".$objsoc->id; - $sql .= " AND u.rowid = a.fk_user_author"; - $sql .= " AND c.id=a.fk_action AND a.percent < 100"; - $sql .= " ORDER BY a.datep DESC, a.id DESC"; + $sql = "SELECT a.id, a.label, ".$db->pdate("a.datep")." as dp, a.percent,"; + $sql.= " c.code as acode, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid "; + $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u "; + $sql.= " WHERE a.fk_soc = ".$objsoc->id; + $sql.= " AND u.rowid = a.fk_user_author"; + $sql.= " AND c.id=a.fk_action AND a.percent < 100"; + $sql.= " ORDER BY a.datep DESC, a.id DESC"; $result=$db->query($sql); if ($result) @@ -831,6 +837,10 @@ if ($socidp > 0) } print '<td width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->fk_user_author.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->code.'</a></td>'; + + // Statut + print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>'; + print "</tr>\n"; $i++; } @@ -853,9 +863,11 @@ if ($socidp > 0) * Listes des actions effectuees */ print '<table class="noborder" width="100%">'; - print '<tr class="liste_titre"><td colspan="11"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&status=done">'.$langs->trans("ActionsDoneShort").'</a></td></tr>'; + print '<tr class="liste_titre">'; + print '<td colspan="12"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&status=done">'.$langs->trans("ActionsDoneShort").'</a></td>'; + print '</tr>'; - $sql = "SELECT a.id, a.label, ".$db->pdate("a.datea")." as da,"; + $sql = "SELECT a.id, a.label, ".$db->pdate("a.datea")." as da, a.percent,"; $sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,"; $sql.= " c.code as acode, c.libelle,"; $sql.= " u.code, u.rowid"; @@ -953,6 +965,10 @@ if ($socidp > 0) // Auteur print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.'</a></td>'; + + // Statut + print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>'; + print "</tr>\n"; $i++; } diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 51e5f4bb119edeb94de757ade6211e9def42d11c..caa53f83e1b3b65020d1e9217f1f09c69998cf2f 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -444,20 +444,26 @@ if ($socid > 0) print "<br>"; + + $actionstatic=new ActionComm($db); + /* * Listes des actions a faire * */ print_titre($langs->trans("ActionsOnCompany")); print '<table width="100%" class="noborder">'; - print '<tr class="liste_titre"><td colspan="10"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$societe->id.'&status=todo">'.$langs->trans("ActionsToDoShort").'</a></td><td align="right"> </td></tr>'; + print '<tr class="liste_titre">'; + print '<td colspan="11"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$societe->id.'&status=todo">'.$langs->trans("ActionsToDoShort").'</a></td><td align="right"> </td>'; + print '</tr>'; - $sql = "SELECT a.id, a.label, ".$db->pdate("a.datea")." as da, c.code as acode, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid "; - $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u "; - $sql .= " WHERE a.fk_soc = ".$societe->id; - $sql .= " AND u.rowid = a.fk_user_author"; - $sql .= " AND c.id=a.fk_action AND a.percent < 100"; - $sql .= " ORDER BY a.datea DESC, a.id DESC"; + $sql = "SELECT a.id, a.label, ".$db->pdate("a.datea")." as da, a.percent,"; + $sql.= " c.code as acode, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid "; + $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u "; + $sql.= " WHERE a.fk_soc = ".$societe->id; + $sql.= " AND u.rowid = a.fk_user_author"; + $sql.= " AND c.id=a.fk_action AND a.percent < 100"; + $sql.= " ORDER BY a.datea DESC, a.id DESC"; $result=$db->query($sql); if ($result) @@ -535,6 +541,10 @@ if ($socid > 0) // Auteur print '<td width="50" nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->fk_user_author.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->code.'</a></td>'; + + // Statut + print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>'; + print "</tr>\n"; $i++; } @@ -549,9 +559,11 @@ if ($socid > 0) * Listes des actions effectu�es */ print '<table width="100%" class="noborder">'; - print '<tr class="liste_titre"><td colspan="11"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$societe->id.'&status=done">'.$langs->trans("ActionsDoneShort").'</a></td></tr>'; + print '<tr class="liste_titre">'; + print '<td colspan="12"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$societe->id.'&status=done">'.$langs->trans("ActionsDoneShort").'</a>'; + print '</td></tr>'; - $sql = "SELECT a.id, a.label, ".$db->pdate("a.datea")." as da,"; + $sql = "SELECT a.id, a.label, ".$db->pdate("a.datea")." as da, a.percent,"; $sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,"; $sql.= " c.code as acode, c.libelle,"; $sql.= " u.code, u.rowid"; @@ -641,6 +653,10 @@ if ($socid > 0) // Auteur print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.'</a></td>'; + + // Statut + print '<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>'; + print "</tr>\n"; $i++; }