diff --git a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php index 9ece33a9a56..831a8aa1280 100644 --- a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php +++ b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php @@ -133,7 +133,7 @@ class box_graph_new_vs_close_ticket extends ModeleBoxes $px1 = new DolGraph(); $mesg = $px1->isGraphKo(); if (!$mesg) { - $px1->SetDataColor(array_values($colorseries)); + $px1->SetDataColor($colorseries); $px1->SetData($data); $px1->setShowLegend(2); if (!empty($conf->dol_optimize_smallscreen)) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index eeb18c303eb..739b99906d0 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -12158,6 +12158,8 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '') // extrafield for a service, it is not supported and not found when editing the product/service card. So we must keep 'product' for extrafields // of service and we will return properties of a product. $ismodenabled = (isModEnabled('product') || isModEnabled('service')); + } elseif ($element_prop['module'] == 'societeaccount') { + $ismodenabled = isModEnabled('website') || isModEnabled('webportal'); } else { $ismodenabled = isModEnabled($element_prop['module']); } diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql index e7d7c2b6baf..efbd730b5e5 100644 --- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql +++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql @@ -161,4 +161,33 @@ ALTER TABLE llx_usergroup_extrafields ADD UNIQUE INDEX uk_usergroup_extrafields UPDATE llx_categorie SET date_creation = tms, tms = tms WHERE date_creation IS NULL AND tms IS NOT NULL; +CREATE TABLE llx_product_thirdparty +( + rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, + fk_product integer NOT NULL, + fk_soc integer NOT NULL, + fk_product_thirdparty_relation_type integer NOT NULL, + date_start datetime, + date_end datetime, + fk_project integer, + description text, + note_public text, + note_private text, + date_creation datetime NOT NULL, + tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + fk_user_creat integer NOT NULL, + fk_user_modif integer, + last_main_doc varchar(255), + import_key varchar(14), + model_pdf varchar(255), + status integer DEFAULT 1 NOT NULL +) ENGINE = innodb; + +CREATE TABLE llx_c_product_thirdparty_relation_type +( + rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, + code varchar(24) NOT NULL, + label varchar(128), + active tinyint default 1 NOT NULL +) ENGINE = innodb; diff --git a/htdocs/install/mysql/tables/llx_c_product_thirdparty_relation_type.sql b/htdocs/install/mysql/tables/llx_c_product_thirdparty_relation_type.sql new file mode 100644 index 00000000000..88df28f60de --- /dev/null +++ b/htdocs/install/mysql/tables/llx_c_product_thirdparty_relation_type.sql @@ -0,0 +1,29 @@ +-- ============================================================================ +-- Copyright (C) 2002-2006 Rodolphe Quiedeville +-- Copyright (C) 2008-2017 Laurent Destailleur +-- Copyright (C) 2005-2010 Regis Houssin +-- Copyright (C) 2023 Florian Henry + +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ============================================================================ + +CREATE TABLE llx_c_product_thirdparty_relation_type +( + rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, + code varchar(24) NOT NULL, + label varchar(128), + active tinyint default 1 NOT NULL +) ENGINE = innodb; diff --git a/htdocs/install/mysql/tables/llx_product_thirdparty.sql b/htdocs/install/mysql/tables/llx_product_thirdparty.sql new file mode 100644 index 00000000000..4af00bcf447 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_product_thirdparty.sql @@ -0,0 +1,43 @@ +-- ============================================================================ +-- Copyright (C) 2002-2006 Rodolphe Quiedeville +-- Copyright (C) 2008-2017 Laurent Destailleur +-- Copyright (C) 2005-2010 Regis Houssin +-- Copyright (C) 2023 Florian Henry + +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ============================================================================ + +CREATE TABLE llx_product_thirdparty +( + rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, + fk_product integer NOT NULL, + fk_soc integer NOT NULL, + fk_product_thirdparty_relation_type integer NOT NULL, + date_start datetime, + date_end datetime, + fk_project integer, + description text, + note_public text, + note_private text, + date_creation datetime NOT NULL, + tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + fk_user_creat integer NOT NULL, + fk_user_modif integer, + last_main_doc varchar(255), + import_key varchar(14), + model_pdf varchar(255), + status integer DEFAULT 1 NOT NULL +) ENGINE = innodb; diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 142fbf6eae9..2783a366405 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -509,7 +509,7 @@ class Dolresource extends CommonObject * @param array $filter filter output * @return int Return integer <0 if KO, Number of lines loaded if OK */ - public function fetchAll($sortorder, $sortfield, $limit, $offset, $filter = '') + public function fetchAll($sortorder, $sortfield, $limit, $offset, $filter = []) { // phpcs:enable require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';