diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 31a204b5479..9a8835019f6 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -239,6 +239,9 @@ if ($id > 0)
{
if ($mesg) print $mesg;
+ $soc = new Societe($db);
+ $soc->fetch($contrat->socidp);
+
$head = contract_prepare_head($contrat);
$hselected=1;
@@ -257,8 +260,18 @@ if ($id > 0)
// Customer
print "
| ".$langs->trans("Customer")." | ";
- print '';
- print ''.$contrat->societe->nom.' |
';
+ print ''.$soc->getNomUrl(1).' | ';
+
+ // Ligne info remises tiers
+ print '| '.$langs->trans('Discount').' | ';
+ if ($contrat->societe->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$contrat->societe->remise_client);
+ else print $langs->trans("CompanyHasNoRelativeDiscount");
+ $absolute_discount=$contrat->societe->getCurrentDiscount();
+ print '. ';
+ if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie));
+ else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+ print '.';
+ print ' |
';
print "";
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 1a7c4cb47b6..8791e34fad9 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -340,10 +340,10 @@ if ($_GET["action"] == 'create')
print ' | ';
// Customer
- print '| '.$langs->trans("Customer").' | '.$obj->nom.' |
';
+ print '| '.$langs->trans("Customer").' | '.$soc->getNomUrl(1).' |
';
// Ligne info remises tiers
- print '| '.$langs->trans('Info').' | ';
+ print ' |
| '.$langs->trans('Discount').' | ';
if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
else print $langs->trans("CompanyHasNoRelativeDiscount");
$absolute_discount=$soc->getCurrentDiscount();
@@ -588,11 +588,10 @@ else
// Customer
print " |
| ".$langs->trans("Customer")." | ";
- print '';
- print ''.$contrat->societe->nom.' |
';
+ print ''.$contrat->societe->getNomUrl(1).' | ';
// Ligne info remises tiers
- print '| '.$langs->trans('Info').' | ';
+ print ' |
| '.$langs->trans('Discount').' | ';
if ($contrat->societe->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$contrat->societe->remise_client);
else print $langs->trans("CompanyHasNoRelativeDiscount");
$absolute_discount=$contrat->societe->getCurrentDiscount();
diff --git a/htdocs/contrat/ligne.php b/htdocs/contrat/ligne.php
index 28584054dc1..123ddc537b1 100644
--- a/htdocs/contrat/ligne.php
+++ b/htdocs/contrat/ligne.php
@@ -111,6 +111,9 @@ if ($id > 0)
$contrat = New Contrat($db);
if ( $contrat->fetch($id) > 0)
{
+ $soc = new Societe($db);
+ $soc->fetch($contrat->socidp);
+
$author = new User($db);
$author->id = $contrat->user_author_id;
$author->fetch();
@@ -161,8 +164,18 @@ if ($id > 0)
// Customer
print " |
| ".$langs->trans("Customer")." | ";
- print '';
- print ''.$contrat->societe->nom.' |
';
+ print ''.$soc->getNomUrl(1).' | ';
+
+ // Ligne info remises tiers
+ print '| '.$langs->trans('Discount').' | ';
+ if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
+ else print $langs->trans("CompanyHasNoRelativeDiscount");
+ $absolute_discount=$soc->getCurrentDiscount();
+ print '. ';
+ if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie));
+ else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+ print '.';
+ print ' |
';
// Statut contrat
print '| '.$langs->trans("Status").' | ';
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index b60d1857dcd..6785972443f 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -136,9 +136,20 @@ if ($_GET["id"])
// Reference
print ' |
| '.$langs->trans('Ref').' | '.$contrat->ref.' |
';
+ // Societe
print '| '.$langs->trans("Customer").' | ';
- print '';
- print ''.$soc->nom.' | ';
+ print ''.$soc->getNomUrl(1).' |
';
+
+ // Ligne info remises tiers
+ print '| '.$langs->trans('Discount').' | ';
+ if ($contrat->societe->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$contrat->societe->remise_client);
+ else print $langs->trans("CompanyHasNoRelativeDiscount");
+ $absolute_discount=$contrat->societe->getCurrentDiscount();
+ print '. ';
+ if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie));
+ else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+ print '.';
+ print ' |
';
// Note publique
print '| '.$langs->trans("NotePublic").' : | ';