Qual: Uniformize code

This commit is contained in:
Laurent Destailleur 2009-07-29 23:36:03 +00:00
parent 12f6752631
commit e8631961c1
3 changed files with 5 additions and 3 deletions

View File

@ -2,6 +2,7 @@
CHARSET=UTF-8 CHARSET=UTF-8
Proposals=Commercial proposals Proposals=Commercial proposals
Proposal=Commercial proposal Proposal=Commercial proposal
ProposalShort=Proposal
ProposalsDraft=Draft commercial proposals ProposalsDraft=Draft commercial proposals
ProposalDraft=Draft commercial proposal ProposalDraft=Draft commercial proposal
ProposalsOpened=Opened commercial proposals ProposalsOpened=Opened commercial proposals

View File

@ -2,6 +2,7 @@
CHARSET=UTF-8 CHARSET=UTF-8
Proposals=Propositions commerciales Proposals=Propositions commerciales
Proposal=Proposition commerciale Proposal=Proposition commerciale
ProposalShort=Proposition
ProposalsDraft=Propositions commerciales brouillons ProposalsDraft=Propositions commerciales brouillons
ProposalDraft=Proposition commerciale brouillon ProposalDraft=Proposition commerciale brouillon
Prop=Propositions commerc. Prop=Propositions commerc.

View File

@ -629,9 +629,9 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='')
print '<td>'; print '<td>';
if ($histo[$key]['pid'] && $conf->propal->enabled) if ($histo[$key]['pid'] && $conf->propal->enabled)
{ {
print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$histo[$key]['pid'].'">'.img_object($langs->trans("ShowPropal"),"propal"); $propalstatic->ref=$langs->trans("ProposalShort");
print $langs->trans("Propal"); $propalstatic->id=$histo[$key]['pid'];
print '</a>'; print $propalstatic->getNomUrl(1);
} }
elseif ($histo[$key]['oid'] && $conf->commande->enabled) elseif ($histo[$key]['oid'] && $conf->commande->enabled)
{ {