Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

deprecate statut (#33691)

Browse Source 
* deprecate statut

* Update fichinter.class.php

* clean code

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
Frédéric FRANCE
2025-04-02 11:27:17 +02:00
committed by GitHub
parent 91fa444129
commit 51624f8a50
3 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/fichinter/class/fichinter.class.php
View File

@@ -6,7 +6,7 @@
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015-2020 Charlene Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2023-2024 William Mead <william.mead@manchenumerique.fr>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
*
@@ -145,9 +145,15 @@ class Fichinter extends CommonObject
/**
* @var int status
* @deprecated Use $status instead
*/
public $statut = 0; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
/**
* @var int status
*/
public $status = 0; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
/**
* @var string description
*/
@@ -340,7 +346,7 @@ class Fichinter extends CommonObject
$sql .= ", '".$this->db->escape($this->model_pdf)."'";
$sql .= ", ".($this->fk_project ? ((int) $this->fk_project) : 0);
$sql .= ", ".($this->fk_contrat ? ((int) $this->fk_contrat) : 0);
$sql .= ", ".((int) $this->statut);
$sql .= ", ".((int) $this->status);
$sql .= ", ".($this->signed_status);
$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
@@ -555,7 +561,7 @@ class Fichinter extends CommonObject
$error = 0;
// Protection
if ($this->statut <= self::STATUS_DRAFT) {
if ($this->status <= self::STATUS_DRAFT) {
return 0;
}
@@ -580,7 +586,8 @@ class Fichinter extends CommonObject
}
if (!$error) {
$this->statut = self::STATUS_DRAFT;
$this->status = self::STATUS_DRAFT;
$this->statut = self::STATUS_DRAFT; // deprecated
$this->db->commit();
return 1;
} else {
@@ -725,7 +732,7 @@ class Fichinter extends CommonObject
$error = 0;
if ($this->statut == self::STATUS_CLOSED) {
if ($this->status == self::STATUS_CLOSED) {
return 0;
} else {
$this->db->begin();
@@ -751,7 +758,8 @@ class Fichinter extends CommonObject
}
if (!$error) {
$this->statut = self::STATUS_CLOSED;
$this->status = self::STATUS_CLOSED;
$this->statut = self::STATUS_CLOSED; // deprecated
$this->db->commit();
return 1;
} else {
@@ -884,9 +892,7 @@ class Fichinter extends CommonObject
$datas = [];
$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ShowIntervention").'</u>';
if (isset($this->status)) {
$datas['picto'] .= ' '.$this->getLibStatut(5);
}
$datas['picto'] .= ' '.$this->getLibStatut(5);
$datas['ref'] = '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
return $datas;
@@ -1340,12 +1346,12 @@ class Fichinter extends CommonObject
$this->statut = self::STATUS_DRAFT; // deprecated
// Clear fields
$this->user_author_id = $user->id;
$this->user_author_id = $user->id;
$this->user_validation_id = 0;
$this->date_creation = '';
$this->date_validation = '';
$this->date_creation = '';
$this->date_validation = '';
$this->ref_client = '';
$this->ref_client = '';
if (!$clone_notes) {
$this->note_private = '';