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

Debug edit actioncomm

Browse Source
This commit is contained in:
Laurent Destailleur 2022-11-29 14:38:25 +01:00
parent 19c4258e2d
commit b15fda8d9a
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/card.php
View File

@ -550,7 +550,9 @@ if (empty($reshook) && $action == 'update') {
} }
} else { } else {
$object->type_id = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm'); $object->type_id = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
$object->type_code = GETPOST("actioncode", 'aZ09');
} }
$object->label = GETPOST("label", "alphanohtml"); $object->label = GETPOST("label", "alphanohtml");
$object->datep = $datep; $object->datep = $datep;
$object->datef = $datef; $object->datef = $datef;

19
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1150,12 +1150,8 @@ class ActionComm extends CommonObject
$userownerid = ($this->userownerid ? $this->userownerid : 0); $userownerid = ($this->userownerid ? $this->userownerid : 0);
$userdoneid = ($this->userdoneid ? $this->userdoneid : 0); $userdoneid = ($this->userdoneid ? $this->userdoneid : 0);
$this->db->begin(); // If a type_id is set, we must also have the type_code set
$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
$sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
if ($this->type_id > 0) { if ($this->type_id > 0) {
$sql .= ", fk_action = ".(int) $this->type_id;
if (empty($this->type_code)) { if (empty($this->type_code)) {
$cactioncomm = new CActionComm($this->db); $cactioncomm = new CActionComm($this->db);
$result = $cactioncomm->fetch($this->type_id); $result = $cactioncomm->fetch($this->type_id);
@ -1164,7 +1160,18 @@ class ActionComm extends CommonObject
} }
} }
} }
$sql .= ", code = " . (isset($this->type_code)? "'".$this->db->escape($this->type_code) . "'":"null");
$code = $this->code;
if (empty($code) || (!empty($this->oldcopy) && $this->oldcopy->type_code != $this->type_code)) { // If code unknown or if change the type, we reset $code too
$code = $this->type_code;
}
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
$sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
$sql .= ", fk_action = ".(int) $this->type_id;
$sql .= ", code = " . ($code ? "'".$this->db->escape($code)."'" : "null");
$sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null"); $sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null");
$sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null'); $sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null');
$sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null'); $sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');