diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 9bd879f36c1..32942d5d5d9 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -21,7 +21,8 @@ * */ -/** \file htdocs/comm/prospect/fiche.php +/** + \file htdocs/comm/prospect/fiche.php \ingroup prospect \brief Page de la fiche prospect \version $Revision$ @@ -32,6 +33,8 @@ require("../../contact.class.php"); require("../../actioncomm.class.php"); $langs->load('companies'); +$langs->load('projects'); +$langs->load('propal'); $user->getrights('propale'); $user->getrights('fichinter'); @@ -157,16 +160,15 @@ if ($socid > 0) print ''.$langs->trans("Status").''.$societe->statut_commercial.''; print ' '; print ''; - print 'Ne pas contacter'; + print img_action(0,-1); print ' '; - print 'Jamais contactée'; + print img_action(0,0); print ' '; - print 'A contacter'; + print img_action(0,1); print ' '; - print 'Contact en cours'; + print img_action(0,2); print ' '; - print 'Contactée'; - + print img_action(0,3); print ''; print ''; print "
"; @@ -183,7 +185,7 @@ if ($socid > 0) * */ $var = true; - print ''; + print '
'; $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref, p.remise, ".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id"; $sql .= " AND s.idp = $societe->id ORDER BY p.datep DESC"; @@ -193,7 +195,11 @@ if ($socid > 0) $num = $db->num_rows(); if ($num >0 ) { - print ""; + print "'; $var=!$var; } $i = 0; $now = time(); $lim = 3600 * 24 * 15 ; @@ -202,15 +208,15 @@ if ($socid > 0) $objp = $db->fetch_object(); print ""; print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; + print "\n"; $var=!$var; $i++; } @@ -375,8 +381,8 @@ if ($socid > 0) } else { - print ''.img_file().' '; - print ''.$obj->libelle.''; + print ''.img_object($langs->trans("ShowAction"),"task").' '; + print $obj->libelle.''; } print ''; diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 05b19e4a87a..4f96a069bff 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -246,7 +246,7 @@ if ( $db->query($sql) ) $obj = $db->fetch_object(); $var=!$var; print "'; $i++; } diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index eabf4b53979..cddb41e8152 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -167,7 +167,7 @@ if ($result) print ""; print ""; - $sts = array(-1,0,1,2); + $sts = array(-1,0,1,2,3); print '
id\">Liste des propositions commerciales ($num)
"; + print ''; + print ''; + print '
'.$langs->trans("LastProposals").''.$langs->trans("AllPropals").' ('.$num.')
'; + print '
propalid\">"; - print img_file(); - print " propalid\">$objp->ref\n"; + print img_object($langs->trans("ShowPropal"),"propal"); + print " $objp->ref\n"; if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 ) { print " > 15 jours"; } - print "".strftime("%d %B %Y",$objp->dp)."".price($objp->price)."$objp->statut
".strftime("%d %B %Y",$objp->dp)."".price($objp->price)."$objp->statut
idp."\">"; - print img_object($langs->trans("ShowContact"),"contact"); + print img_object($langs->trans("ShowCompany"),"company"); print ' '.$obj->nom.'
".$obj->stcomm."".dolibarr_print_date($obj->datec)."'; foreach ($sts as $key => $value) { diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index e3cbb36a6cd..e333396afc1 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -76,5 +76,6 @@ TE_OTHER=Other ChangeDoNotContact=Change status to 'Do not contact' ChangeNeverContacted=Change status to 'Never contacted' ChangeToContact=Change status to 'To contact' +ChangeContactInProcess=Change status to 'Contact in process' ChangeContactDone=Change status to 'Contact done' ProspectsByStatus=Prospects by status \ No newline at end of file diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index bfb69a5118c..35e8851b60e 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -16,6 +16,7 @@ ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ? LastPropals=Last %s proposals LastClosedProposals=Last %s closed proposals AllPropals=All proposals +LastProposals=Last proposals SearchAProposal=Search a proposal ProposalsStatistics=Commercial proposals' statistics NumberOfProposalsByMonth=Number by month diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 58fa85ec9de..1bb712821f5 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -76,5 +76,6 @@ TE_OTHER=Autre ChangeDoNotContact=Changer statut à 'Ne pas contacter' ChangeNeverContacted=Changer statut à 'Jamais contacté' ChangeToContact=Changer statut à 'A contacter' -ChangeContactDone=Changer statut à 'Contact réalisé +ChangeContactInProcess=Changer statut à 'Contact en cours' +ChangeContactDone=Changer statut à 'Contact réalisé' ProspectsByStatus=Prospects par statut \ No newline at end of file diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index bd0d2268b30..26468b2a2f1 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -16,6 +16,7 @@ ConfirmDeleteProp=Etes-vous s LastPropals=Les %s dernieres propales LastClosedProposals=Les %s dernières propositions commerciales fermées AllPropals=Toutes les propales +LastProposals=Dernières propositions SearchAProposal=Rechercher une propale ProposalsStatistics=Statistiques des propositions commerciales NumberOfProposalsByMonth=Nombre par mois diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index e57abb1eaf0..7102965509a 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -383,9 +383,10 @@ function img_action($alt = "default", $numaction) if ($numaction == -1) $alt=$langs->trans("ChangeDoNotContact"); if ($numaction == 0) $alt=$langs->trans("ChangeNeverContacted"); if ($numaction == 1) $alt=$langs->trans("ChangeToContact"); - if ($numaction == 2) $alt=$langs->trans("ChangeContactDone"); + if ($numaction == 2) $alt=$langs->trans("ChangeContactInProcess"); + if ($numaction == 3) $alt=$langs->trans("ChangeContactDone"); } - return ''.$alt.''; + return ''.$alt.''; } /**