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

Trad: Traduction des statuts de prospect et des libell閟 des actions

Browse Source
This commit is contained in:
Laurent Destailleur 2005-04-09 14:32:26 +00:00
parent cc3f76494d
commit 63dfa33005
5 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/comm/fiche.php
View File

@ -542,7 +542,7 @@ if ($_socid > 0)
print '<tr>'; print '<tr>';
print '<td colspan="2" valign="top">'; print '<td colspan="2" 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.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 .= " 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 .= " WHERE a.fk_soc = $objsoc->id ";
$sql .= " AND u.rowid = a.fk_user_author"; $sql .= " AND u.rowid = a.fk_user_author";
@ -589,11 +589,19 @@ if ($_socid > 0)
if ($obj->propalrowid) if ($obj->propalrowid)
{ {
print '<td width="40%"><a href="propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>'; print '<td width="40%"><a href="propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowTask"),"task");
$transcode=$langs->trans("Action".$obj->acode);
$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
print $libelle;
print '</a></td>';
} }
else else
{ {
print '<td width="40%"><a href="action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>'; print '<td width="40%"><a href="action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task");
$transcode=$langs->trans("Action".$obj->acode);
$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
print $libelle;
print '</a></td>';
} }
/* /*
* Contact pour cette action * Contact pour cette action
@ -629,7 +637,7 @@ if ($_socid > 0)
print '<tr>'; print '<tr>';
print '<td valign="top">'; 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.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 .= " 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 .= " WHERE a.fk_soc = $objsoc->id ";
$sql .= " AND u.rowid = a.fk_user_author"; $sql .= " AND u.rowid = a.fk_user_author";
@ -679,11 +687,19 @@ if ($_socid > 0)
if ($obj->propalrowid) if ($obj->propalrowid)
{ {
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>'; print '<td width="40%"><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowTask"),"task");
$transcode=$langs->trans("Action".$obj->acode);
$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
print $libelle;
print '</a></td>';
} }
else else
{ {
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>'; print '<td width="40%"><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task");
$transcode=$langs->trans("Action".$obj->acode);
$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
print $libelle;
print '</a></td>';
} }
/* /*
* Contact pour cette action * Contact pour cette action

14
htdocs/compta/fiche.php
View File

@ -465,7 +465,7 @@ if ($socid > 0)
print '<table width="100%" class="noborder">'; print '<table width="100%" class="noborder">';
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 colspan="8"><a href="action/index.php?socid='.$societe->id.'">'.$langs->trans("ActionsDone").'</a></td></tr>';
$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 .= " 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 .= " WHERE a.fk_soc = $societe->id ";
$sql .= " AND u.rowid = a.fk_user_author"; $sql .= " AND u.rowid = a.fk_user_author";
@ -502,11 +502,19 @@ if ($socid > 0)
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.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>'; print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowTask"),"task");
$transcode=$langs->trans("Action".$obj->acode);
$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
print $libelle;
print '</a></td>';
} }
else else
{ {
print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task").' '.$obj->libelle.'</a></td>'; print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task");
$transcode=$langs->trans("Action".$obj->acode);
$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
print $libelle;
print '</a></td>';
} }
/* /*

1
htdocs/facture.class.php
View File

@ -361,7 +361,6 @@ class Facture
{ {
$sql .= " AND f.fk_soc = ".$societe_id; $sql .= " AND f.fk_soc = ".$societe_id;
} }
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)

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

@ -37,7 +37,7 @@ ActionAC_TEL=Phone call
ActionAC_FAX=Send fax ActionAC_FAX=Send fax
ActionAC_PROP=Send proposal ActionAC_PROP=Send proposal
ActionAC_EMAIL=Send Email ActionAC_EMAIL=Send Email
ActionAC_RDV=Take a date ActionAC_RDV=Rendez-vous
ActionAC_FAC=Send billing ActionAC_FAC=Send billing
ActionAC_REL=Send billing (reminder) ActionAC_REL=Send billing (reminder)
ActionAC_CLO=Cl么ture ActionAC_CLO=Cl么ture

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

@ -37,7 +37,7 @@ ActionAC_TEL=Appel t
ActionAC_FAX=Envoi fax ActionAC_FAX=Envoi fax
ActionAC_PROP=Envoi proposition ActionAC_PROP=Envoi proposition
ActionAC_EMAIL=Envoi EMail ActionAC_EMAIL=Envoi EMail
ActionAC_RDV=Prendre Rendez-vous ActionAC_RDV=Rendez-vous
ActionAC_FAC=Envoi facturation ActionAC_FAC=Envoi facturation
ActionAC_REL=Relance facturation ActionAC_REL=Relance facturation
ActionAC_CLO=Close ActionAC_CLO=Close