From 1a44d0dbbc3623fead22c48fa19ef1acee0c4945 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 9 Feb 2005 20:56:18 +0000 Subject: [PATCH] Look: Personnalisation icon "action" --- htdocs/comm/action/index.php | 4 ++-- htdocs/comm/fiche.php | 27 +++++++-------------- htdocs/comm/index.php | 12 ++++------ htdocs/compta/fiche.php | 38 ++++++++++-------------------- htdocs/langs/en_US/commercial.lang | 2 ++ htdocs/langs/en_US/propal.lang | 2 ++ htdocs/langs/fr_FR/commercial.lang | 2 ++ htdocs/langs/fr_FR/propal.lang | 2 ++ 8 files changed, 36 insertions(+), 53 deletions(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index a6ee1f21251..af8e70d1956 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -155,9 +155,9 @@ if ( $db->query($sql) ) print "".$obj->percent."%"; } else { - print "réalisé"; + print "".$langs->trans("Done").""; } - print ''.$obj->libelle.''; + print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''; print ''; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index f39603d17d2..81b0c269c27 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -188,13 +188,6 @@ if ($_socid > 0) $head[$h][1] = $langs->trans("Notifications"); $h++; - if (file_exists(DOL_DOCUMENT_ROOT.'/sl/')) - { - $head[$h][0] = DOL_URL_ROOT.'/sl/fiche.php?id='.$objsoc->id; - $head[$h][1] = 'Fiche catalogue'; - $h++; - } - if ($user->societe_id == 0) { $head[$h][0] = DOL_URL_ROOT."/comm/index.php?socidp=$objsoc->id&action=add_bookmark"; @@ -595,11 +588,11 @@ if ($_socid > 0) if ($obj->propalrowid) { - print ''.$obj->libelle.''; + print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''; } else { - print ''.$obj->libelle.''; + print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''; } /* * Contact pour cette action @@ -608,7 +601,7 @@ if ($_socid > 0) if ($obj->fk_contact) { $contact = new Contact($db); $contact->fetch($obj->fk_contact); - print ''.$contact->fullname.''; + print ''.img_object($langs->trans("ShowContact"),"contact").' '.$contact->fullname.''; } else { print ' '; } @@ -628,9 +621,7 @@ if ($_socid > 0) print ""; /* - * * Listes des actions effectuees - * */ print ''; print ''; @@ -675,22 +666,22 @@ if ($_socid > 0) } else { - print "\n"; + print "\n"; $oldmonth = strftime("%Y%b",$obj->da); } - print "\n"; - print "\n"; + print "\n"; + print "\n"; print ''; if ($obj->propalrowid) { - print ''; + print ''; } else { - print ''; + print ''; } /* * Contact pour cette action @@ -700,7 +691,7 @@ if ($_socid > 0) { $contact = new Contact($db); $contact->fetch($obj->fk_contact); - print ''; + print ''; } else { diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index f37b8721398..411738f9850 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -130,7 +130,7 @@ if ($conf->propal->enabled) { { print '
'.$langs->trans("ActionsDone").'
" .strftime("%b",$obj->da)."" .strftime("%b",$obj->da)."" .strftime("%d",$obj->da)."" .strftime("%H:%M",$obj->da)."" .strftime("%d",$obj->da)."" .strftime("%H:%M",$obj->da)." '.$obj->libelle.''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''.$obj->libelle.''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''.$contact->fullname.''.img_object($langs->trans("Showcontact"),"contact").' '.$contact->fullname.'
'; print ""; - print ""; + print ""; while ($i < $num) { @@ -249,7 +249,7 @@ if ( $db->query($sql) ) $num = $db->num_rows(); print '
Propositions commerciales brouillons
".$langs->trans("ProposalsDraft")."
'; - print ''; + print ''; $var = true; $i = 0; @@ -259,8 +259,7 @@ if ( $db->query($sql) ) $var=!$var; print ""; - print ""; + print "'; print ""; print ''; $i++; @@ -307,8 +306,7 @@ if ( $db->query($sql) ) $var=!$var; print ""; - print ""; + print "'; print '"; - print "\n"; + print "\n"; print "\n"; $var=!$var; $i++; diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 3cf9caca252..f0e5573d1ad 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -421,9 +421,7 @@ if ($socid > 0) print ""; print '
Dernières actions effectuées
'.$langs->trans("LastDoneTasks").'
id\">".img_file()." "; - print "id\">$obj->libelle $obj->labelid\">".img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.' '.$obj->label.'".dolibarr_print_date($obj->da)."'.img_object($langs->trans("ShowCustomer"),"company").' '.$obj->sname.'
id\">".img_file()." "; - print "id\">$obj->libelle $obj->labelid\">".img_object($langs->trans("ShowTask"),"task")." ".$obj->libelle.' '.$obj->label.''. strftime("%d %b %Y",$obj->da); if (date("U",$obj->da) < time()) @@ -365,7 +363,7 @@ if ($conf->contrat->enabled && 0) // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT { $obj = $db->fetch_object(); print "
rowid."\">".img_object($langs->trans("ShowContract","contract"))." ".$obj->ref."idp\">$obj->nomidp\">".img_object($langs->trans("ShowCompany","company"))." ".$obj->nom."".$contrat->LibStatut($obj->enservice)."
'; - print ''; - print img_object($langs->trans("Show"),"contact"); - print ' '.$obj->firstname.' '. $obj->name.' '; + print ''.img_object($langs->trans("ShowContact"),"contact").' '.$obj->firstname.' '. $obj->name.' '; if (trim($obj->note)) { @@ -451,16 +449,10 @@ if ($socid > 0) print "

"; /* - * * Listes des actions effectuées - * */ - - print ''; - print ''; - - print ''; - print '
'.$langs->trans("ActionsDone").'
'; + 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 .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u "; @@ -470,7 +462,6 @@ if ($socid > 0) $sql .= " ORDER BY a.datea DESC, a.id DESC"; if ( $db->query($sql) ) { - print "
'.$langs->trans("ActionsDone").'
\n"; $i = 0 ; $num = $db->num_rows(); while ($i < $num) { @@ -482,33 +473,29 @@ if ($socid > 0) if ($oldyear == strftime("%Y",$obj->da) ) { print ''; } else { - print "\n"; + print "\n"; $oldyear = strftime("%Y",$obj->da); } if ($oldmonth == strftime("%Y%b",$obj->da) ) { print ''; } else { - print "\n"; + print "\n"; $oldmonth = strftime("%Y%b",$obj->da); } - print "\n"; - print "\n"; + print "\n"; + print "\n"; print ''; print ''; + print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''; } else { - print ''; - print img_file().' '; - print ''.$obj->libelle.''; + print ''.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.''; } /* @@ -518,7 +505,7 @@ if ($socid > 0) if ($obj->fk_contact) { $contact = new Contact($db); $contact->fetch($obj->fk_contact); - print ''; + print ''; } else { print ''; } @@ -528,13 +515,12 @@ if ($socid > 0) print "\n"; $i++; } - print "
|" .strftime("%Y",$obj->da)."" .strftime("%Y",$obj->da)."|" .strftime("%b",$obj->da)."" .strftime("%b",$obj->da)."" .strftime("%d",$obj->da)."" .strftime("%H:%M",$obj->da)."" .strftime("%d",$obj->da)."" .strftime("%H:%M",$obj->da)." '; if ($obj->propalrowid) { - print ''; - print img_file().' '; - print ''.$obj->libelle.''.$contact->fullname.''.img_object($langs->trans("ShowContact"),"contact").' '.$contact->fullname.' 
"; $db->free(); } else { - print $db->error(); + dolibarr_print_error($db); } - print "
"; + print ""; /* * diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index 3b25a812c86..4cb385127a7 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -22,3 +22,5 @@ ShowCustomer=Show customer ShowProspect=Show prospect ListOfProspects=Prospects list ListOfCustomers=Customers list +LastDoneTasks=Last done tasks +LastRecordedTasks=Last recorded tasks diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index e249b95bcc5..482a325966a 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -1,6 +1,8 @@ # Dolibarr language file - en_US - propal Proposals=Commercial proposals Proposal=Commercial proposal +ProposalsDraft=Draft commercial proposals +ProposalDraft=Draft commercial proposal Prop=Commercial proposal NewProp=New commercial proposal Prospect=Prospect diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang index afebaf8557b..114217fdce1 100644 --- a/htdocs/langs/fr_FR/commercial.lang +++ b/htdocs/langs/fr_FR/commercial.lang @@ -22,3 +22,5 @@ ShowCustomer=Show customer ShowProspect=Show prospect ListOfProspects=Liste des prospects ListOfCustomers=Liste des clients +LastDoneTasks=Dernières actions effectuées +LastRecordedTasks=Dernières actions enregistrées diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index e1c6bc89c02..2077445d1da 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -1,6 +1,8 @@ # Dolibarr language file - fr_FR - propal Proposals=Propositions commerciales Proposal=Proposition commerciale +ProposalsDraft=Propositions commerciales brouillons +ProposalDraft=Proposition commerciale brouillon Prop=Proposition commerciale NewProp=Nouvelle proposition commerciale Prospect=Prospect