diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 969b33d858d..27741ff6295 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -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 ''; - $rowspan=7; + $rowspan=8; print ''; print ''; + + print ''; - print ''; + print ''; $langs->load('mails'); print ''; print ''; @@ -535,7 +541,7 @@ if ($_GET['propalid']) $author->fetch(''); print ''; - print ''; + print ''; if ($propal->brouillon == 1 && $user->rights->propale->creer) { print ''; diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index 0d401585ca5..975c03a4462 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -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]; } }
'.$langs->trans('Company').''; if ($societe->client == 1) { @@ -444,12 +444,18 @@ if ($_GET['propalid']) print 'Conditions de réglement :
'.$langs->trans('Date').''; print dolibarr_print_date($propal->date); + print ''.$langs->trans('DateEndPropal').''; if ($propal->fin_validite) { - print ' ('.dolibarr_print_date($propal->fin_validite).')'; + print dolibarr_print_date($propal->fin_validite); + } + else { + print $langs->trans("Unknown"); } print ' 
'.$langs->trans('MailTo').'
'.$langs->trans('Author').''.$author->fullname.'
'.$langs->trans('GlobalDiscount').'
'.$langs->trans('GlobalDiscount').'