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

FIX #yogosha5770

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-29 23:24:52 +02:00
parent 32bec56529
commit 3616d2ba44
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/commonobject.class.php
View File

@ -358,7 +358,7 @@ abstract class CommonObject
/** /**
* @var string * @var string
* @deprecated * @deprecated
* @see model_pdf * @see $model_pdf
*/ */
public $modelpdf; public $modelpdf;
@ -2201,22 +2201,22 @@ abstract class CommonObject
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element; $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
if (!empty($this->fields['fk_project'])) { // Common case if (!empty($this->fields['fk_project'])) { // Common case
if ($projectid) { if ($projectid) {
$sql .= ' SET fk_project = '.$projectid; $sql .= ' SET fk_project = '.((int) $projectid);
} else { } else {
$sql .= ' SET fk_project = NULL'; $sql .= ' SET fk_project = NULL';
} }
$sql .= ' WHERE rowid = '.$this->id; $sql .= ' WHERE rowid = '.((int) $this->id);
} elseif ($this->table_element == 'actioncomm') { // Special case for actioncomm } elseif ($this->table_element == 'actioncomm') { // Special case for actioncomm
if ($projectid) { if ($projectid) {
$sql .= ' SET fk_project = '.$projectid; $sql .= ' SET fk_project = '.((int) $projectid);
} else { } else {
$sql .= ' SET fk_project = NULL'; $sql .= ' SET fk_project = NULL';
} }
$sql .= ' WHERE id = '.$this->id; $sql .= ' WHERE id = '.((int) $this->id);
} else // Special case for old architecture objects } else // Special case for old architecture objects
{ {
if ($projectid) { if ($projectid) {
$sql .= ' SET fk_projet = '.$projectid; $sql .= ' SET fk_projet = '.((int) $projectid);
} else { } else {
$sql .= ' SET fk_projet = NULL'; $sql .= ' SET fk_projet = NULL';
} }
@ -2225,7 +2225,7 @@ abstract class CommonObject
dol_syslog(get_class($this)."::setProject", LOG_DEBUG); dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
if ($this->db->query($sql)) { if ($this->db->query($sql)) {
$this->fk_project = $projectid; $this->fk_project = ((int) $projectid);
return 1; return 1;
} else { } else {
dol_print_error($this->db); dol_print_error($this->db);

14
htdocs/ticket/card.php
View File

@ -186,7 +186,7 @@ if (empty($reshook)) {
$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha'); $notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1; $object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
$object->fk_project = GETPOST('projectid', 'int'); $object->fk_project = $projectid;
$id = $object->create($user); $id = $object->create($user);
if ($id <= 0) { if ($id <= 0) {
@ -205,9 +205,9 @@ if (empty($reshook)) {
$result = $object->add_contact($contactid, $typeid, 'external'); $result = $object->add_contact($contactid, $typeid, 'external');
} }
// altairis: link ticket to project // Link ticket to project
if (GETPOST('projectid') > 0) { if ($projectid > 0) {
$object->setProject(GETPOST('projectid')); $object->setProject($projectid);
} }
// Auto assign user // Auto assign user
@ -236,7 +236,7 @@ if (empty($reshook)) {
if ($conf->global->TICKET_AUTO_CREATE_FICHINTER_CREATE) { if ($conf->global->TICKET_AUTO_CREATE_FICHINTER_CREATE) {
$fichinter = new Fichinter($db); $fichinter = new Fichinter($db);
$fichinter->socid = $object->fk_soc; $fichinter->socid = $object->fk_soc;
$fichinter->fk_project = GETPOST('projectid', 'int'); $fichinter->fk_project = $projectid;
$fichinter->fk_contrat = $contractid; $fichinter->fk_contrat = $contractid;
$fichinter->author = $user->id; $fichinter->author = $user->id;
$fichinter->model_pdf = 'soleil'; $fichinter->model_pdf = 'soleil';
@ -534,7 +534,7 @@ if (empty($reshook)) {
} elseif ($action == 'classin' && $user->rights->ticket->write) { } elseif ($action == 'classin' && $user->rights->ticket->write) {
// Categorisation dans projet // Categorisation dans projet
if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) { if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
$object->setProject(GETPOST('projectid', 'int')); $object->setProject($projectid);
$url = 'card.php?action=view&track_id='.$object->track_id; $url = 'card.php?action=view&track_id='.$object->track_id;
header("Location: ".$url); header("Location: ".$url);
exit(); exit();
@ -778,7 +778,7 @@ if ($action == 'create' || $action == 'presend') {
} }
// project info // project info
if ($projectid) { if ($projectid > 0) {
$projectstat = new Project($db); $projectstat = new Project($db);
if ($projectstat->fetch($projectid) > 0) { if ($projectstat->fetch($projectid) > 0) {
$projectstat->fetch_thirdparty(); $projectstat->fetch_thirdparty();

7
htdocs/ticket/class/ticket.class.php
View File

@ -1994,16 +1994,15 @@ class Ticket extends CommonObject
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element; $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
if ($projectid) { if ($projectid) {
$sql .= ' SET fk_project = '.$projectid; $sql .= ' SET fk_project = '.((int) $projectid);
} else { } else {
$sql .= ' SET fk_project = NULL'; $sql .= ' SET fk_project = NULL';
} }
$sql .= ' WHERE rowid = '.((int) $this->id);
$sql .= ' WHERE rowid = '.$this->id;
dol_syslog(get_class($this)."::setProject sql=".$sql); dol_syslog(get_class($this)."::setProject sql=".$sql);
if ($this->db->query($sql)) { if ($this->db->query($sql)) {
$this->fk_project = $projectid; $this->fk_project = ((int) $projectid);
return 1; return 1;
} else { } else {
dol_print_error($this->db); dol_print_error($this->db);