Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v19

Browse Source
This commit is contained in:
Laurent Destailleur 2023-10-28 02:06:07 +02:00
parent 939cf8b200
commit 6d7d698371
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/asset/class/asset.class.php
View File

@ -1466,12 +1466,10 @@ class Asset extends CommonObject
$obj = $this->db->fetch_object($result);
$this->id = $obj->rowid;
$this->user_creation_id = $obj->fk_user_author;
$this->user_validation_id = $obj->fk_user_valid;
$this->user_closing_id = $obj->fk_user_cloture;
$this->user_creation_id = $obj->fk_user_creat;
$this->user_modification_id = $obj->fk_user_modif;
$this->date_creation = $this->db->jdate($obj->datec);
$this->date_modification = $this->db->jdate($obj->datem);
$this->date_validation = $this->db->jdate($obj->datev);
}
$this->db->free($result);

2
htdocs/contrat/card.php
View File

@ -777,7 +777,7 @@ if (empty($reshook)) {
$objectline->date_start_real = $date_start_real_update;
$objectline->date_end = $date_end_update;
$objectline->date_end_real = $date_end_real_update;
$objectline->fk_user_cloture = $user->id;
$objectline->user_closing_id = $user->id;
//$objectline->fk_fournprice = $fk_fournprice;
$objectline->pa_ht = $pa_ht;
$objectline->rang = $objectline->rang;

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

@ -455,7 +455,7 @@ class Contrat extends CommonObject
if ($contratline->statut != ContratLigne::STATUS_CLOSED) {
$contratline->date_end_real = $now;
$contratline->date_cloture = $now; // For backward compatibility
$contratline->fk_user_cloture = $user->id;
$contratline->user_closing_id = $user->id;
$contratline->statut = ContratLigne::STATUS_CLOSED;
$result = $contratline->close_line($user, $now, $comment, $notrigger);
if ($result < 0) {
@ -3784,7 +3784,7 @@ class ContratLigne extends CommonObjectLine
// Update object
$this->date_cloture = $date_end_real;
$this->date_end_real = $date_end_real;
$this->fk_user_cloture = $user->id;
$this->user_closing_id = $user->id;
$this->commentaire = $comment;
$error = 0;

2
htdocs/projet/class/project.class.php
View File

@ -2329,7 +2329,7 @@ class Project extends CommonObject
{
$sql = 'SELECT c.rowid, datec as datec, tms as datem,';
$sql .= ' date_close as datecloture,';
$sql .= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture';
$sql .= ' fk_user_creat as fk_user_author, fk_user_close as fk_user_cloture';
$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as c';
$sql .= ' WHERE c.rowid = '.((int) $id);
$result = $this->db->query($sql);

2
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -1616,7 +1616,7 @@ class SupplierProposal extends CommonObject
if (!empty($note)) {
$sql .= " note_private = '".$this->db->escape($note)."',";
}
$sql .= " date_cloture=NULL, fk_user_cloture=NULL";
$sql .= " date_cloture = NULL, fk_user_cloture = NULL";
$sql .= " WHERE rowid = ".((int) $this->id);
$this->db->begin();