@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | $sql .= ", s.fk_forme_juridique , s.fk_pays , s.phone , s.fax , f.datec , f.fk_soc , cp.label as country "; |
| 140 | 140 | $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; |
| 141 | 141 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
| 142 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
| 142 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
| 143 | 143 | } |
| 144 | 144 | $sql .= ", ".MAIN_DB_PREFIX."facture as f"; |
| 145 | 145 | $sql .= ", ".MAIN_DB_PREFIX."c_country as cp"; |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | $sql .= " s.fk_forme_juridique , s.fk_pays , s.phone , s.fax , ff.datec , ff.fk_soc , cp.label as country "; |
| 164 | 164 | $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; |
| 165 | 165 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
| 166 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
| 166 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
| 167 | 167 | } |
| 168 | 168 | $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as ff"; |
| 169 | 169 | $sql .= ", ".MAIN_DB_PREFIX."c_country as cp"; |
@@ -81,9 +81,9 @@ |
||
| 81 | 81 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
| 82 | 82 | require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; |
| 83 | 83 | require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; |
| 84 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php'; |
|
| 85 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php'; |
|
| 86 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
| 84 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php'; |
|
| 85 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php'; |
|
| 86 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
| 87 | 87 | |
| 88 | 88 | // Load translation files required by the page |
| 89 | 89 | $langs->loadLangs(array("hrm", "companies", "other", "mails")); |
@@ -136,8 +136,12 @@ |
||
| 136 | 136 | //if ($user->socid > 0) $socid = $user->socid; |
| 137 | 137 | //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
| 138 | 138 | //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft); |
| 139 | -if (empty($conf->hrm->enabled)) accessforbidden(); |
|
| 140 | -if (!$permissiontoread) accessforbidden(); |
|
| 139 | +if (empty($conf->hrm->enabled)) { |
|
| 140 | + accessforbidden(); |
|
| 141 | +} |
|
| 142 | +if (!$permissiontoread) { |
|
| 143 | + accessforbidden(); |
|
| 144 | +} |
|
| 141 | 145 | |
| 142 | 146 | |
| 143 | 147 | /* |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | |
| 110 | 110 | // Default sort order (if not yet defined by previous GETPOST) |
| 111 | 111 | if (!$sortfield) { |
| 112 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 112 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 113 | 113 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
| 114 | 114 | } |
| 115 | 115 | if (!$sortorder) { |
@@ -273,13 +273,13 @@ discard block |
||
| 273 | 273 | } |
| 274 | 274 | } else { |
| 275 | 275 | if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') { |
| 276 | - $columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key); |
|
| 276 | + $columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key); |
|
| 277 | 277 | if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) { |
| 278 | 278 | if (preg_match('/_dtstart$/', $key)) { |
| 279 | - $sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'"; |
|
| 279 | + $sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'"; |
|
| 280 | 280 | } |
| 281 | 281 | if (preg_match('/_dtend$/', $key)) { |
| 282 | - $sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'"; |
|
| 282 | + $sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'"; |
|
| 283 | 283 | } |
| 284 | 284 | } |
| 285 | 285 | } |
@@ -188,13 +188,19 @@ |
||
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | // Security check (enable the most restrictive one) |
| 191 | -if ($user->socid > 0) accessforbidden(); |
|
| 191 | +if ($user->socid > 0) { |
|
| 192 | + accessforbidden(); |
|
| 193 | +} |
|
| 192 | 194 | //if ($user->socid > 0) accessforbidden(); |
| 193 | 195 | //$socid = 0; if ($user->socid > 0) $socid = $user->socid; |
| 194 | 196 | //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
| 195 | 197 | //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft); |
| 196 | -if (empty($conf->hrm->enabled)) accessforbidden(); |
|
| 197 | -if (!$permissiontoread) accessforbidden(); |
|
| 198 | +if (empty($conf->hrm->enabled)) { |
|
| 199 | + accessforbidden(); |
|
| 200 | +} |
|
| 201 | +if (!$permissiontoread) { |
|
| 202 | + accessforbidden(); |
|
| 203 | +} |
|
| 198 | 204 | |
| 199 | 205 | |
| 200 | 206 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | |
| 110 | 110 | // Default sort order (if not yet defined by previous GETPOST) |
| 111 | 111 | if (!$sortfield) { |
| 112 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 112 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 113 | 113 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
| 114 | 114 | } |
| 115 | 115 | if (!$sortorder) { |
@@ -273,13 +273,13 @@ discard block |
||
| 273 | 273 | } |
| 274 | 274 | } else { |
| 275 | 275 | if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') { |
| 276 | - $columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key); |
|
| 276 | + $columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key); |
|
| 277 | 277 | if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) { |
| 278 | 278 | if (preg_match('/_dtstart$/', $key)) { |
| 279 | - $sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'"; |
|
| 279 | + $sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'"; |
|
| 280 | 280 | } |
| 281 | 281 | if (preg_match('/_dtend$/', $key)) { |
| 282 | - $sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'"; |
|
| 282 | + $sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'"; |
|
| 283 | 283 | } |
| 284 | 284 | } |
| 285 | 285 | } |
@@ -188,13 +188,19 @@ |
||
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | // Security check (enable the most restrictive one) |
| 191 | -if ($user->socid > 0) accessforbidden(); |
|
| 191 | +if ($user->socid > 0) { |
|
| 192 | + accessforbidden(); |
|
| 193 | +} |
|
| 192 | 194 | //if ($user->socid > 0) accessforbidden(); |
| 193 | 195 | //$socid = 0; if ($user->socid > 0) $socid = $user->socid; |
| 194 | 196 | //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
| 195 | 197 | //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft); |
| 196 | -if (empty($conf->hrm->enabled)) accessforbidden(); |
|
| 197 | -if (!$permissiontoread) accessforbidden(); |
|
| 198 | +if (empty($conf->hrm->enabled)) { |
|
| 199 | + accessforbidden(); |
|
| 200 | +} |
|
| 201 | +if (!$permissiontoread) { |
|
| 202 | + accessforbidden(); |
|
| 203 | +} |
|
| 198 | 204 | |
| 199 | 205 | |
| 200 | 206 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | // Put here all includes required by your class file |
| 29 | 29 | require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; |
| 30 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php'; |
|
| 30 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/skillrank.class.php'; |
|
| 31 | 31 | //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php'; |
| 32 | 32 | //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; |
| 33 | 33 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | /** |
| 104 | 104 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
| 105 | 105 | */ |
| 106 | - public $fields=array( |
|
| 106 | + public $fields = array( |
|
| 107 | 107 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"), |
| 108 | 108 | 'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,), |
| 109 | 109 | 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,), |
@@ -612,7 +612,9 @@ |
||
| 612 | 612 | $j = new Job($db); |
| 613 | 613 | $Tab = $j->getForUser($fk_user); |
| 614 | 614 | |
| 615 | - if (empty($Tab)) return ''; |
|
| 615 | + if (empty($Tab)) { |
|
| 616 | + return ''; |
|
| 617 | + } |
|
| 616 | 618 | |
| 617 | 619 | $job = array_shift($Tab); |
| 618 | 620 | |
@@ -102,13 +102,13 @@ |
||
| 102 | 102 | /** |
| 103 | 103 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
| 104 | 104 | */ |
| 105 | - public $fields=array( |
|
| 105 | + public $fields = array( |
|
| 106 | 106 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"), |
| 107 | 107 | 'label' => array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Label of object"), |
| 108 | 108 | 'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1,), |
| 109 | 109 | 'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>2,), |
| 110 | 110 | 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>2,), |
| 111 | - 'deplacement' => array('type'=>'select', 'required'=> 1,'label'=> 'NeedBusinessTravels', 'enabled'=> 1, 'position'=> 90, 'notnull'=> 1, 'visible'=> 1, 'arrayofkeyval'=> array(0 =>"No", 1=>"Yes"), 'default'=>0), |
|
| 111 | + 'deplacement' => array('type'=>'select', 'required'=> 1, 'label'=> 'NeedBusinessTravels', 'enabled'=> 1, 'position'=> 90, 'notnull'=> 1, 'visible'=> 1, 'arrayofkeyval'=> array(0 =>"No", 1=>"Yes"), 'default'=>0), |
|
| 112 | 112 | 'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>0,), |
| 113 | 113 | 'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>0,), |
| 114 | 114 | 'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',), |
@@ -240,7 +240,9 @@ discard block |
||
| 240 | 240 | $line->fk_rank = 0; |
| 241 | 241 | |
| 242 | 242 | $res = $line->create($user, $notrigger); |
| 243 | - if ($res > 0) $this->lines[] = $line; |
|
| 243 | + if ($res > 0) { |
|
| 244 | + $this->lines[] = $line; |
|
| 245 | + } |
|
| 244 | 246 | } |
| 245 | 247 | } |
| 246 | 248 | } |
@@ -637,8 +639,9 @@ discard block |
||
| 637 | 639 | |
| 638 | 640 | $Tab = $this->db->fetch_object($res); |
| 639 | 641 | |
| 640 | - if (empty($Tab)) return null; |
|
| 641 | - else { |
|
| 642 | + if (empty($Tab)) { |
|
| 643 | + return null; |
|
| 644 | + } else { |
|
| 642 | 645 | $evaluation = new Evaluation($this->db); |
| 643 | 646 | $evaluation->fetch($Tab->rowid); |
| 644 | 647 | |
@@ -26,8 +26,8 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | 28 | // Put here all includes required by your class file |
| 29 | -require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php'; |
|
| 30 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluationdet.class.php'; |
|
| 29 | +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; |
|
| 30 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/evaluationdet.class.php'; |
|
| 31 | 31 | //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php'; |
| 32 | 32 | //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; |
| 33 | 33 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | /** |
| 105 | 105 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
| 106 | 106 | */ |
| 107 | - public $fields=array( |
|
| 107 | + public $fields = array( |
|
| 108 | 108 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"), |
| 109 | 109 | 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"), |
| 110 | 110 | 'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2',), |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | if (empty($user->rights->hrm->evaluation->readall)) { |
| 197 | - $this->fields['fk_user']['type'].= ':rowid IN('.$this->db->sanitize(implode(", ", $user->getAllChildIds(1))).')'; |
|
| 197 | + $this->fields['fk_user']['type'] .= ':rowid IN('.$this->db->sanitize(implode(", ", $user->getAllChildIds(1))).')'; |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | $this->date_eval = dol_now(); |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $resultcreate = $this->createCommon($user, $notrigger); |
| 231 | 231 | |
| 232 | 232 | if ($resultcreate > 0) { |
| 233 | - require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php'; |
|
| 233 | + require_once DOL_DOCUMENT_ROOT.'/hrm/class/skillrank.class.php'; |
|
| 234 | 234 | $skillRank = new SkillRank($this->db); |
| 235 | 235 | $TRequiredRanks = $skillRank->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object='.$this->fk_job." AND objecttype='job'")); |
| 236 | 236 | |
@@ -632,12 +632,12 @@ discard block |
||
| 632 | 632 | public function getLastEvaluationForUser($fk_user) |
| 633 | 633 | { |
| 634 | 634 | $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."hrm_evaluation "; |
| 635 | - $sql.= "WHERE fk_user=".((int) $fk_user)." "; |
|
| 636 | - $sql.= "ORDER BY date_eval DESC "; |
|
| 637 | - $sql.= "LIMIT 1 "; |
|
| 635 | + $sql .= "WHERE fk_user=".((int) $fk_user)." "; |
|
| 636 | + $sql .= "ORDER BY date_eval DESC "; |
|
| 637 | + $sql .= "LIMIT 1 "; |
|
| 638 | 638 | |
| 639 | 639 | $res = $this->db->query($sql); |
| 640 | - if (!$res) { dol_print_error($this->db);} |
|
| 640 | + if (!$res) { dol_print_error($this->db); } |
|
| 641 | 641 | |
| 642 | 642 | $Tab = $this->db->fetch_object($res); |
| 643 | 643 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; |
| 83 | 83 | require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php'; |
| 84 | 84 | require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php'; |
| 85 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
| 85 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
| 86 | 86 | |
| 87 | 87 | |
| 88 | 88 | // Load translation files required by the page |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | // List of all actions |
| 271 | 271 | $filters = array(); |
| 272 | 272 | $filters['search_agenda_label'] = $search_agenda_label; |
| 273 | - $object->fields['label']=array(); // Usefull to get only get agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly) |
|
| 273 | + $object->fields['label'] = array(); // Usefull to get only get agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly) |
|
| 274 | 274 | |
| 275 | 275 | // TODO Replace this with same code than into list.php |
| 276 | 276 | show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module); |
@@ -136,8 +136,12 @@ |
||
| 136 | 136 | //if ($user->socid > 0) $socid = $user->socid; |
| 137 | 137 | //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
| 138 | 138 | //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft); |
| 139 | -if (empty($conf->hrm->enabled)) accessforbidden(); |
|
| 140 | -if (!$permissiontoread) accessforbidden(); |
|
| 139 | +if (empty($conf->hrm->enabled)) { |
|
| 140 | + accessforbidden(); |
|
| 141 | +} |
|
| 142 | +if (!$permissiontoread) { |
|
| 143 | + accessforbidden(); |
|
| 144 | +} |
|
| 141 | 145 | |
| 142 | 146 | |
| 143 | 147 | /* |
@@ -139,8 +139,12 @@ discard block |
||
| 139 | 139 | //if ($user->socid > 0) $socid = $user->socid; |
| 140 | 140 | //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
| 141 | 141 | //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft); |
| 142 | -if (empty($conf->hrm->enabled)) accessforbidden(); |
|
| 143 | -if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden(); |
|
| 142 | +if (empty($conf->hrm->enabled)) { |
|
| 143 | + accessforbidden(); |
|
| 144 | +} |
|
| 145 | +if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) { |
|
| 146 | + accessforbidden(); |
|
| 147 | +} |
|
| 144 | 148 | |
| 145 | 149 | |
| 146 | 150 | /* |
@@ -435,9 +439,12 @@ discard block |
||
| 435 | 439 | |
| 436 | 440 | $parameters = array(); |
| 437 | 441 | $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
| 438 | - if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
|
| 439 | - if (empty($reshook)) |
|
| 440 | - $object->formAddObjectLine(1, $mysoc, $soc); |
|
| 442 | + if ($reshook < 0) { |
|
| 443 | + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
|
| 444 | + } |
|
| 445 | + if (empty($reshook)) { |
|
| 446 | + $object->formAddObjectLine(1, $mysoc, $soc); |
|
| 447 | + } |
|
| 441 | 448 | } |
| 442 | 449 | } |
| 443 | 450 | |
@@ -29,14 +29,14 @@ discard block |
||
| 29 | 29 | // Load Dolibarr environment |
| 30 | 30 | require '../main.inc.php'; |
| 31 | 31 | |
| 32 | -require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php'; |
|
| 33 | -require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php'; |
|
| 34 | -require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php'; |
|
| 35 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
| 36 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php'; |
|
| 32 | +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; |
|
| 33 | +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; |
|
| 34 | +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; |
|
| 35 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
| 36 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php'; |
|
| 37 | 37 | |
| 38 | 38 | // Load translation files required by the page |
| 39 | -$langs->loadLangs(array('hrm', 'other', 'products')); // why products? |
|
| 39 | +$langs->loadLangs(array('hrm', 'other', 'products')); // why products? |
|
| 40 | 40 | |
| 41 | 41 | // Get parameters |
| 42 | 42 | $id = GETPOST('id', 'int'); |
@@ -47,12 +47,12 @@ discard block |
||
| 47 | 47 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'jobcard'; // To manage different context of search |
| 48 | 48 | $backtopage = GETPOST('backtopage', 'alpha'); |
| 49 | 49 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
| 50 | -$lineid = GETPOST('lineid', 'int'); |
|
| 50 | +$lineid = GETPOST('lineid', 'int'); |
|
| 51 | 51 | |
| 52 | 52 | // Initialize technical objects |
| 53 | 53 | $object = new Job($db); |
| 54 | 54 | $extrafields = new ExtraFields($db); |
| 55 | -$diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id; |
|
| 55 | +$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; |
|
| 56 | 56 | $hookmanager->initHooks(array('jobcard', 'globalcard')); // Note that conf->hooks_modules contains array |
| 57 | 57 | |
| 58 | 58 | // Fetch optionals attributes and labels |
@@ -64,8 +64,8 @@ discard block |
||
| 64 | 64 | $search_all = GETPOST("search_all", 'alpha'); |
| 65 | 65 | $search = array(); |
| 66 | 66 | foreach ($object->fields as $key => $val) { |
| 67 | - if (GETPOST('search_' . $key, 'alpha')) { |
|
| 68 | - $search[$key] = GETPOST('search_' . $key, 'alpha'); |
|
| 67 | + if (GETPOST('search_'.$key, 'alpha')) { |
|
| 68 | + $search[$key] = GETPOST('search_'.$key, 'alpha'); |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | |
@@ -74,13 +74,13 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | // Load object |
| 77 | -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. |
|
| 77 | +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. |
|
| 78 | 78 | |
| 79 | 79 | // Permissions |
| 80 | 80 | $permissiontoread = $user->rights->hrm->all->read; |
| 81 | 81 | $permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
| 82 | 82 | $permissiontodelete = $user->rights->hrm->all->delete; |
| 83 | -$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1] . '/job'; |
|
| 83 | +$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1].'/job'; |
|
| 84 | 84 | |
| 85 | 85 | // Security check (enable the most restrictive one) |
| 86 | 86 | //if ($user->socid > 0) accessforbidden(); |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) { |
| 112 | 112 | $backtopage = $backurlforlist; |
| 113 | 113 | } else { |
| 114 | - $backtopage = dol_buildpath('/hrm/job_card.php', 1) . '?id=' . ($id > 0 ? $id : '__ID__'); |
|
| 114 | + $backtopage = dol_buildpath('/hrm/job_card.php', 1).'?id='.($id > 0 ? $id : '__ID__'); |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -120,19 +120,19 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | |
| 122 | 122 | // Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen |
| 123 | - include DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php'; |
|
| 123 | + include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php'; |
|
| 124 | 124 | |
| 125 | 125 | // Actions when linking object each other |
| 126 | - include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; |
|
| 126 | + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; |
|
| 127 | 127 | |
| 128 | 128 | // Actions when printing a doc from card |
| 129 | - include DOL_DOCUMENT_ROOT . '/core/actions_printing.inc.php'; |
|
| 129 | + include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php'; |
|
| 130 | 130 | |
| 131 | 131 | // Action to move up and down lines of object |
| 132 | 132 | //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; |
| 133 | 133 | |
| 134 | 134 | // Action to build doc |
| 135 | - include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php'; |
|
| 135 | + include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; |
|
| 136 | 136 | |
| 137 | 137 | if ($action == 'set_thirdparty' && $permissiontoadd) { |
| 138 | 138 | $object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname); |
@@ -144,8 +144,8 @@ discard block |
||
| 144 | 144 | // Actions to send emails |
| 145 | 145 | $triggersendname = 'hrm_JOB_SENTBYMAIL'; |
| 146 | 146 | $autocopy = 'MAIN_MAIL_AUTOCOPY_JOB_TO'; |
| 147 | - $trackid = 'job' . $object->id; |
|
| 148 | - include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php'; |
|
| 147 | + $trackid = 'job'.$object->id; |
|
| 148 | + include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php'; |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | |
@@ -181,36 +181,36 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | // Part to create |
| 183 | 183 | if ($action == 'create') { |
| 184 | - print load_fiche_titre($langs->trans("NewObject", $langs->transnoentities('Job')), '', 'object_' . $object->picto); |
|
| 184 | + print load_fiche_titre($langs->trans("NewObject", $langs->transnoentities('Job')), '', 'object_'.$object->picto); |
|
| 185 | 185 | |
| 186 | - print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">'; |
|
| 187 | - print '<input type="hidden" name="token" value="' . newToken() . '">'; |
|
| 186 | + print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'; |
|
| 187 | + print '<input type="hidden" name="token" value="'.newToken().'">'; |
|
| 188 | 188 | print '<input type="hidden" name="action" value="add">'; |
| 189 | 189 | if ($backtopage) { |
| 190 | - print '<input type="hidden" name="backtopage" value="' . $backtopage . '">'; |
|
| 190 | + print '<input type="hidden" name="backtopage" value="'.$backtopage.'">'; |
|
| 191 | 191 | } |
| 192 | 192 | if ($backtopageforcancel) { |
| 193 | - print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">'; |
|
| 193 | + print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">'; |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | print dol_get_fiche_head(array(), ''); |
| 197 | 197 | |
| 198 | - print '<table class="border centpercent tableforfieldcreate">' . "\n"; |
|
| 198 | + print '<table class="border centpercent tableforfieldcreate">'."\n"; |
|
| 199 | 199 | |
| 200 | 200 | // Common attributes |
| 201 | - include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_add.tpl.php'; |
|
| 201 | + include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php'; |
|
| 202 | 202 | |
| 203 | 203 | // Other attributes |
| 204 | - include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php'; |
|
| 204 | + include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php'; |
|
| 205 | 205 | |
| 206 | - print '</table>' . "\n"; |
|
| 206 | + print '</table>'."\n"; |
|
| 207 | 207 | |
| 208 | 208 | print dol_get_fiche_end(); |
| 209 | 209 | |
| 210 | 210 | print '<div class="center">'; |
| 211 | - print '<input type="submit" class="button" name="add" value="' . dol_escape_htmltag($langs->trans("Create")) . '">'; |
|
| 211 | + print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">'; |
|
| 212 | 212 | print ' '; |
| 213 | - print '<input type="' . ($backtopage ? "submit" : "button") . '" class="button button-cancel" name="cancel" value="' . dol_escape_htmltag($langs->trans("Cancel")) . '"' . ($backtopage ? '' : ' onclick="javascript:history.go(-1)"') . '>'; // Cancel for create does not post form if we don't know the backtopage |
|
| 213 | + print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage |
|
| 214 | 214 | print '</div>'; |
| 215 | 215 | |
| 216 | 216 | print '</form>'; |
@@ -220,35 +220,35 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | // Part to edit record |
| 222 | 222 | if (($id || $ref) && $action == 'edit') { |
| 223 | - print load_fiche_titre($langs->trans("Job"), '', 'object_' . $object->picto); |
|
| 223 | + print load_fiche_titre($langs->trans("Job"), '', 'object_'.$object->picto); |
|
| 224 | 224 | |
| 225 | - print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">'; |
|
| 226 | - print '<input type="hidden" name="token" value="' . newToken() . '">'; |
|
| 225 | + print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'; |
|
| 226 | + print '<input type="hidden" name="token" value="'.newToken().'">'; |
|
| 227 | 227 | print '<input type="hidden" name="action" value="update">'; |
| 228 | - print '<input type="hidden" name="id" value="' . $object->id . '">'; |
|
| 228 | + print '<input type="hidden" name="id" value="'.$object->id.'">'; |
|
| 229 | 229 | if ($backtopage) { |
| 230 | - print '<input type="hidden" name="backtopage" value="' . $backtopage . '">'; |
|
| 230 | + print '<input type="hidden" name="backtopage" value="'.$backtopage.'">'; |
|
| 231 | 231 | } |
| 232 | 232 | if ($backtopageforcancel) { |
| 233 | - print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">'; |
|
| 233 | + print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">'; |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | print dol_get_fiche_head(); |
| 237 | 237 | |
| 238 | - print '<table class="border centpercent tableforfieldedit">' . "\n"; |
|
| 238 | + print '<table class="border centpercent tableforfieldedit">'."\n"; |
|
| 239 | 239 | |
| 240 | 240 | // Common attributes |
| 241 | - include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php'; |
|
| 241 | + include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php'; |
|
| 242 | 242 | |
| 243 | 243 | // Other attributes |
| 244 | - include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php'; |
|
| 244 | + include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php'; |
|
| 245 | 245 | |
| 246 | 246 | print '</table>'; |
| 247 | 247 | |
| 248 | 248 | print dol_get_fiche_end(); |
| 249 | 249 | |
| 250 | - print '<div class="center"><input type="submit" class="button button-save" name="save" value="' . $langs->trans("Save") . '">'; |
|
| 251 | - print ' <input type="submit" class="button button-cancel" name="cancel" value="' . $langs->trans("Cancel") . '">'; |
|
| 250 | + print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">'; |
|
| 251 | + print ' <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">'; |
|
| 252 | 252 | print '</div>'; |
| 253 | 253 | |
| 254 | 254 | print '</form>'; |
@@ -266,17 +266,17 @@ discard block |
||
| 266 | 266 | |
| 267 | 267 | // Confirmation to delete |
| 268 | 268 | if ($action == 'delete') { |
| 269 | - $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteJob'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1); |
|
| 269 | + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteJob'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1); |
|
| 270 | 270 | } |
| 271 | 271 | // Confirmation to delete line |
| 272 | 272 | if ($action == 'deleteline') { |
| 273 | - $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1); |
|
| 273 | + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1); |
|
| 274 | 274 | } |
| 275 | 275 | // Clone confirmation |
| 276 | 276 | if ($action == 'clone') { |
| 277 | 277 | // Create an array for form |
| 278 | 278 | $formquestion = array(); |
| 279 | - $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1); |
|
| 279 | + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1); |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | // Confirmation of action xxxx |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | // array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo)) |
| 293 | 293 | ); |
| 294 | 294 | */ |
| 295 | - $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220); |
|
| 295 | + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220); |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | // Call Hook formConfirm |
@@ -310,10 +310,10 @@ discard block |
||
| 310 | 310 | |
| 311 | 311 | // Object card |
| 312 | 312 | // ------------------------------------------------------------ |
| 313 | - $linkback = '<a href="' . dol_buildpath('/hrm/job_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>'; |
|
| 313 | + $linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
|
| 314 | 314 | |
| 315 | 315 | $morehtmlref = '<div class="refid">'; |
| 316 | - $morehtmlref.= $object->label; |
|
| 316 | + $morehtmlref .= $object->label; |
|
| 317 | 317 | $morehtmlref .= '</div>'; |
| 318 | 318 | |
| 319 | 319 | |
@@ -323,17 +323,17 @@ discard block |
||
| 323 | 323 | print '<div class="fichecenter">'; |
| 324 | 324 | print '<div class="fichehalfleft">'; |
| 325 | 325 | print '<div class="underbanner clearboth"></div>'; |
| 326 | - print '<table class="border centpercent tableforfield">' . "\n"; |
|
| 326 | + print '<table class="border centpercent tableforfield">'."\n"; |
|
| 327 | 327 | |
| 328 | 328 | // Common attributes |
| 329 | 329 | //$keyforbreak='fieldkeytoswitchonsecondcolumn'; // We change column just before this field |
| 330 | 330 | //unset($object->fields['fk_project']); // Hide field already shown in banner |
| 331 | 331 | //unset($object->fields['fk_soc']); // Hide field already shown in banner |
| 332 | - $object->fields['label']['visible']=0; // Already in banner |
|
| 333 | - include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php'; |
|
| 332 | + $object->fields['label']['visible'] = 0; // Already in banner |
|
| 333 | + include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php'; |
|
| 334 | 334 | |
| 335 | 335 | // Other attributes. Fields from hook formObjectOptions and Extrafields. |
| 336 | - include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; |
|
| 336 | + include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php'; |
|
| 337 | 337 | |
| 338 | 338 | print '</table>'; |
| 339 | 339 | print '</div>'; |
@@ -352,16 +352,16 @@ discard block |
||
| 352 | 352 | // Show object lines |
| 353 | 353 | $result = $object->getLinesArray(); |
| 354 | 354 | |
| 355 | - print ' <form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST"> |
|
| 356 | - <input type="hidden" name="token" value="' . newToken() . '"> |
|
| 357 | - <input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '"> |
|
| 355 | + print ' <form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST"> |
|
| 356 | + <input type="hidden" name="token" value="' . newToken().'"> |
|
| 357 | + <input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'"> |
|
| 358 | 358 | <input type="hidden" name="mode" value=""> |
| 359 | 359 | <input type="hidden" name="page_y" value=""> |
| 360 | - <input type="hidden" name="id" value="' . $object->id . '"> |
|
| 360 | + <input type="hidden" name="id" value="' . $object->id.'"> |
|
| 361 | 361 | '; |
| 362 | 362 | |
| 363 | 363 | if (!empty($conf->use_javascript_ajax) && $object->status == 0) { |
| 364 | - include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php'; |
|
| 364 | + include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; |
|
| 365 | 365 | } |
| 366 | 366 | |
| 367 | 367 | print '<div class="div-table-responsive-no-min">'; |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | // Buttons for actions |
| 399 | 399 | |
| 400 | 400 | if ($action != 'presend' && $action != 'editline') { |
| 401 | - print '<div class="tabsAction">' . "\n"; |
|
| 401 | + print '<div class="tabsAction">'."\n"; |
|
| 402 | 402 | $parameters = array(); |
| 403 | 403 | $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
| 404 | 404 | if ($reshook < 0) { |
@@ -408,15 +408,15 @@ discard block |
||
| 408 | 408 | if (empty($reshook)) { |
| 409 | 409 | // Back to draft |
| 410 | 410 | if ($object->status == $object::STATUS_VALIDATED) { |
| 411 | - print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=confirm_setdraft&confirm=yes&token=' . newToken(), '', $permissiontoadd); |
|
| 411 | + print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd); |
|
| 412 | 412 | } |
| 413 | 413 | |
| 414 | - print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd); |
|
| 414 | + print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd); |
|
| 415 | 415 | |
| 416 | 416 | // Delete (need delete permission, or if draft, just need create/modify permission) |
| 417 | - print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=delete&token=' . newToken(), '', $permissiontodelete); |
|
| 417 | + print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete); |
|
| 418 | 418 | } |
| 419 | - print '</div>' . "\n"; |
|
| 419 | + print '</div>'."\n"; |
|
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | |
@@ -434,12 +434,12 @@ discard block |
||
| 434 | 434 | // Documents |
| 435 | 435 | if ($includedocgeneration) { |
| 436 | 436 | $objref = dol_sanitizeFileName($object->ref); |
| 437 | - $relativepath = $objref . '/' . $objref . '.pdf'; |
|
| 438 | - $filedir = $conf->hrm->dir_output . '/' . $object->element . '/' . $objref; |
|
| 439 | - $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id; |
|
| 437 | + $relativepath = $objref.'/'.$objref.'.pdf'; |
|
| 438 | + $filedir = $conf->hrm->dir_output.'/'.$object->element.'/'.$objref; |
|
| 439 | + $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id; |
|
| 440 | 440 | $genallowed = $user->rights->hrm->job->read; // If you can read, you can build the PDF to read content |
| 441 | 441 | $delallowed = $user->rights->hrm->job->write; // If you can create/edit, you can remove a file on card |
| 442 | - print $formfile->showdocuments('hrm:Job', $object->element . '/' . $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang); |
|
| 442 | + print $formfile->showdocuments('hrm:Job', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang); |
|
| 443 | 443 | } |
| 444 | 444 | |
| 445 | 445 | // Show links to link elements |
@@ -454,9 +454,9 @@ discard block |
||
| 454 | 454 | $morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/hrm/job_agenda.php?id='.$object->id); |
| 455 | 455 | |
| 456 | 456 | // List of actions on element |
| 457 | - include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php'; |
|
| 457 | + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; |
|
| 458 | 458 | $formactions = new FormActions($db); |
| 459 | - $somethingshown = $formactions->showactions($object, $object->element . '@' . $object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter); |
|
| 459 | + $somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter); |
|
| 460 | 460 | |
| 461 | 461 | print '</div></div>'; |
| 462 | 462 | } |
@@ -465,9 +465,9 @@ discard block |
||
| 465 | 465 | $modelmail = 'job'; |
| 466 | 466 | $defaulttopic = 'InformationMessage'; |
| 467 | 467 | $diroutput = $conf->hrm->dir_output; |
| 468 | - $trackid = 'job' . $object->id; |
|
| 468 | + $trackid = 'job'.$object->id; |
|
| 469 | 469 | |
| 470 | - include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php'; |
|
| 470 | + include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php'; |
|
| 471 | 471 | } |
| 472 | 472 | |
| 473 | 473 | // End of page |