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

Fix duplicated code and missing declaration

Browse Source
This commit is contained in:
Laurent Destailleur 2021-08-26 21:35:31 +02:00
parent ac55a052b2
commit c6c87cd813
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/contrat/class/contrat.class.php
View File

@ -181,6 +181,13 @@ class Contrat extends CommonObject
*/ */
public $lines = array(); public $lines = array();
public $nbofservices;
public $nbofserviceswait;
public $nbofservicesopened;
public $nbofservicesexpired;
//public $lower_planned_end_date;
//public $higher_planner_end_date;
/** /**
* Maps ContratLigne IDs to $this->lines indexes * Maps ContratLigne IDs to $this->lines indexes
* @var int[] * @var int[]
@ -429,7 +436,8 @@ class Contrat extends CommonObject
foreach ($this->lines as $contratline) { foreach ($this->lines as $contratline) {
// Close lines not already closed // Close lines not already closed
if ($contratline->statut != ContratLigne::STATUS_CLOSED) { if ($contratline->statut != ContratLigne::STATUS_CLOSED) {
$contratline->date_cloture = $now; $contratline->date_end_real = $now;
$contratline->date_cloture = $now; // For backward compatibility
$contratline->fk_user_cloture = $user->id; $contratline->fk_user_cloture = $user->id;
$contratline->statut = ContratLigne::STATUS_CLOSED; $contratline->statut = ContratLigne::STATUS_CLOSED;
$result = $contratline->close_line($user, $now, $comment, $notrigger); $result = $contratline->close_line($user, $now, $comment, $notrigger);
@ -753,6 +761,7 @@ class Contrat extends CommonObject
// phpcs:enable // phpcs:enable
global $langs, $conf, $extrafields; global $langs, $conf, $extrafields;
$this->nbofservices = 0;
$this->nbofserviceswait = 0; $this->nbofserviceswait = 0;
$this->nbofservicesopened = 0; $this->nbofservicesopened = 0;
$this->nbofservicesexpired = 0; $this->nbofservicesexpired = 0;
@ -2642,10 +2651,23 @@ class ContratLigne extends CommonObjectLine
public $date_end; // date end planned public $date_end; // date end planned
public $date_end_real; // date end real public $date_end_real; // date end real
// For backward compatibility // For backward compatibility
/**
* @deprecated Use date_start
*/
public $date_ouverture_prevue; // date start planned public $date_ouverture_prevue; // date start planned
/**
* @deprecated Use date_start_real
*/
public $date_ouverture; // date start real public $date_ouverture; // date start real
/**
* @deprecated Use date_end
*/
public $date_fin_validite; // date end planned public $date_fin_validite; // date end planned
/**
* @deprecated Use date_end_real
*/
public $date_cloture; // date end real public $date_cloture; // date end real
public $tva_tx; public $tva_tx;
public $localtax1_tx; public $localtax1_tx;
public $localtax2_tx; public $localtax2_tx;
@ -3062,7 +3084,6 @@ class ContratLigne extends CommonObjectLine
$this->oldcopy = new ContratLigne($this->db); $this->oldcopy = new ContratLigne($this->db);
$this->oldcopy->fetch($this->id); $this->oldcopy->fetch($this->id);
$this->oldcopy->fetch_optionals();
// Update request // Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";