diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 9e1bcb34251..bf284a77997 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -8751,22 +8751,21 @@ class Form * @param int $option_only Return only html options lines without the select tag * @param string $show_empty Add an empty line ('1' or string to show for empty line) * @param int $discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable) - * @param int $forcefocus Force focus on field (works with javascript only) - * @param int $disabled Disabled + * @param int $forcefocus Force focus on field (works with javascript only) + * @param int $disabled Disabled * @param string $morecss More css added to the select component * @param string $projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids. * @param string $showproject 'all' = Show project info, ''=Hide project info * @param User $usertofilter User object to use for filtering * @return int Nbr of project if OK, <0 if KO */ - public function selectIntervention($socid = -1, $selected = '', $htmlname = 'interid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null) + public function selectIntervention($socid = -1, $selected = '', $htmlname = 'interid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null) { global $user, $conf, $langs; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; - if (is_null($usertofilter)) - { + if (is_null($usertofilter)) { $usertofilter = $user; } @@ -8775,17 +8774,15 @@ class Form $hideunselectables = false; if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true; - if (empty($projectsListId)) - { - if (empty($usertofilter->rights->projet->all->lire)) - { + if (empty($projectsListId)) { + if (empty($usertofilter->rights->projet->all->lire)) { $projectstatic = new Project($this->db); $projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter, 0, 1); } } // Search all projects - $sql = 'SELECT i.rowid, i.ref as ref, p.fk_soc, p.fk_statut, p.public,'; + $sql = 'SELECT i.rowid, i.ref as ref, p.fk_soc, p.fk_statut, p.public,'; $sql .= ' s.nom as name'; $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,'; @@ -8798,11 +8795,9 @@ class Form $sql .= " GROUP BY i.ref ORDER BY p.ref, i.ref ASC"; $resql = $this->db->query($sql); - if ($resql) - { + if ($resql) { // Use select2 selector - if (!empty($conf->use_javascript_ajax)) - { + if (!empty($conf->use_javascript_ajax)) { include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; $comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus); $out .= $comboenhancement; @@ -8820,63 +8815,45 @@ class Form } $num = $this->db->num_rows($resql); $i = 0; - if ($num) - { - while ($i < $num) - { + if ($num) { + while ($i < $num) { $obj = $this->db->fetch_object($resql); // If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project. - if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire)) - { + if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire)) { // Do nothing - } - else - { - if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED) - { + } else { + if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED) { $i++; continue; } $labeltoshow = ''; - if ($showproject == 'all') - { + if ($showproject == 'all') { $labeltoshow .= dol_trunc($obj->ref, 18); // Intervention ref if ($obj->name) $labeltoshow .= ' - '.$obj->name; // Soc name $disabled = 0; - if ($obj->fk_statut == Project::STATUS_DRAFT) - { + if ($obj->fk_statut == Project::STATUS_DRAFT) { $disabled = 1; $labeltoshow .= ' - '.$langs->trans("Draft"); - } - elseif ($obj->fk_statut == Project::STATUS_CLOSED) - { + } elseif ($obj->fk_statut == Project::STATUS_CLOSED) { if ($discard_closed == 2) $disabled = 1; $labeltoshow .= ' - '.$langs->trans("Closed"); - } - elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) - { + } elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) { $disabled = 1; $labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany"); } } - if (!empty($selected) && $selected == $obj->rowid) - { + if (!empty($selected) && $selected == $obj->rowid) { $out .= ''; - } - else - { - if ($hideunselectables && $disabled && ($selected != $obj->rowid)) - { + } else { + if ($hideunselectables && $disabled && ($selected != $obj->rowid)) { $resultat = ''; - } - else - { + } else { $resultat = 'public) $labeltoshow.=' ('.$langs->trans("Public").')'; @@ -8899,9 +8876,7 @@ class Form $this->db->free($resql); return $num; - } - else - { + } else { dol_print_error($this->db); return -1; } diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index b4b0f46f8ba..40ae02624bb 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -536,8 +536,7 @@ if ($action == 'confirm_generateinvoice') { } } -if ($action == 'confirm_generateinter') -{ +if ($action == 'confirm_generateinter') { $langs->load('interventions'); if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty(); @@ -556,7 +555,7 @@ if ($action == 'confirm_generateinter') $fuser = new User($db); $db->begin(); - $interToUse = GETPOST('interid', 'int'); + $interToUse = GETPOST('interid', 'int'); $tmpinter->socid = $projectstatic->thirdparty->id; @@ -564,23 +563,21 @@ if ($action == 'confirm_generateinter') $tmpinter->fk_project = $projectstatic->id; $tmpinter->description = $projectstatic->title . ( ! empty($projectstatic->description) ? '-' . $projectstatic->label : '' ); - if ($interToUse) { - $tmpinter->fetch($interToUse); - } - else { - $result = $tmpinter->create($user); - if ($result <= 0) - { - $error++; - setEventMessages($tmpinter->error, $tmpinter->errors, 'errors'); - } - } + if ($interToUse) { + $tmpinter->fetch($interToUse); + } + else { + $result = $tmpinter->create($user); + if ($result <= 0) + { + $error++; + setEventMessages($tmpinter->error, $tmpinter->errors, 'errors'); + } + } - if (!$error) - { + if (!$error) { $arrayoftasks = array(); - foreach ($toselect as $key => $value) - { + foreach ($toselect as $key => $value) { // Get userid, timepent $object->fetchTimeSpent($value); // $object->id is the task id @@ -590,8 +587,7 @@ if ($action == 'confirm_generateinter') $arrayoftasks[$object->timespent_id]['date'] = date('Y-m-d H:i:s', $object->timespent_datehour); } - foreach ($arrayoftasks as $timespent_id => $value) - { + foreach ($arrayoftasks as $timespent_id => $value) { $ftask = new Task($db); $ftask->fetch($object->id); // Define qty per hour @@ -603,8 +599,7 @@ if ($action == 'confirm_generateinter') } } - if (!$error) - { + if (!$error) { $urltointer = $tmpinter->getNomUrl(0); $mesg = $langs->trans("InterventionGeneratedFromTimeSpent", '{s1}'); $mesg = str_replace('{s1}', $urltointer, $mesg); @@ -613,9 +608,7 @@ if ($action == 'confirm_generateinter') //var_dump($tmpinvoice); $db->commit(); - } - else - { + } else { $db->rollback(); } } @@ -1117,7 +1110,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) { $massaction = ''; } } elseif ($massaction == 'generateinter') { - // Form to convert time spent into invoice + // Form to convert time spent into invoice print ''; if ($projectstatic->thirdparty->id > 0) { @@ -1127,7 +1120,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) { print $langs->trans('InterToUse'); print ''; print ''; - $form->selectIntervention($projectstatic->thirdparty->id, '', 'interid', 24, 0, $langs->trans('NewInter'), + $form->selectIntervention($projectstatic->thirdparty->id, '', 'interid', 24, 0, $langs->trans('NewInter'), 1, 0, 0, 'maxwidth500', '', 'all'); print ''; print '';