';
print '| '.$langs->trans("Country").' | ';
print '';
- if ($object->country_id > 0)
- {
+ if ($object->country_id > 0) {
$img = picto_from_langcode($object->country_code);
print $img ? $img.' ' : '';
print getCountry($object->getCountryCode(), 0, $db);
@@ -421,8 +412,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print dol_get_fiche_end();
/*
- * Barre d'actions
- */
+ * Barre d'actions
+ */
print '';
print ' '.$langs->trans('Modify').'';
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 3185f897958..f72b381a2d8 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -37,7 +37,9 @@ $backtopage = GETPOST('backtopage', 'alpha');
if (GETPOST('actioncode', 'array')) {
$actioncode = GETPOST('actioncode', 'array', 3);
- if (!count($actioncode)) $actioncode = '0';
+ if (!count($actioncode)) {
+ $actioncode = '0';
+ }
} else {
$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
}
@@ -47,12 +49,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+ $page = 0;
+} // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'a.datep,a.id';
-if (!$sortorder) $sortorder = 'DESC,DESC';
+if (!$sortfield) {
+ $sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+ $sortorder = 'DESC,DESC';
+}
// Initialize technical objects
$object = new Establishment($db);
@@ -64,7 +72,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+ $upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+}
// Security check - Protection if external user
//if ($user->socid > 0) accessforbidden();
@@ -80,20 +90,19 @@ $permissiontoadd = $user->rights->hrm->write; // Used by the include of actions_
$parameters = array('id'=>$id);
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
-if (empty($reshook))
-{
+if (empty($reshook)) {
// Cancel
- if (GETPOST('cancel', 'alpha') && !empty($backtopage))
- {
+ if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
header("Location: ".$backtopage);
exit;
}
// Purge search criteria
- if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
- {
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
$actioncode = '';
$search_agenda_label = '';
}
@@ -107,14 +116,15 @@ if (empty($reshook))
$form = new Form($db);
-if ($object->id > 0)
-{
+if ($object->id > 0) {
$title = $langs->trans("Agenda");
//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
$help_url = '';
llxHeader('', $title, $help_url);
- if (!empty($conf->notification->enabled)) $langs->load("mails");
+ if (!empty($conf->notification->enabled)) {
+ $langs->load("mails");
+ }
$head = establishment_prepare_head($object);
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index f0bbb442acc..94dd7f98cd1 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -33,8 +33,12 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-if ($conf->deplacement->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if ($conf->expensereport->enabled) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+if ($conf->deplacement->enabled) {
+ require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+}
+if ($conf->expensereport->enabled) {
+ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+}
require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
@@ -47,9 +51,13 @@ $langs->loadLangs(array('users', 'holidays', 'trips', 'boxes'));
$socid = GETPOST("socid", "int");
// Protection if external user
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+ accessforbidden();
+}
-if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) $setupcompanynotcomplete = 1;
+if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
+ $setupcompanynotcomplete = 1;
+}
$holiday = new Holiday($db);
$holidaystatic = new Holiday($db);
@@ -63,8 +71,7 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
*/
// Update sold
-if (!empty($conf->holiday->enabled) && !empty($setupcompanynotcomplete))
-{
+if (!empty($conf->holiday->enabled) && !empty($setupcompanynotcomplete)) {
$result = $holiday->updateBalance();
}
@@ -81,8 +88,7 @@ llxHeader('', $langs->trans('HRMArea'));
print load_fiche_titre($langs->trans("HRMArea"), '', 'hrm');
-if (!empty($setupcompanynotcomplete))
-{
+if (!empty($setupcompanynotcomplete)) {
$langs->load("errors");
$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
print ' ';
@@ -94,36 +100,34 @@ if (!empty($setupcompanynotcomplete))
print ' ';
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
-{
- if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
- {
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) { // This is useless due to the global search combo
+ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
$langs->load("holiday");
$listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
}
- if (!empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
- {
+ if (!empty($conf->deplacement->enabled) && $user->rights->deplacement->lire) {
$langs->load("trips");
$listofsearchfields['search_deplacement'] = array('text'=>'ExpenseReport');
}
- if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
- {
+ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire) {
$langs->load("trips");
$listofsearchfields['search_expensereport'] = array('text'=>'ExpenseReport');
}
- if (count($listofsearchfields))
- {
+ if (count($listofsearchfields)) {
print ' ';
// Latest leave requests
-if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
-{
+if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.photo, u.statut as user_status,";
$sql .= " x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE u.rowid = x.fk_user";
$sql .= " AND x.entity = ".$conf->entity;
- if (empty($user->rights->holiday->readall)) $sql .= ' AND x.fk_user IN ('.join(',', $childids).')';
+ if (empty($user->rights->holiday->readall)) {
+ $sql .= ' AND x.fk_user IN ('.join(',', $childids).')';
+ }
//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
//if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
$sql .= $db->order("x.tms", "DESC");
$sql .= $db->plimit($max, 0);
$result = $db->query($sql);
- if ($result)
- {
+ if ($result) {
$var = false;
$num = $db->num_rows($result);
@@ -208,10 +208,8 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
print ' '.$langs->trans("to").' | ';
print ' '.$langs->trans("FullList").' | ';
print ' |
';
- if ($num)
- {
- while ($i < $num && $i < $max)
- {
+ if ($num) {
+ while ($i < $num && $i < $max) {
$obj = $db->fetch_object($result);
$holidaystatic->id = $obj->rowid;
@@ -248,28 +246,30 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
print '';
print '';
print '| ';
$titleofmodule = $objimport->array_import_module[$key]['module']->getName();
// Special cas for import common to module/services
- if (in_array($objimport->array_import_code[$key], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) $titleofmodule = $langs->trans("ProductOrService");
+ if (in_array($objimport->array_import_code[$key], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) {
+ $titleofmodule = $langs->trans("ProductOrService");
+ }
print $titleofmodule;
print ' | ';
$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[$key]);
@@ -422,8 +416,7 @@ if ($step == 1 || !$datatoimport)
print img_object($objimport->array_import_module[$key]['module']->getName(), $entityicon).' ';
print $objimport->array_import_label[$key];
print ' | ';
- if ($objimport->array_import_perms[$key])
- {
+ if ($objimport->array_import_perms[$key]) {
print ''.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').'';
} else {
print $langs->trans("NotEnoughPermissions");
@@ -441,13 +434,20 @@ if ($step == 1 || !$datatoimport)
// STEP 2: Page to select input format file
-if ($step == 2 && $datatoimport)
-{
+if ($step == 2 && $datatoimport) {
$param = '&datatoimport='.urlencode($datatoimport);
- if ($excludefirstline) $param .= '&excludefirstline='.urlencode($excludefirstline);
- if ($endatlinenb) $param .= '&endatlinenb='.urlencode($endatlinenb);
- if ($separator) $param .= '&separator='.urlencode($separator);
- if ($enclosure) $param .= '&enclosure='.urlencode($enclosure);
+ if ($excludefirstline) {
+ $param .= '&excludefirstline='.urlencode($excludefirstline);
+ }
+ if ($endatlinenb) {
+ $param .= '&endatlinenb='.urlencode($endatlinenb);
+ }
+ if ($separator) {
+ $param .= '&separator='.urlencode($separator);
+ }
+ if ($enclosure) {
+ $param .= '&enclosure='.urlencode($enclosure);
+ }
llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones');
@@ -465,7 +465,9 @@ if ($step == 2 && $datatoimport)
print ' | ';
$titleofmodule = $objimport->array_import_module[0]['module']->getName();
// Special cas for import common to module/services
- if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) $titleofmodule = $langs->trans("ProductOrService");
+ if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) {
+ $titleofmodule = $langs->trans("ProductOrService");
+ }
print $titleofmodule;
print ' |
';
@@ -503,8 +505,7 @@ if ($step == 2 && $datatoimport)
print $langs->trans("FileMustHaveOneOfFollowingFormat");
print '';
$list = $objmodelimport->liste_modeles($db);
- foreach ($list as $key)
- {
+ foreach ($list as $key) {
print '