diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index ee0588d6f08..746ce59fd66 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -542,7 +542,7 @@ if ($_socid > 0) print ''; print ''; - $sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid "; + $sql = "SELECT a.id, ".$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 = $objsoc->id "; $sql .= " AND u.rowid = a.fk_user_author"; @@ -589,11 +589,19 @@ if ($_socid > 0) if ($obj->propalrowid) { - print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''; + print ''.img_object($langs->trans("ShowTask"),"task"); + $transcode=$langs->trans("Action".$obj->acode); + $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); + print $libelle; + print ''; } else { - print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''; + print ''.img_object($langs->trans("ShowTask"),"task"); + $transcode=$langs->trans("Action".$obj->acode); + $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); + print $libelle; + print ''; } /* * Contact pour cette action @@ -629,7 +637,7 @@ if ($_socid > 0) print ''; print ''; - $sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid "; + $sql = "SELECT a.id, ".$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 = $objsoc->id "; $sql .= " AND u.rowid = a.fk_user_author"; @@ -679,11 +687,19 @@ if ($_socid > 0) if ($obj->propalrowid) { - print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''; + print ''.img_object($langs->trans("ShowTask"),"task"); + $transcode=$langs->trans("Action".$obj->acode); + $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); + print $libelle; + print ''; } else { - print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''; + print ''.img_object($langs->trans("ShowTask"),"task"); + $transcode=$langs->trans("Action".$obj->acode); + $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); + print $libelle; + print ''; } /* * Contact pour cette action diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 49cc80ae29e..e1e9cd3dcd6 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -465,7 +465,7 @@ if ($socid > 0) print ''; print ''; - $sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.libelle, a.propalrowid, a.fk_user_author, fk_contact, u.code, u.rowid "; + $sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.code as acode, c.libelle, a.propalrowid, a.fk_user_author, fk_contact, u.code, 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"; @@ -502,11 +502,19 @@ if ($socid > 0) print ''; + print ''.img_object($langs->trans("ShowTask"),"task"); + $transcode=$langs->trans("Action".$obj->acode); + $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); + print $libelle; + print ''; } else { - print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''; + print ''.img_object($langs->trans("ShowTask"),"task"); + $transcode=$langs->trans("Action".$obj->acode); + $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); + print $libelle; + print ''; } /* diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 0529410c9c9..3f847620107 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -361,7 +361,6 @@ class Facture { $sql .= " AND f.fk_soc = ".$societe_id; } - $result = $this->db->query($sql); if ($result) diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index fd580e78c3b..99f78c60a30 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -37,7 +37,7 @@ ActionAC_TEL=Phone call ActionAC_FAX=Send fax ActionAC_PROP=Send proposal ActionAC_EMAIL=Send Email -ActionAC_RDV=Take a date +ActionAC_RDV=Rendez-vous ActionAC_FAC=Send billing ActionAC_REL=Send billing (reminder) ActionAC_CLO=Clôture \ No newline at end of file diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang index 4e876f530ce..104eda90e7d 100644 --- a/htdocs/langs/fr_FR/commercial.lang +++ b/htdocs/langs/fr_FR/commercial.lang @@ -37,7 +37,7 @@ ActionAC_TEL=Appel t ActionAC_FAX=Envoi fax ActionAC_PROP=Envoi proposition ActionAC_EMAIL=Envoi EMail -ActionAC_RDV=Prendre Rendez-vous +ActionAC_RDV=Rendez-vous ActionAC_FAC=Envoi facturation ActionAC_REL=Relance facturation ActionAC_CLO=Close
'.$langs->trans("ActionsDone").'
'; if ($obj->propalrowid) { - print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'