From 9b40cc9e891fc817ddd5ce65abffe7b8d3ef5e85 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 2 Sep 2014 12:09:43 +0200 Subject: [PATCH 1/4] fix --- ChangeLog | 1 + htdocs/core/class/extrafields.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d7ec265d040..1ffddf5a79e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ For users: - Fix: Trigger on create category call failed because user is not passed on card - Fix: list event view lost type event filter - Fix: Save also code event +- Fix: Extrafield feature select from table should try to translate multiple column when not needed ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 2f6a63b6d8c..13757ef947a 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -976,7 +976,7 @@ class ExtraFields // Several field into label (eq table:code|libelle:rowid) $fields_label = explode('|',$InfoFieldList[1]); - if(is_array($fields_label)) + if(is_array($fields_label) && count($fields_label)>1) { foreach ($fields_label as $field_toshow) { From f62e7d6043e0199d729a691c7a70630782a5e6db Mon Sep 17 00:00:00 2001 From: Cedric Date: Sun, 7 Sep 2014 10:07:26 +0200 Subject: [PATCH 2/4] Little fix --- htdocs/expedition/class/expedition.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 93c7f63b4ad..b6cdf5457d3 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -919,6 +919,7 @@ class Expedition extends CommonObject $this->db->begin(); if ($conf->productbatch->enabled) { + require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php'; if ( ExpeditionLigneBatch::deletefromexp($this->db,$this->id)<0) {$error++;$this->errors[]="Error ".$this->db->lasterror();} } @@ -1096,6 +1097,7 @@ class Expedition extends CommonObject $line = new ExpeditionLigne($this->db); $obj = $this->db->fetch_object($resql); + $line->line_id = $obj->line_id; $line->fk_origin_line = $obj->fk_origin_line; $line->origin_line_id = $obj->fk_origin_line; // TODO deprecated $line->entrepot_id = $obj->fk_entrepot; From c5ccf2998b520a65ee77159c1c648564d9419a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Mon, 8 Sep 2014 16:13:03 +0200 Subject: [PATCH 3/4] Fixed forgotten rename --- htdocs/projet/class/project.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 652119596c3..02298c196ca 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -988,7 +988,7 @@ class Project extends CommonObject $error=0; - dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_file=".$clone_file." clone_note=".$clone_note); + dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_project_file=".$clone_project_file." clone_note=".$clone_note); $now = dol_mktime(0,0,0,idate('m',dol_now()),idate('d',dol_now()),idate('Y',dol_now())); From 367d225d3edf19de42d8909d68bd3936acce8010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Mon, 8 Sep 2014 16:13:29 +0200 Subject: [PATCH 4/4] Fixed missing class include for task duplication --- htdocs/projet/class/project.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 02298c196ca..e6c718c655f 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -1146,6 +1146,8 @@ class Project extends CommonObject //Duplicate task if ($clone_task) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php'; + $taskstatic = new Task($this->db); // Security check