From 45b4e1348ecb22ac00015a428a288dbb251f4c7b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 22 Jun 2006 00:35:29 +0000
Subject: [PATCH] Look: Ajout picto societe sur societe dans onglet contrats
---
htdocs/contrat/contact.php | 17 +++++++++++++++--
htdocs/contrat/fiche.php | 9 ++++-----
htdocs/contrat/ligne.php | 17 +++++++++++++++--
htdocs/contrat/note.php | 15 +++++++++++++--
4 files changed, 47 insertions(+), 11 deletions(-)
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 "<tr><td>".$langs->trans("Customer")."</td>";
- print '<td colspan="3">';
- print '<b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$contrat->societe->id.'">'.$contrat->societe->nom.'</a></b></td></tr>';
+ print '<td colspan="3">'.$soc->getNomUrl(1).'</td></tr>';
+
+ // Ligne info remises tiers
+ print '<tr><td>'.$langs->trans('Discount').'</td><td>';
+ 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 '</td></tr>';
print "</table>";
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 '<td><input type="text" maxlength="30" name="ref" size="20"></td></tr>';
// Customer
- print '<tr><td>'.$langs->trans("Customer").'</td><td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$obj->nom.'</a></td></tr>';
+ print '<tr><td>'.$langs->trans("Customer").'</td><td>'.$soc->getNomUrl(1).'</td></tr>';
// Ligne info remises tiers
- print '<tr><td>'.$langs->trans('Info').'</td><td>';
+ print '<tr><td>'.$langs->trans('Discount').'</td><td>';
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 "<tr><td>".$langs->trans("Customer")."</td>";
- print '<td colspan="3">';
- print '<b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$contrat->societe->id.'">'.$contrat->societe->nom.'</a></b></td></tr>';
+ print '<td colspan="3">'.$contrat->societe->getNomUrl(1).'</td></tr>';
// Ligne info remises tiers
- print '<tr><td>'.$langs->trans('Info').'</td><td>';
+ print '<tr><td>'.$langs->trans('Discount').'</td><td>';
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 "<tr><td>".$langs->trans("Customer")."</td>";
- print '<td colspan="3">';
- print '<b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$contrat->societe->id.'">'.$contrat->societe->nom.'</a></b></td></tr>';
+ print '<td colspan="3">'.$soc->getNomUrl(1).'</td></tr>';
+
+ // Ligne info remises tiers
+ print '<tr><td>'.$langs->trans('Discount').'</td><td>';
+ 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 '</td></tr>';
// Statut contrat
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
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 '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="5">'.$contrat->ref.'</td></tr>';
+ // Societe
print '<tr><td>'.$langs->trans("Customer").'</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).'</td></tr>';
+
+ // Ligne info remises tiers
+ print '<tr><td>'.$langs->trans('Discount').'</td><td>';
+ 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 '</td></tr>';
// Note publique
print '<tr><td valign="top">'.$langs->trans("NotePublic").' :</td>';
--
GitLab