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

Merge pull request #13416 from simnandez/11.0

Browse Source 
FIX: Compatibility with multicompany, bad numerotation of task.
This commit is contained in:
Laurent Destailleur 2020-03-25 18:40:13 +01:00 committed by GitHub
commit 33fe7b5f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/projet/class/task.class.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@inodbox.com> * Copyright (C) 2010-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2020 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -154,7 +155,8 @@ class Task extends CommonObject
// Insert request // Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task ("; $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task (";
$sql .= "fk_projet"; $sql .= "entity";
$sql .= ", fk_projet";
$sql .= ", ref"; $sql .= ", ref";
$sql .= ", fk_task_parent"; $sql .= ", fk_task_parent";
$sql .= ", label"; $sql .= ", label";
@ -166,7 +168,8 @@ class Task extends CommonObject
$sql .= ", planned_workload"; $sql .= ", planned_workload";
$sql .= ", progress"; $sql .= ", progress";
$sql .= ") VALUES ("; $sql .= ") VALUES (";
$sql .= $this->fk_project; $sql .= $conf->entity;
$sql .= ", ".$this->fk_project;
$sql .= ", ".(!empty($this->ref) ? "'".$this->db->escape($this->ref)."'" : 'null'); $sql .= ", ".(!empty($this->ref) ? "'".$this->db->escape($this->ref)."'" : 'null');
$sql .= ", ".$this->fk_task_parent; $sql .= ", ".$this->fk_task_parent;
$sql .= ", '".$this->db->escape($this->label)."'"; $sql .= ", '".$this->db->escape($this->label)."'";