From c745237ee92459bbbc2d3470e432e0b34dd4e7b4 Mon Sep 17 00:00:00 2001 From: Thomas Negre Date: Tue, 8 Feb 2022 15:23:56 +0100 Subject: [PATCH] Stickler corrections --- htdocs/admin/ticket.php | 8 ++++---- htdocs/contrat/class/contrat.class.php | 2 +- .../interface_20_modWorkflow_WorkflowManager.class.php | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php index aa5acd273d6..42a800c9f42 100644 --- a/htdocs/admin/ticket.php +++ b/htdocs/admin/ticket.php @@ -568,10 +568,10 @@ if ($conf->use_javascript_ajax) { print ''.$langs->trans("TicketChooseProductCategory").''; print ''; - $form->selectProductCategory($conf->global->TICKET_PRODUCT_CATEGORY, 'product_category_id'); - if ($conf->use_javascript_ajax) { - print ajax_combobox('select_'.$htmlname); - } +$form->selectProductCategory($conf->global->TICKET_PRODUCT_CATEGORY, 'product_category_id'); +if ($conf->use_javascript_ajax) { + print ajax_combobox('select_'.$htmlname); +} print ''; print ''; print $form->textwithpicto('', $langs->trans("TicketChooseProductCategoryHelp"), 1, 'help'); diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index e6c73164f26..aea577cccda 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -2136,7 +2136,7 @@ class Contrat extends CommonObject * @param array $line_status sort contracts where lines have these status * @return array|int Array of contracts id or <0 if error */ - public function getListOfContracts($option = 'all', $status = [], $product_categories = [], $line_status = [] ) + public function getListOfContracts($option = 'all', $status = [], $product_categories = [], $line_status = []) { $tab = array(); diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php index 1e98ec885bd..740abb4a1b9 100644 --- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php @@ -428,7 +428,6 @@ class InterfaceWorkflowManager extends DolibarrTriggers dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); // Auto link contract if (!empty($conf->contract->enabled) && !empty($conf->ticket->enabled) && !empty($conf->ficheinter->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_TICKET_LINK_CONTRACT) && !empty($conf->global->TICKET_PRODUCT_CATEGORY) && !empty($object->fk_soc)) { - $societe = new Societe($this->db); $company_ids = (empty($conf->global->WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS)) ? [$object->fk_soc] : $societe->getParentsForCompany($object->fk_soc, [$object->fk_soc]); @@ -445,7 +444,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers $object->setContract($contractid); break; } elseif ($number_contracts_found > 1) { - foreach($list as $linked_contract) { + foreach ($list as $linked_contract) { $object->setContract($linked_contract->id); // don't set '$contractid' so it is not used when creating an intervention. }