lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look: Personnalisation icon "action"

Browse Source
This commit is contained in:
Laurent Destailleur 2005-02-09 20:56:18 +00:00
parent b7bab12395
commit 1a44d0dbbc
8 changed files with 36 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/action/index.php
View File

@ -155,9 +155,9 @@ if ( $db->query($sql) )
print "<td align=\"center\">".$obj->percent."%</td>"; print "<td align=\"center\">".$obj->percent."%</td>";
} }
else { else {
print "<td align=\"center\"><b>réalisé</b></td>"; print "<td align=\"center\">".$langs->trans("Done")."</td>";
} }
print '<td><a href="fiche.php?id='.$obj->id.'">'.$obj->libelle.'</a></td>'; print '<td><a href="fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>';
print '<td>'; print '<td>';

27
htdocs/comm/fiche.php
View File

@ -188,13 +188,6 @@ if ($_socid > 0)
$head[$h][1] = $langs->trans("Notifications"); $head[$h][1] = $langs->trans("Notifications");
$h++; $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) if ($user->societe_id == 0)
{ {
$head[$h][0] = DOL_URL_ROOT."/comm/index.php?socidp=$objsoc->id&action=add_bookmark"; $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) if ($obj->propalrowid)
{ {
print '<td width="40%"><a href="propal.php?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>'; print '<td width="40%"><a href="propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>';
} }
else else
{ {
print '<td width="40%"><a href="action/fiche.php?id='.$obj->id.'">'.$obj->libelle.'</a></td>'; print '<td width="40%"><a href="action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>';
} }
/* /*
* Contact pour cette action * Contact pour cette action
@ -608,7 +601,7 @@ if ($_socid > 0)
if ($obj->fk_contact) { if ($obj->fk_contact) {
$contact = new Contact($db); $contact = new Contact($db);
$contact->fetch($obj->fk_contact); $contact->fetch($obj->fk_contact);
print '<td width="40%"><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$contact->id.'">'.$contact->fullname.'</a></td>'; print '<td width="40%"><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$contact->id.'">'.img_object($langs->trans("ShowContact"),"contact").' '.$contact->fullname.'</a></td>';
} else { } else {
print '<td width="40%">&nbsp;</td>'; print '<td width="40%">&nbsp;</td>';
} }
@ -628,9 +621,7 @@ if ($_socid > 0)
print "</td></tr></table>"; print "</td></tr></table>";
/* /*
*
* Listes des actions effectuees * Listes des actions effectuees
*
*/ */
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td><a href="action/index.php?socid='.$objsoc->id.'">'.$langs->trans("ActionsDone").'</a></td></tr>'; print '<tr class="liste_titre"><td><a href="action/index.php?socid='.$objsoc->id.'">'.$langs->trans("ActionsDone").'</a></td></tr>';
@ -675,22 +666,22 @@ if ($_socid > 0)
} }
else else
{ {
print "<TD align=\"center\">" .strftime("%b",$obj->da)."</td>\n"; print "<td align=\"center\">" .strftime("%b",$obj->da)."</td>\n";
$oldmonth = strftime("%Y%b",$obj->da); $oldmonth = strftime("%Y%b",$obj->da);
} }
print "<TD>" .strftime("%d",$obj->da)."</td>\n"; print "<td>" .strftime("%d",$obj->da)."</td>\n";
print "<TD>" .strftime("%H:%M",$obj->da)."</td>\n"; print "<td>" .strftime("%H:%M",$obj->da)."</td>\n";
print '<td width="10%">&nbsp;</td>'; print '<td width="10%">&nbsp;</td>';
if ($obj->propalrowid) if ($obj->propalrowid)
{ {
print '<td width="40%"><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>'; print '<td width="40%"><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>';
} }
else else
{ {
print '<td width="40%"><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.$obj->libelle.'</a></td>'; print '<td width="40%"><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>';
} }
/* /*
* Contact pour cette action * Contact pour cette action
@ -700,7 +691,7 @@ if ($_socid > 0)
{ {
$contact = new Contact($db); $contact = new Contact($db);
$contact->fetch($obj->fk_contact); $contact->fetch($obj->fk_contact);
print '<td width="40%"><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$contact->id.'">'.$contact->fullname.'</a></td>'; print '<td width="40%"><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$contact->id.'">'.img_object($langs->trans("Showcontact"),"contact").' '.$contact->fullname.'</a></td>';
} }
else else
{ {

12
htdocs/comm/index.php
View File

@ -130,7 +130,7 @@ if ($conf->propal->enabled) {
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print "<td colspan=\"3\">Propositions commerciales brouillons</td></tr>"; print "<td colspan=\"3\">".$langs->trans("ProposalsDraft")."</td></tr>";
while ($i < $num) while ($i < $num)
{ {
@ -249,7 +249,7 @@ if ( $db->query($sql) )
$num = $db->num_rows(); $num = $db->num_rows();
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="4">Dernières actions effectuées</td></tr>'; print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("LastDoneTasks").'</td></tr>';
$var = true; $var = true;
$i = 0; $i = 0;
@ -259,8 +259,7 @@ if ( $db->query($sql) )
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td><a href=\"action/fiche.php?id=$obj->id\">".img_file()."</a>&nbsp;"; print "<td><a href=\"action/fiche.php?id=$obj->id\">".img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.' '.$obj->label.'</a></td>';
print "<a href=\"action/fiche.php?id=$obj->id\">$obj->libelle $obj->label</a></td>";
print "<td>".dolibarr_print_date($obj->da)."</td>"; print "<td>".dolibarr_print_date($obj->da)."</td>";
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCustomer"),"company").' '.$obj->sname.'</a></td>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCustomer"),"company").' '.$obj->sname.'</a></td>';
$i++; $i++;
@ -307,8 +306,7 @@ if ( $db->query($sql) )
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td><a href=\"action/fiche.php?id=$obj->id\">".img_file()."</a>&nbsp;"; print "<td><a href=\"action/fiche.php?id=$obj->id\">".img_object($langs->trans("ShowTask"),"task")."</a> ".$obj->libelle.' '.$obj->label.'</a></td>';
print "<a href=\"action/fiche.php?id=$obj->id\">$obj->libelle $obj->label</a></td>";
print '<td>'. strftime("%d %b %Y",$obj->da); print '<td>'. strftime("%d %b %Y",$obj->da);
if (date("U",$obj->da) < time()) 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(); $obj = $db->fetch_object();
print "<tr $bc[$var]><td><a href=\"../contrat/fiche.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowContract","contract"))." ".$obj->ref."</a></td>"; print "<tr $bc[$var]><td><a href=\"../contrat/fiche.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowContract","contract"))." ".$obj->ref."</a></td>";
print "<td><a href=\"fiche.php?socid=$obj->idp\">$obj->nom</a></td>\n"; print "<td><a href=\"fiche.php?socid=$obj->idp\">".img_object($langs->trans("ShowCompany","company"))." ".$obj->nom."</a></td>\n";
print "<td align=\"right\">".$contrat->LibStatut($obj->enservice)."</td></tr>\n"; print "<td align=\"right\">".$contrat->LibStatut($obj->enservice)."</td></tr>\n";
$var=!$var; $var=!$var;
$i++; $i++;

38
htdocs/compta/fiche.php
View File

@ -421,9 +421,7 @@ if ($socid > 0)
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td>'; print '<td>';
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->idp.'">'; print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->idp.'">'.img_object($langs->trans("ShowContact"),"contact").' '.$obj->firstname.' '. $obj->name.'</a>&nbsp;';
print img_object($langs->trans("Show"),"contact");
print '&nbsp;'.$obj->firstname.' '. $obj->name.'</a>&nbsp;';
if (trim($obj->note)) if (trim($obj->note))
{ {
@ -451,16 +449,10 @@ if ($socid > 0)
print "</table><br>"; print "</table><br>";
/* /*
*
* Listes des actions effectuées * Listes des actions effectuées
*
*/ */
print '<table width="100%" class="noborder">';
print '<table width="100%" cellspacing=0 class="noborder" cellpadding=2>'; print '<tr class="liste_titre"><td colspan="8"><a href="action/index.php?socid='.$societe->id.'">'.$langs->trans("ActionsDone").'</a></td></tr>';
print '<tr class="liste_titre"><td><a href="action/index.php?socid='.$societe->id.'">'.$langs->trans("ActionsDone").'</a></td></tr>';
print '<tr>';
print '<td valign="top">';
$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.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 .= " 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"; $sql .= " ORDER BY a.datea DESC, a.id DESC";
if ( $db->query($sql) ) { if ( $db->query($sql) ) {
print "<table width=\"100%\" cellspacing=0 border=0 cellpadding=2>\n";
$i = 0 ; $num = $db->num_rows(); $i = 0 ; $num = $db->num_rows();
while ($i < $num) { while ($i < $num) {
@ -482,33 +473,29 @@ if ($socid > 0)
if ($oldyear == strftime("%Y",$obj->da) ) { if ($oldyear == strftime("%Y",$obj->da) ) {
print '<td align="center">|</td>'; print '<td align="center">|</td>';
} else { } else {
print "<TD align=\"center\">" .strftime("%Y",$obj->da)."</TD>\n"; print "<td align=\"center\">" .strftime("%Y",$obj->da)."</td>\n";
$oldyear = strftime("%Y",$obj->da); $oldyear = strftime("%Y",$obj->da);
} }
if ($oldmonth == strftime("%Y%b",$obj->da) ) { if ($oldmonth == strftime("%Y%b",$obj->da) ) {
print '<td align="center">|</td>'; print '<td align="center">|</td>';
} else { } else {
print "<TD align=\"center\">" .strftime("%b",$obj->da)."</TD>\n"; print "<td align=\"center\">" .strftime("%b",$obj->da)."</td>\n";
$oldmonth = strftime("%Y%b",$obj->da); $oldmonth = strftime("%Y%b",$obj->da);
} }
print "<TD>" .strftime("%d",$obj->da)."</TD>\n"; print "<td>" .strftime("%d",$obj->da)."</td>\n";
print "<TD>" .strftime("%H:%M",$obj->da)."</TD>\n"; print "<td>" .strftime("%H:%M",$obj->da)."</td>\n";
print '<td width="10%">&nbsp;</td>'; print '<td width="10%">&nbsp;</td>';
print '<td width="40%">'; print '<td width="40%">';
if ($obj->propalrowid) if ($obj->propalrowid)
{ {
print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'; print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>';
print img_file().'</a>&nbsp;';
print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>';
} }
else else
{ {
print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'; print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>';
print img_file().'</a>&nbsp;';
print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.$obj->libelle.'</a></td>';
} }
/* /*
@ -518,7 +505,7 @@ if ($socid > 0)
if ($obj->fk_contact) { if ($obj->fk_contact) {
$contact = new Contact($db); $contact = new Contact($db);
$contact->fetch($obj->fk_contact); $contact->fetch($obj->fk_contact);
print '<td width="40%"><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$contact->id.'">'.$contact->fullname.'</a></td>'; print '<td width="40%"><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$contact->id.'">'.img_object($langs->trans("ShowContact"),"contact").' '.$contact->fullname.'</a></td>';
} else { } else {
print '<td width="40%">&nbsp;</td>'; print '<td width="40%">&nbsp;</td>';
} }
@ -528,13 +515,12 @@ if ($socid > 0)
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }
print "</table>";
$db->free(); $db->free();
} else { } else {
print $db->error(); dolibarr_print_error($db);
} }
print "</td></tr></table>"; print "</table>";
/* /*
* *

2
htdocs/langs/en_US/commercial.lang
View File

@ -22,3 +22,5 @@ ShowCustomer=Show customer
ShowProspect=Show prospect ShowProspect=Show prospect
ListOfProspects=Prospects list ListOfProspects=Prospects list
ListOfCustomers=Customers list ListOfCustomers=Customers list
LastDoneTasks=Last done tasks
LastRecordedTasks=Last recorded tasks

2
htdocs/langs/en_US/propal.lang
View File

@ -1,6 +1,8 @@
# Dolibarr language file - en_US - propal # Dolibarr language file - en_US - propal
Proposals=Commercial proposals Proposals=Commercial proposals
Proposal=Commercial proposal Proposal=Commercial proposal
ProposalsDraft=Draft commercial proposals
ProposalDraft=Draft commercial proposal
Prop=Commercial proposal Prop=Commercial proposal
NewProp=New commercial proposal NewProp=New commercial proposal
Prospect=Prospect Prospect=Prospect

2
htdocs/langs/fr_FR/commercial.lang
View File

@ -22,3 +22,5 @@ ShowCustomer=Show customer
ShowProspect=Show prospect ShowProspect=Show prospect
ListOfProspects=Liste des prospects ListOfProspects=Liste des prospects
ListOfCustomers=Liste des clients ListOfCustomers=Liste des clients
LastDoneTasks=Dernières actions effectuées
LastRecordedTasks=Dernières actions enregistrées

2
htdocs/langs/fr_FR/propal.lang
View File

@ -1,6 +1,8 @@
# Dolibarr language file - fr_FR - propal # Dolibarr language file - fr_FR - propal
Proposals=Propositions commerciales Proposals=Propositions commerciales
Proposal=Proposition commerciale Proposal=Proposition commerciale
ProposalsDraft=Propositions commerciales brouillons
ProposalDraft=Proposition commerciale brouillon
Prop=Proposition commerciale Prop=Proposition commerciale
NewProp=Nouvelle proposition commerciale NewProp=Nouvelle proposition commerciale
Prospect=Prospect Prospect=Prospect