diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php
index c20fc68c227..037e8a30ef7 100644
--- a/htdocs/contrat/contrat.class.php
+++ b/htdocs/contrat/contrat.class.php
@@ -785,7 +785,7 @@ class Contrat extends CommonObject
dol_syslog("Contrat::addline $desc, $pu_ht, $qty, $txtva, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type, $pu_ttc, $info_bits");
- if ($this->statut == 0 || ($this->statut >= 1 && empty($conf->global->CONTRAT_NOEDITWHENVALIDATED)))
+ if ($this->statut >= 0)
{
$this->db->begin();
@@ -977,7 +977,7 @@ class Contrat extends CommonObject
{
global $conf, $langs;
- if ($this->statut == 0 || ($this->statut >= 1 && empty($conf->global->CONTRAT_NOEDITWHENVALIDATED)) )
+ if ($this->statut >= 0)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
$sql.= " WHERE rowid=".$idline;
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index cdd6768524b..1d241058100 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -851,7 +851,7 @@ else
}
// Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
print '
';
- if ($user->rights->contrat->creer && sizeof($arrayothercontracts) && ($contrat->statut == 0 || ($contrat->statut >= 1 && empty($conf->global->CONTRAT_NOEDITWHENVALIDATED))))
+ if ($user->rights->contrat->creer && sizeof($arrayothercontracts) && ($contrat->statut >= 0))
{
print '';
print img_picto($langs->trans("MoveToAnotherContract"),'uparrow');
@@ -860,7 +860,7 @@ else
else {
print ' ';
}
- if ($user->rights->contrat->creer && ($contrat->statut == 0 || ($contrat->statut >= 1 && empty($conf->global->CONTRAT_NOEDITWHENVALIDATED))) )
+ if ($user->rights->contrat->creer && ($contrat->statut >= 0))
{
print '';
print img_edit();
@@ -869,7 +869,7 @@ else
else {
print ' ';
}
- if ( $user->rights->contrat->creer && ($contrat->statut == 0 || ($contrat->statut >= 1 && empty($conf->global->CONTRAT_NOEDITWHENVALIDATED))) )
+ if ( $user->rights->contrat->creer && ($contrat->statut >= 0))
{
print ' ';
print '';
@@ -1188,8 +1188,7 @@ else
/*
* Ajouter une ligne produit/service
*/
- if ($user->rights->contrat->creer &&
- ($contrat->statut == 0 || ($contrat->statut >= 1 && empty($conf->global->CONTRAT_NOEDITWHENVALIDATED))) )
+ if ($user->rights->contrat->creer && ($contrat->statut >= 0))
{
print ' ';
print ''; // Array with (n*2)+1 lines
|