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

Qual: Suppression des proprits nom_url au profit de la methode getNomUrl. Ce qui permet de passer en parametre si on veut en plus le picto ou non dans le lien

Browse Source
This commit is contained in:
Laurent Destailleur 2006-06-03 16:04:32 +00:00
parent 072b0daa24
commit 54ed2d2c77
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/compta/facture.php
View File

@ -742,7 +742,7 @@ if ($_GET['action'] == 'create')
print '</tr>';
// Ligne info remises tiers
print '<tr><td>'.$langs->trans('Info').'</td><td colspan="2">';
print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="2">';
if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
else print $langs->trans("CompanyHasNoRelativeDiscount");
$absolute_discount=$soc->getCurrentDiscount();
@ -1337,12 +1337,11 @@ else
// Société
print '<tr><td>'.$langs->trans('Company').'</td>';
print '<td colspan="5">';
print '<a href="fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
print '<td colspan="5">'.$soc->getNomUrl(1,'compta').'</td>';
print '</tr>';
// Ligne info remises tiers
print '<tr><td>'.$langs->trans('Info').'</td><td colspan="5">';
print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="5">';
if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
else print $langs->trans("CompanyHasNoRelativeDiscount");
$absolute_discount=$soc->getCurrentDiscount();

3
htdocs/compta/facture/apercu.php
View File

@ -89,8 +89,7 @@ if ($_GET["facid"] > 0)
// Societe
print '<tr><td>'.$langs->trans("Company").'</td>';
print '<td colspan="5">';
print '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
print '<td colspan="5">'.$soc->getNomUrl(1,'compta').'</td>';
print '</tr>';
// Dates

9
htdocs/compta/facture/contact.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2005 Patrick Rouillon <patrick@rouillon.net>
* Copyright (C) 2005 Destailleur Laurent <eldy@users.sourceforge.net>
/* Copyright (C) 2005 Patrick Rouillon <patrick@rouillon.net>
* Copyright (C) 2005-2006 Destailleur Laurent <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -233,7 +233,7 @@ if ($id > 0)
print '<table class="border" width="100%">';
// Reference du facture
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td colspan="3">';
print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
print $facture->ref;
print "</td></tr>";
@ -242,8 +242,7 @@ if ($id > 0)
$facture->fetch_client();
print "<tr><td>".$langs->trans("Company")."</td>";
print '<td colspan="3">';
print '<b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$facture->client->id.'">'.$facture->client->nom.'</a></b></td></tr>';
print '<td colspan="3">'.$facture->client->getNomUrl(1,'compta').'</td></tr>';
print "</table>";
print '</div>';

5
htdocs/compta/facture/note.php
View File

@ -113,12 +113,11 @@ if ($_GET["facid"])
print '<table class="border" width="100%">';
// Reference
print '<tr><td width="20%">'.$langs->trans('Ref').'</td><td colspan="3">'.$fac->ref.'</td></tr>';
print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">'.$fac->ref.'</td></tr>';
// Société
print '<tr><td>'.$langs->trans("Company").'</td>';
print '<td colspan="3">';
print '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
print '<td colspan="3">'.$soc->getNomUrl(1,'compta').'</td>';
// Note publique
print '<tr><td valign="top">'.$langs->trans("NotePublic").' :</td>';