Inspection of "Daily Inspection: FIX Bad filter on menu Services..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (9d8368)

unknown

created 2023-10-19 16:00 UTC

Status

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 $search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -216,13 +216,13 @@  discard block
 block discarded – undo
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";

Please login to merge, or discard this patch.

htdocs/accountancy/customer/lines.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 $search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -215,13 +215,13 @@  discard block
 block discarded – undo
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE fd.fk_code_ventilation > 0";

Please login to merge, or discard this patch.

htdocs/hrm/skill_agenda.php 2 patches

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -29,11 +29,11 @@  discard block
 block discarded – undo
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
 
 
 // Load translation files required by the page
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 

Please login to merge, or discard this patch.

htdocs/hrm/evaluation_document.php 1 patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

htdocs/hrm/skill_document.php 2 patches

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -33,8 +33,8 @@  discard block
 block discarded – undo
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);

Please login to merge, or discard this patch.

htdocs/hrm/job_agenda.php 2 patches

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -29,11 +29,11 @@  discard block
 block discarded – undo
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'other'));
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 

Please login to merge, or discard this patch.

htdocs/hrm/job_document.php 2 patches

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -32,8 +32,8 @@  discard block
 block discarded – undo
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);

Please login to merge, or discard this patch.

htdocs/hrm/position_note.php 2 patches

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -28,9 +28,9 @@
 block discarded – undo
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'companies'));

Please login to merge, or discard this patch.

htdocs/hrm/skill_note.php 2 patches

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -29,8 +29,8 @@  discard block
 block discarded – undo
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'companies'));
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 

Please login to merge, or discard this patch.

		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	$search_date_endday = GETPOST('search_date_endday', 'int');
61	61	$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
62	62	$search_date_endyear = GETPOST('search_date_endyear', 'int');
63		-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
	63	+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
64	64	$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
65	65	$search_country = GETPOST('search_country', 'alpha');
66	66	$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
		@@ -216,13 +216,13 @@ discard block
		block discarded – undo
216	216	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
217	217	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
218	218	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
219		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
	219	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
220	220	}
221	221	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
222	222	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn";
223	223	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
224	224	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
225		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
	225	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
226	226	}
227	227	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
228	228	$sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";

		@@ -136,8 +136,12 @@
		block discarded – undo
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	/*

		@@ -136,8 +136,12 @@
		block discarded – undo
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	/*

		@@ -136,8 +136,12 @@
		block discarded – undo
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	/*

		@@ -136,8 +136,12 @@
		block discarded – undo
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	/*

		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	$search_date_endday = GETPOST('search_date_endday', 'int');
60	60	$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
61	61	$search_date_endyear = GETPOST('search_date_endyear', 'int');
62		-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
	62	+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
63	63	$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
64	64	$search_country = GETPOST('search_country', 'alpha');
65	65	$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
		@@ -215,13 +215,13 @@ discard block
		block discarded – undo
215	215	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
216	216	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
217	217	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
218		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
	218	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
219	219	}
220	220	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
221	221	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
222	222	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
223	223	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
224		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
	224	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
225	225	}
226	226	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
227	227	$sql .= " WHERE fd.fk_code_ventilation > 0";

		@@ -29,11 +29,11 @@ discard block
		block discarded – undo
29	29	// Load Dolibarr environment
30	30	require '../main.inc.php';
31	31
32		-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
33		-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
34		-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
35		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
36		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
	32	+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
	33	+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
	34	+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
	35	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
	36	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
37	37
38	38
39	39	// Load translation files required by the page
		@@ -152,7 +152,7 @@ discard block
		block discarded – undo
152	152	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
153	153
154	154	$morehtmlref = '<div class="refid">';
155		- $morehtmlref.= $object->label;
	155	+ $morehtmlref .= $object->label;
156	156	$morehtmlref .= '</div>';
157	157
158	158

		@@ -33,8 +33,8 @@ discard block
		block discarded – undo
33	33	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
34	34	require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
35	35	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
36		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
37		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
	36	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
	37	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
38	38
39	39	// Load translation files required by the page
40	40	$langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
		@@ -131,7 +131,7 @@ discard block
		block discarded – undo
131	131	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
132	132
133	133	$morehtmlref = '<div class="refid">';
134		- $morehtmlref.= $object->label;
	134	+ $morehtmlref .= $object->label;
135	135	$morehtmlref .= '</div>';
136	136
137	137	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);

		@@ -32,8 +32,8 @@ discard block
		block discarded – undo
32	32	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
33	33	require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
34	34	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.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';
	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	39	$langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
		@@ -131,7 +131,7 @@ discard block
		block discarded – undo
131	131	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
132	132
133	133	$morehtmlref = '<div class="refid">';
134		- $morehtmlref.= $object->label;
	134	+ $morehtmlref .= $object->label;
135	135	$morehtmlref .= '</div>';
136	136
137	137	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);

		@@ -28,9 +28,9 @@
		block discarded – undo
28	28
29	29	// Load Dolibarr environment
30	30	require '../main.inc.php';
31		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
32		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
33		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
	31	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
	32	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
	33	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
34	34
35	35	// Load translation files required by the page
36	36	$langs->loadLangs(array('hrm', 'companies'));

		@@ -29,8 +29,8 @@ discard block
		block discarded – undo
29	29	// Load Dolibarr environment
30	30	require '../main.inc.php';
31	31
32		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
33		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
	32	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
	33	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
34	34
35	35	// Load translation files required by the page
36	36	$langs->loadLangs(array('hrm', 'companies'));
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
105	105
106	106	$morehtmlref = '<div class="refid">';
107		- $morehtmlref.= $object->label;
	107	+ $morehtmlref .= $object->label;
108	108	$morehtmlref .= '</div>';
109	109
110	110

Dolibarr / dolibarr

Branch — develop (9d8368)

Status

Category

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch