diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php index 10be0989764..c4da1754fc4 100644 --- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php +++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php @@ -115,9 +115,9 @@ class ActionsContactCardDefault extends ActionsContactCardCommon $objsoc = new Societe($db); $objsoc->fetch($this->object->fk_soc); - $this->tpl['actionstodo']=show_actions_todo($conf,$langs,$db,$objsoc,$this->control->object); + $this->tpl['actionstodo']=show_actions_todo($conf,$langs,$db,$objsoc,$this->control->object,1); - $this->tpl['actionsdone']=show_actions_done($conf,$langs,$db,$objsoc,$this->control->object); + $this->tpl['actionsdone']=show_actions_done($conf,$langs,$db,$objsoc,$this->control->object,1); } } diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index 481b3354d47..6031dfa4cee 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -530,11 +530,14 @@ function show_contacts($conf,$langs,$db,$object) * @param db Object db * @param object Object third party * @param objcon Object contact + * @param noprint Return string but does not output it */ -function show_actions_todo($conf,$langs,$db,$object,$objcon='') +function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0) { global $bc; + $out=''; + if ($conf->agenda->enabled) { require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); @@ -542,14 +545,14 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='') $userstatic=new User($db); $contactstatic = new Contact($db); - print "\n"; - if (is_object($objcon) && $objcon->id) print_titre($langs->trans("TasksHistoryForThisContact")); - else print_titre($langs->trans("ActionsOnCompany")); + $out.="\n"; + if (is_object($objcon) && $objcon->id) $out.=load_fiche_titre($langs->trans("TasksHistoryForThisContact"),'',''); + else $out.=load_fiche_titre($langs->trans("ActionsOnCompany"),'',''); - print ''; - print ''; - print ''; - print ''; + $out.='
'.$langs->trans("ActionsToDoShort").' 
'; + $out.=''; + $out.=''; + $out.=''; $sql = "SELECT a.id, a.label,"; $sql.= " a.datep as dp,"; @@ -585,33 +588,33 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='') $datep=$db->jdate($obj->dp); - print ""; + $out.=""; - print '\n"; + $out.='\n"; // Picto warning - print ''; + $out.=''; if ($obj->propalrowid) { - print ''; + $out.=$libelle; + $out.=''; } else { $actionstatic->type_code=$obj->acode; $actionstatic->libelle=$obj->libelle; $actionstatic->id=$obj->id; - print ''; + $out.=''; } - print ''; + $out.=''; // Contact pour cette action if (! $objcon->id && $obj->fk_contact > 0) @@ -619,23 +622,23 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='') $contactstatic->name=$obj->name; $contactstatic->firstname=$obj->firstname; $contactstatic->id=$obj->fk_contact; - print ''; + $out.=''; } else { - print ''; + $out.=''; } - print ''; + $out.=$userstatic->getLoginUrl(1); + $out.=''; // Statut - print ''; + $out.=''; - print "\n"; + $out.="\n"; $i++; } } @@ -650,10 +653,13 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='') { dol_print_error($db); } - print "
'.$langs->trans("ActionsToDoShort").' 
'.dol_print_date($datep,'dayhour')."'.dol_print_date($datep,'dayhour')."'; - if ($datep && $datep < (time()- ($conf->global->MAIN_DELAY_ACTIONS_TODO *60*60*24)) ) print ' '.img_warning($langs->trans("Late")); - else print ' '; - print ''; + if ($datep && $datep < (time()- ($conf->global->MAIN_DELAY_ACTIONS_TODO *60*60*24)) ) $out.=' '.img_warning($langs->trans("Late")); + else $out.=' '; + $out.=''.img_object($langs->trans("ShowAction"),"task"); + $out.=''.img_object($langs->trans("ShowAction"),"task"); $transcode=$langs->trans("Action".$obj->acode); $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); - print $libelle; - print ''.$actionstatic->getNomUrl(1,16).''.$actionstatic->getNomUrl(1,16).''.$obj->label.''.$obj->label.''.$contactstatic->getNomUrl(1,'',10).''.$contactstatic->getNomUrl(1,'',10).'  '; + $out.=''; $userstatic->id=$obj->fk_user_author; $userstatic->login=$obj->login; - print $userstatic->getLoginUrl(1); - print ''.$actionstatic->LibStatut($obj->percent,3).''.$actionstatic->LibStatut($obj->percent,3).'
\n"; + $out.="\n"; - print "
\n"; + $out.="
\n"; } + + if ($noprint) return $out; + else print $out; } /** @@ -661,13 +667,15 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='') * @param conf Object conf * @param langs Object langs * @param db Object db - * @param objsoc Object third party + * @param object Object third party * @param objcon Object contact + * @param noprint Return string but does not output it */ -function show_actions_done($conf,$langs,$db,$object,$objcon='') +function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0) { global $bc; + $out=''; $histo=array(); $numaction = 0 ; @@ -770,67 +778,67 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='') $orderstatic=new Commande($db); $facturestatic=new Facture($db); - print "\n"; - print ''; - print ''; - print ''; - print ''; + $out.="\n"; + $out.='
'.$langs->trans("ActionsDoneShort").'
'; + $out.=''; + $out.=''; + $out.=''; foreach ($histo as $key=>$value) { $var=!$var; - print ""; + $out.=""; // Champ date - print '\n"; + $out.='\n"; // Picto - print ''; + $out.=''; // Action - print ''; + $out.=''; // Note - print ''; + $out.=''; // Objet lie - print ''; + else $out.=' '; + $out.=''; // Contact pour cette action if (! $objcon->id && $histo[$key]['contact_id'] > 0) @@ -838,32 +846,34 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='') $contactstatic->name=$histo[$key]['name']; $contactstatic->firstname=$histo[$key]['firstname']; $contactstatic->id=$histo[$key]['contact_id']; - print ''; + $out.=''; } else { - print ''; + $out.=''; } // Auteur - print ''; + $out.=$userstatic->getLoginUrl(1); + $out.=''; // Statut - print ''; + $out.=''; - print "\n"; + $out.="\n"; $i++; } - print "
'.$langs->trans("ActionsDoneShort").'
'.dol_print_date($histo[$key]['date'],'dayhour')."'.dol_print_date($histo[$key]['date'],'dayhour')."  '; + $out.=''; if ($histo[$key]['type']=='action') { $actionstatic->type_code=$histo[$key]['acode']; $actionstatic->libelle=$histo[$key]['libelle']; $actionstatic->id=$histo[$key]['id']; - print $actionstatic->getNomUrl(1,16); + $out.=$actionstatic->getNomUrl(1,16); } if ($histo[$key]['type']=='mailing') { - print ''.img_object($langs->trans("ShowEMailing"),"email").' '; + $out.=''.img_object($langs->trans("ShowEMailing"),"email").' '; $transcode=$langs->trans("Action".$histo[$key]['acode']); $libelle=($transcode!="Action".$histo[$key]['acode']?$transcode:'Send mass mailing'); - print dol_trunc($libelle,30); + $out.=dol_trunc($libelle,30); } - print ''.dol_trunc($histo[$key]['note'], 30).''.dol_trunc($histo[$key]['note'], 30).''; + $out.=''; if ($histo[$key]['pid'] && $conf->propal->enabled) { $propalstatic->ref=$langs->trans("ProposalShort"); $propalstatic->id=$histo[$key]['pid']; - print $propalstatic->getNomUrl(1); + $out.=$propalstatic->getNomUrl(1); } elseif ($histo[$key]['oid'] && $conf->commande->enabled) { $orderstatic->ref=$langs->trans("Order"); $orderstatic->id=$histo[$key]['oid']; - print $orderstatic->getNomUrl(1); + $out.=$orderstatic->getNomUrl(1); } elseif ($histo[$key]['fid'] && $conf->facture->enabled) { $facturestatic->ref=$langs->trans("Invoice"); $facturestatic->id=$histo[$key]['fid']; $facturestatic->type=$histo[$key]['ftype']; - print $facturestatic->getNomUrl(1,'compta'); + $out.=$facturestatic->getNomUrl(1,'compta'); } - else print ' '; - print ''.$contactstatic->getNomUrl(1,'',10).''.$contactstatic->getNomUrl(1,'',10).'  '; + $out.=''; $userstatic->id=$histo[$key]['userid']; $userstatic->login=$histo[$key]['login']; - print $userstatic->getLoginUrl(1); - print ''.$actionstatic->LibStatut($histo[$key]['percent'],3).''.$actionstatic->LibStatut($histo[$key]['percent'],3).'
\n"; - print "
\n"; + $out.="\n"; + $out.="
\n"; $db->free($result); } + if ($noprint) return $out; + else print $out; } /**