|
@@ -1303,6 +1303,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
|
|
|
|
|
|
global $param;
|
|
|
|
|
|
+ dol_include_once('/comm/action/class/actioncomm.class.php');
|
|
|
+
|
|
|
// Check parameters
|
|
|
if (! is_object($filterobj) && ! is_object($objcon)) dol_print_error('','BadParameter');
|
|
|
|
|
@@ -1358,6 +1360,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
|
|
|
$sql.= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
|
|
|
if ($filterobj->id) $sql.= " AND a.fk_element = ".$filterobj->id;
|
|
|
}
|
|
|
+ //TODO check how ot work with new table actioncomm_resources and multiple contact affectation
|
|
|
if (is_object($objcon) && $objcon->id) $sql.= " AND a.fk_contact = ".$objcon->id;
|
|
|
// Condition on actioncode
|
|
|
if (! empty($actioncode))
|
|
@@ -1394,6 +1397,14 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
|
|
|
{
|
|
|
$obj = $db->fetch_object($resql);
|
|
|
|
|
|
+ $contactaction = new ActionComm($db);
|
|
|
+ $contactaction->id=$obj->id;
|
|
|
+ $result = $contactaction->fetchResources();
|
|
|
+ if ($result<0) {
|
|
|
+ dol_print_error($db);
|
|
|
+ setEventMessage("company.lib::show_actions_done Error fetch ressource",'errors');
|
|
|
+ }
|
|
|
+
|
|
|
//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
|
|
|
//elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
|
|
|
$tododone='';
|
|
@@ -1415,6 +1426,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
|
|
|
'userphoto'=>$obj->user_photo,
|
|
|
|
|
|
'contact_id'=>$obj->fk_contact,
|
|
|
+ 'socpeopleassigned' => $contactaction->socpeopleassigned,
|
|
|
'lastname'=>$obj->lastname,
|
|
|
'firstname'=>$obj->firstname,
|
|
|
'fk_element'=>$obj->fk_element,
|
|
@@ -1559,7 +1571,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
|
|
|
$out.=getTitleFieldOfList($langs->trans("Label"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
|
|
|
$out.=getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, 'align="center"', $sortfield, $sortorder);
|
|
|
$out.=getTitleFieldOfList('');
|
|
|
- $out.=getTitleFieldOfList($langs->trans("ActionOnContact"), 0, $_SERVER["PHP_SELF"], 'a.fk_contact', '', $param, '', $sortfield, $sortorder);
|
|
|
+ $out.=getTitleFieldOfList($langs->trans("ActionOnContact"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
|
|
|
$out.=getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, 'align="center"', $sortfield, $sortorder);
|
|
|
$out.=getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');
|
|
|
$out.='</tr>';
|
|
@@ -1678,10 +1690,28 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
|
|
|
$contactstatic->firstname=$histo[$key]['firstname'];
|
|
|
$contactstatic->id=$histo[$key]['contact_id'];
|
|
|
$out.='<td width="120">'.$contactstatic->getNomUrl(1,'',10).'</td>';
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- $out.='<td> </td>';
|
|
|
+ } elseif (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
|
|
|
+ $out .= '<td>';
|
|
|
+ foreach ( $histo[$key]['socpeopleassigned'] as $cid => $Tab ) {
|
|
|
+ $contact = new Contact($db);
|
|
|
+ $result = $contact->fetch($cid);
|
|
|
+
|
|
|
+ if ($result < 0)
|
|
|
+ dol_print_error($db, $contact->error);
|
|
|
+
|
|
|
+ if ($result > 0) {
|
|
|
+ $out .= $contact->getNomUrl(1);
|
|
|
+ if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
|
|
|
+ if (! empty($contact->phone_pro))
|
|
|
+ $out .= '(' . dol_print_phone($contact->phone_pro) . ')';
|
|
|
+ }
|
|
|
+ $out .= '<div class="paddingright"></div>';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $out .= '</td>';
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ $out.='<td> </td>';
|
|
|
}
|
|
|
|
|
|
// Status
|