diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php index 7c7c624603b..9cc2258a4df 100644 --- a/htdocs/api/class/api_documents.class.php +++ b/htdocs/api/class/api_documents.class.php @@ -738,7 +738,7 @@ class Documents extends DolibarrApi // Fetching the tasks project is required because its out_dir might be a sub-directory of the project if ($task_result > 0) { - $project_result = $object->fetch_projet(); + $project_result = $object->fetchProject(); if ($project_result >= 0) { $tmpreldir = dol_sanitizeFileName($object->project->ref).'/'; diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 843ccc40575..2d202898b67 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -8,8 +8,8 @@ * Copyright (C) 2014 Cedric GROSS * Copyright (C) 2015 Alexandre Spangaro * Copyright (C) 2018-2024 Frédéric France - * Copyright (C) 2019 Ferran Marcet - * Copyright (C) 2024 MDW + * Copyright (C) 2019 Ferran Marcet + * Copyright (C) 2024 MDW * * 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 @@ -1797,7 +1797,7 @@ if ($id > 0) { } $result2 = $object->fetch_thirdparty(); - $result2 = $object->fetch_projet(); + $result2 = $object->fetchProject(); $result3 = $object->fetch_contact(); $result4 = $object->fetch_userassigned(); $result5 = $object->fetch_optionals(); diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 0483f722a1b..373c3d0027c 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -107,7 +107,7 @@ if ($id > 0 || !empty($ref)) { if ($ret > 0) { $ret = $object->fetch_thirdparty(); if ($ret > 0 && isset($object->fk_project)) { - $ret = $object->fetch_project(); + $ret = $object->fetchProject(); } } if ($ret <= 0) { diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 99ce09c9a99..2f14bf1930a 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1687,7 +1687,7 @@ class Propal extends CommonObject $this->thirdparty = null; // Clear if another value was already set by fetch_thirdparty $this->fk_project = $obj->fk_project; - $this->project = null; // Clear if another value was already set by fetch_projet + $this->project = null; // Clear if another value was already set by fetchProject $this->model_pdf = $obj->model_pdf; $this->last_main_doc = $obj->last_main_doc; @@ -3744,7 +3744,7 @@ class Propal extends CommonObject if (!$nofetch) { $langs->load('project'); if (is_null($this->project) || (is_object($this->project) && $this->project->isEmpty())) { - $res = $this->fetch_project(); + $res = $this->fetchProject(); if ($res > 0 && $this->project instanceof Project) { $datas['project'] = '
'.$langs->trans('Project').': '.$this->project->getNomUrl(1, '', 0, 1); } diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index f0fae6c7c17..58aa8d1843f 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3804,7 +3804,7 @@ class Commande extends CommonOrder if (!$nofetch) { $langs->load('project'); if (is_null($this->project) || (is_object($this->project) && $this->project->isEmpty())) { - $res = $this->fetch_project(); + $res = $this->fetchProject(); if ($res > 0 && $this->project instanceof Project) { $datas['project'] = '
'.$langs->trans('Project').': '.$this->project->getNomUrl(1, '', 0, 1); } diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 796562a1f19..e1bcd26095c 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -138,7 +138,7 @@ if ($id > 0 || !empty($ref)) { } $ret = $object->fetch($id, $ref, '', 0, $fetch_situation); if ($ret > 0 && isset($object->fk_project)) { - $ret = $object->fetch_project(); + $ret = $object->fetchProject(); } } } diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index e12ea91752d..cd4ec1813db 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -2066,7 +2066,7 @@ class Contrat extends CommonObject if (!$nofetch) { $langs->load('project'); if (is_null($this->project) || (is_object($this->project) && $this->project->isEmpty())) { - $res = $this->fetch_project(); + $res = $this->fetchProject(); if ($res > 0 && $this->project instanceof Project) { $datas['project'] = '
'.$langs->trans('Project').': '.$this->project->getNomUrl(1, '', 0, 1); } diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index 1d8fec0b090..8aaee476005 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -503,8 +503,8 @@ if (!$error && $massaction == 'confirm_presend') { //var_dump($oneemailperrecipient); var_dump($listofqualifiedobj); var_dump($listofqualifiedref); foreach ($looparray as $objectid => $objecttmp) { // $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object // Make substitution in email content - if (isModEnabled('project') && method_exists($objecttmp, 'fetch_projet') && is_null($objecttmp->project)) { - $objecttmp->fetch_projet(); + if (isModEnabled('project') && method_exists($objecttmp, 'fetchProject') && is_null($objecttmp->project)) { + $objecttmp->fetchProject(); } $substitutionarray = getCommonSubstitutionArray($langs, 0, null, $objecttmp); $substitutionarray['__ID__'] = ($oneemailperrecipient ? implode(', ', array_keys($listofqualifiedobj)) : $objecttmp->id); diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index b1124c9ff8d..d966f785303 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -777,7 +777,7 @@ abstract class CommonDocGenerator // Fetch project information if there is a project assigned to this object if ($object->element != "project" && !empty($object->fk_project) && $object->fk_project > 0) { if (!is_object($object->project)) { - $object->fetch_projet(); + $object->fetchProject(); } $resarray[$array_key.'_project_ref'] = $object->project->ref; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 015b0d7ba2d..1b66f907d58 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1988,27 +1988,13 @@ abstract class CommonObject return 0; } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Load the project with id $this->fk_project into this->project + * Load the project with id $this->fk_project into this->project * - * @return int<-1,1> Return integer <0 if KO, >=0 if OK + * @return int<-1,1> Return integer <0 if KO, >=0 if OK */ - public function fetch_project() + public function fetchProject() { - // phpcs:enable - return $this->fetch_projet(); - } - - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Load the project with id $this->fk_project into this->project - * - * @return int Return integer <0 if KO, >=0 if OK - */ - public function fetch_projet() - { - // phpcs:enable include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; if (empty($this->fk_project) && !empty($this->fk_projet)) { @@ -2023,9 +2009,38 @@ abstract class CommonObject $this->projet = $project; // deprecated $this->project = $project; + return $result; } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Load the project with id $this->fk_project into this->project + * + * @return int<-1,1> Return integer <0 if KO, >=0 if OK + * @deprecated + * @see fetchProject() + */ + public function fetch_project() + { + // phpcs:enable + return $this->fetchProject(); + } + + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Load the project with id $this->fk_project into this->project + * + * @return int Return integer <0 if KO, >=0 if OK + * @deprecated + * @see fetchProject() + */ + public function fetch_projet() + { + // phpcs:enable + return $this->fetchProject(); + } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Load the product with id $this->fk_product into this->product @@ -11237,7 +11252,7 @@ abstract class CommonObject case 'project_task': require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; - $project_result = $this->fetch_projet(); + $project_result = $this->fetchProject(); if ($project_result >= 0) { $element = 'projet/'.dol_sanitizeFileName($this->project->ref).'/'; } diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index e3c73ebd6b9..45022a707ba 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -7,7 +7,8 @@ * Copyright (C) 2022 Anthony Berton * Copyright (C) 2023 William Mead * Copyright (C) 2024 Jon Bendtsen - * Copyright (C) 2024 MDW + * Copyright (C) 2024 MDW + * Copyright (C) 2024 Frédéric France * * 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 @@ -61,7 +62,6 @@ class Notify */ public $context; - /** * @var int ID of event action that trigger the notification */ @@ -448,12 +448,12 @@ class Notify /** * Return number of notifications activated, for all or a given action code (and third party) * - * @param string $notifcode Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage) - * @param int $socid Id of third party or 0 for all thirdparties or -1 for no thirdparties - * @param Object $object Object the notification is about (need it to check threshold value of some notifications) - * @param int $userid Id of user or 0 for all users or -1 for no users - * @param array $scope Scope where to search - * @return array|int Return integer <0 if KO, array of notifications to send if OK + * @param string $notifcode Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage) + * @param int $socid Id of third party or 0 for all thirdparties or -1 for no thirdparties + * @param CommonObject $object Object the notification is about (need it to check threshold value of some notifications) + * @param int $userid Id of user or 0 for all users or -1 for no users + * @param array $scope Scope where to search + * @return array|int Return integer <0 if KO, array of notifications to send if OK */ public function getNotificationsArray($notifcode, $socid = 0, $object = null, $userid = 0, $scope = array('thirdparty', 'user', 'global')) { @@ -609,7 +609,6 @@ class Notify return -1; } - //var_dump($resarray); return $resarray; } @@ -722,7 +721,7 @@ class Notify if ($result) { $num = $this->db->num_rows($result); $projtitle = ''; - if (is_object($object->project) || $object->fetch_project() > 0) { + if (is_object($object->project) || $object->fetchProject() > 0) { $projtitle = '('.$object->project->title.')'; } diff --git a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php index 6876e5de43d..01c8b70d683 100644 --- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php +++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php @@ -882,7 +882,7 @@ class pdf_standard_asset extends ModelePDFAsset // } if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -892,7 +892,7 @@ class pdf_standard_asset extends ModelePDFAsset } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 3; diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index c4b8fb77461..59bbc69f8df 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -1400,7 +1400,7 @@ class pdf_einstein extends ModelePDFCommandes } if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1410,7 +1410,7 @@ class pdf_einstein extends ModelePDFCommandes } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 3; diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php index 4f5bee5ca83..e61fff9fef2 100644 --- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php @@ -1579,7 +1579,7 @@ class pdf_eratosthene extends ModelePDFCommandes } if (getDolGlobalInt('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1589,7 +1589,7 @@ class pdf_eratosthene extends ModelePDFCommandes } if (getDolGlobalInt('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 3; diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 8caa7364cc0..ba9408e47b4 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1992,7 +1992,7 @@ class pdf_crabe extends ModelePDFFactures } if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -2002,7 +2002,7 @@ class pdf_crabe extends ModelePDFFactures } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 3; diff --git a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php index 480ddf5c87d..92b81b8624d 100644 --- a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php @@ -2187,7 +2187,7 @@ class pdf_octopus extends ModelePDFFactures } if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -2197,7 +2197,7 @@ class pdf_octopus extends ModelePDFFactures } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 3; diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index a1e328cf31c..b5622a7a4ae 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -2238,7 +2238,7 @@ class pdf_sponge extends ModelePDFFactures } if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -2248,7 +2248,7 @@ class pdf_sponge extends ModelePDFFactures } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 3; diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php index 9d7442f9826..79ea3d51119 100644 --- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php +++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php @@ -1058,7 +1058,7 @@ class pdf_vinci extends ModelePDFMo $pdf->SetFont('', '', $default_font_size - 1); if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1068,7 +1068,7 @@ class pdf_vinci extends ModelePDFMo } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 4; diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 6bd03083132..33ec7419a5b 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -1595,7 +1595,7 @@ class pdf_azur extends ModelePDFPropales } if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1605,7 +1605,7 @@ class pdf_azur extends ModelePDFPropales } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 3; diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php index 7a727af8176..b9e89cd4a0f 100644 --- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php @@ -1659,7 +1659,7 @@ class pdf_cyan extends ModelePDFPropales } if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1669,7 +1669,7 @@ class pdf_cyan extends ModelePDFPropales } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 3; diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php index 6e2f6fbe475..66b2b16c8fd 100644 --- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php +++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php @@ -1300,7 +1300,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer } if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1310,7 +1310,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php index 05b2fd06136..9b8f2f8089f 100644 --- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php @@ -1112,7 +1112,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pdf->SetFont('', '', $default_font_size - 1); if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1122,7 +1122,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 4; diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php index e1b7ced05fb..ec9669b9156 100644 --- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php +++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php @@ -1287,7 +1287,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders $pdf->SetFont('', '', $default_font_size - 1); if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1297,7 +1297,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 4; diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php index 2e41df1238c..112d7d4b90a 100644 --- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php @@ -1186,7 +1186,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetFont('', '', $default_font_size - 1); if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1196,7 +1196,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 4; diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php index 57ac5692220..e4383bd322c 100644 --- a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php +++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php @@ -664,7 +664,7 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments $pdf->SetFont('','', $default_font_size - 1); if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -675,7 +675,7 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments if (!empty($conf->global->PDF_SHOW_PROJECT)) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php index 4f775d214f7..06e88bcdefc 100644 --- a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php @@ -1256,7 +1256,7 @@ class pdf_zenith extends ModelePDFSupplierProposal $pdf->SetFont('', '', $default_font_size - 1); if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1266,7 +1266,7 @@ class pdf_zenith extends ModelePDFSupplierProposal } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 4; diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php index 64fcbf8aef1..d29932c2c20 100644 --- a/htdocs/core/tpl/card_presend.tpl.php +++ b/htdocs/core/tpl/card_presend.tpl.php @@ -1,6 +1,6 @@ - * Copyright (C) 2022 Charlene Benke + * Copyright (C) 2022 Charlene Benke * Copyright (C) 2023 Maxime Nicolas * Copyright (C) 2023 Benjamin GREMBI * Copyright (C) 2024 Frédéric France @@ -53,7 +53,7 @@ if ($action == 'presend') { $titreform = 'SendMail'; - $object->fetch_projet(); + $object->fetchProject(); $ref = dol_sanitizeFileName($object->ref); if (!in_array($object->element, array('user', 'member'))) { //$fileparams['fullname'] can be filled from the card diff --git a/htdocs/install/mysql/tables/llx_webhook_target-webhook.sql b/htdocs/install/mysql/tables/llx_webhook_target-webhook.sql index 3a6004a2d02..f0211bf806b 100644 --- a/htdocs/install/mysql/tables/llx_webhook_target-webhook.sql +++ b/htdocs/install/mysql/tables/llx_webhook_target-webhook.sql @@ -32,6 +32,6 @@ CREATE TABLE llx_webhook_target ( connection_method varchar(255) NULL, -- to store the way to authenticate to the webhook connection_data varchar(255) NULL, -- to store the data to use to authenticate to the webhook trigger_codes text NULL, -- list of selected trigger that must call the webhook - trigger_stack text -- json object to store trigger to be sent manually + trigger_stack text -- json object to store trigger to be sent manually -- END MODULEBUILDER FIELDS ) ENGINE=innodb; diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php index 9c3cfb9b266..f65a7d0ea0e 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php @@ -1014,7 +1014,7 @@ class pdf_standard_myobject extends ModelePDFMyObject } if (getDolGlobalInt('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -1024,7 +1024,7 @@ class pdf_standard_myobject extends ModelePDFMyObject } if (getDolGlobalInt('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 3; diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index f86e08adf6c..1c04d6287c2 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -231,7 +231,7 @@ if ($action == 'addtimespent' && $user->hasRight('projet', 'time')) { } if (!$error) { - $object->fetch_projet(); + $object->fetchProject(); if (empty($object->project->status)) { setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors'); diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php index eaa4e0720ad..475cb21f216 100644 --- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php +++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php @@ -805,7 +805,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio } if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -815,7 +815,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio } if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $posy += 3; $pdf->SetXY($posx, $posy); @@ -825,7 +825,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio } if (getDolGlobalString('PDF_SHOW_PROJECT')) { - $object->fetch_projet(); + $object->fetchProject(); if (!empty($object->project->ref)) { $outputlangs->load("projects"); $posy += 3; diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index b33e0eefe22..8c7f0946676 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -987,7 +987,7 @@ if ($action == 'create' || $action == 'presend') { $langs->load("projects"); $morehtmlref .= '
'; if ($permissiontoedit) { - $object->fetch_project(); + $object->fetchProject(); $morehtmlref .= img_picto($langs->trans("Project"), 'project'.((is_object($object->project) && $object->project->public) ? 'pub' : ''), 'class="pictofixedwidth"'); if ($action != 'classify') { $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' '; @@ -995,7 +995,7 @@ if ($action == 'create' || $action == 'presend') { $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300'); } else { if (!empty($object->fk_project)) { - $object->fetch_project(); + $object->fetchProject(); $morehtmlref .= $object->project->getNomUrl(1); if ($object->project->title) { $morehtmlref .= ' - '.dol_escape_htmltag($object->project->title).''; diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php index 00e0a4a126a..aafe16ca868 100644 --- a/htdocs/ticket/class/ticket.class.php +++ b/htdocs/ticket/class/ticket.class.php @@ -2687,7 +2687,7 @@ class Ticket extends CommonObject $object->socid = $object->fk_soc; $object->fetch_thirdparty(); - $object->fetch_project(); + $object->fetchProject(); if ($ret < 0) { $error++; diff --git a/test/phpunit/CommonObjectTest.php b/test/phpunit/CommonObjectTest.php index 524caa17e1c..e07119a8d93 100644 --- a/test/phpunit/CommonObjectTest.php +++ b/test/phpunit/CommonObjectTest.php @@ -1,6 +1,7 @@ * Copyright (C) 2023 Alexandre Janniaux + * Copyright (C) 2024 Frédéric France * * 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 @@ -87,7 +88,7 @@ class CommonObjectTest extends CommonClassTest $localobject = new Commande($db); $localobject->fetch(1); - $result = $localobject->fetch_projet(); + $result = $localobject->fetchProject(); print __METHOD__." result=".$result."\n"; $this->assertLessThanOrEqual($result, 0);