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

Fix: Le statut de propal ne s'affichait pas dans fiche

Browse Source
This commit is contained in:
Laurent Destailleur 2005-06-30 22:48:37 +00:00
parent a9c5400024
commit 9b45620013
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/comm/propal.php
View File

@ -430,7 +430,7 @@ if ($_GET['propalid'])
// \todo faire en sorte que la form respecte à nouveau la norme
// problème : sans javascript, ça va être chaud...
print '<table class="border" width="100%">';
$rowspan=7;
$rowspan=8;
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">';
if ($societe->client == 1)
{
@ -444,12 +444,18 @@ if ($_GET['propalid'])
print '<td align="left" colspan="2">Conditions de réglement : </td></tr>';
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
print dolibarr_print_date($propal->date);
print '</td>';
print '<td>'.$langs->trans('DateEndPropal').'</td><td>';
if ($propal->fin_validite)
{
print ' ('.dolibarr_print_date($propal->fin_validite).')';
print dolibarr_print_date($propal->fin_validite);
}
else {
print $langs->trans("Unknown");
}
print '</td>';
print '<td colspan="2">&nbsp;</td></tr>';
print '</tr>';
$langs->load('mails');
print '<tr>';
print '<td>'.$langs->trans('MailTo').'</td>';
@ -535,7 +541,7 @@ if ($_GET['propalid'])
$author->fetch('');
print '<tr><td height="10">'.$langs->trans('Author').'</td><td colspan="3">'.$author->fullname.'</td></tr>';
print '<tr><td height="10">'.$langs->trans('GlobalDiscount').'</td>';
print '<tr><td height="10" nowrap>'.$langs->trans('GlobalDiscount').'</td>';
if ($propal->brouillon == 1 && $user->rights->propale->creer)
{
print '<form action="propal.php?propalid='.$propal->id.'" method="post">';

21
htdocs/propal.class.php
View File

@ -55,12 +55,17 @@ class Propal
var $products_qty;
var $note;
var $price;
var $status;
var $labelstatut=array();
var $labelstatut_short=array();
var $product=array();
/**
* \brief Constructeur
* \brief Constructeur
*/
function Propal($DB, $soc_idp="", $propalid=0)
{
global $langs;
@ -72,10 +77,10 @@ class Propal
$this->remise = 0;
$langs->load("propals");
$this->statut[0]=$langs->trans("PropalStatusDraft");
$this->statut[1]=$langs->trans("PropalStatusValidated");
$this->statut_short[0]=$langs->trans("PropalStatusDraft");
$this->statut_short[1]=$langs->trans("Opened");
$this->labelstatut[0]=$langs->trans("PropalStatusDraft");
$this->labelstatut[1]=$langs->trans("PropalStatusValidated");
$this->labelstatut_short[0]=$langs->trans("PropalStatusDraft");
$this->labelstatut_short[1]=$langs->trans("Opened");
}
@ -965,8 +970,8 @@ class Propal
*/
function LibStatut($statut,$size=1)
{
if ($size) return $this->statut[$statut];
else return $this->statut_short[$statut];
if ($size) return $this->labelstatut[$statut];
else return $this->labelstatut_short[$statut];
}
}