Dolibarr / dolibarr

htdocs/api/class/api_documents.class.php

Spacing +17 added lines, -17 removed lines

@@ -211,7 +211,7 @@ 
 				throw new RestException(500, 'Error generating document');
 			}
 		} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') {
-			require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 			$tmpobject = new FactureFournisseur($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
 			if (!$result) {
@@ -248,7 +248,7 @@ 
 				throw new RestException(500, 'Error generating document');
 			}
 		} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 			$tmpobject = new Contrat($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -264,7 +264,7 @@ 
 				throw new RestException(500, 'Error generating document missing doctemplate parameter');
 			}
 		} elseif ($modulepart == 'expedition' || $modulepart == 'shipment') {
-			require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
 			$tmpobject = new Expedition($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -280,7 +280,7 @@ 
 				throw new RestException(500, 'Error generating document missing doctemplate parameter');
 			}
 		} elseif ($modulepart == 'mrp') {
-			require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 
 			$tmpobject = new Mo($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -591,7 +591,7 @@ 
 			// $recursive = 0;
 		} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
 			$modulepart = 'contrat';
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 			$object = new Contrat($this->db);
 			$result = $object->fetch($id, $ref);
@@ -599,10 +599,10 @@ 
 				throw new RestException(404, 'Contract not found');
 			}
 
-			$upload_dir = $conf->contract->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'contract');
+			$upload_dir = $conf->contract->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'contract');
 		} elseif ($modulepart == 'intervention' || $modulepart == 'ficheinter') {
 			$modulepart = 'ficheinter';
-			require_once DOL_DOCUMENT_ROOT . '/fichinter/class/fichinter.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 
 			$object = new Fichinter($this->db);
 			$result = $object->fetch($id, $ref);
@@ -610,10 +610,10 @@ 
 				throw new RestException(404, 'Interventional not found');
 			}
 
-			$upload_dir = $conf->ficheinter->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'ficheinter');
+			$upload_dir = $conf->ficheinter->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'ficheinter');
 		} elseif ($modulepart == 'projet' || $modulepart == 'project') {
 			$modulepart = 'project';
-			require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 			$object = new Project($this->db);
 			$result = $object->fetch($id, $ref);
@@ -621,10 +621,10 @@ 
 				throw new RestException(404, 'Project not found');
 			}
 
-			$upload_dir = $conf->project->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'project');
+			$upload_dir = $conf->project->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'project');
 		} elseif ($modulepart == 'mrp') {
 			$modulepart = 'mrp';
-			require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 
 			$object = new Mo($this->db);
 			$result = $object->fetch($id, $ref);
@@ -632,13 +632,13 @@ 
 				throw new RestException(404, 'MO not found');
 			}
 
-			$upload_dir = $conf->mrp->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'mrp');
+			$upload_dir = $conf->mrp->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'mrp');
 		} else {
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
 
 		$objectType = $modulepart;
-		if (! empty($object->id) && ! empty($object->table_element)) {
+		if (!empty($object->id) && !empty($object->table_element)) {
 			$objectType = $object->table_element;
 		}
 
@@ -656,7 +656,7 @@ 
 					throw new RestException(503, 'Error when retrieve ecm list : '.$this->db->lasterror());
 				} elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
 					$count = count($filearray);
-					for ($i = 0 ; $i < $count ; $i++) {
+					for ($i = 0; $i < $count; $i++) {
 						foreach ($ecmfile->lines as $line) {
 							unset($line->db);
 							if ($filearray[$i]['name'] == $line->filename) {
@@ -833,7 +833,7 @@ 
 				$object = new Propal($this->db);
 			} elseif ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event') {
 				$modulepart = 'agenda';
-				require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 				$object = new ActionComm($this->db);
 			} elseif ($modulepart == 'contact' || $modulepart == 'socpeople') {
 				$modulepart = 'contact';
@@ -842,11 +842,11 @@ 
 				$fetchbyid = true;
 			} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
 				$modulepart = 'contrat';
-				require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 				$object = new Contrat($this->db);
 			} elseif ($modulepart == 'mrp') {
 				$modulepart = 'mrp';
-				require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 				$object = new Mo($this->db);
 			} elseif ($modulepart == 'ecm') {
 				throw new RestException(500, 'Using a non empty "ref" is not compatible with using modulepart = '.$modulepart);

htdocs/compta/sociales/list.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
 $search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_endmonth = GETPOSTINT('search_date_endmonth');
 $search_date_endyear = GETPOSTINT('search_date_endyear');
-$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_date_limit_startday = GETPOSTINT('search_date_limit_startday');
 $search_date_limit_startmonth = GETPOSTINT('search_date_limit_startmonth');
@@ -661,8 +661,8 @@ 
 	$chargesociale_static->type_label = $obj->type_label;
 	$chargesociale_static->amount = $obj->amount;
 	$chargesociale_static->paye = $obj->paye;
-	$chargesociale_static->date_ech = $db->idate($obj->date_ech);		// Date of contribution
-	$chargesociale_static->period = $db->idate($obj->period, 'gmt');	// End date of period
+	$chargesociale_static->date_ech = $db->idate($obj->date_ech); // Date of contribution
+	$chargesociale_static->period = $db->idate($obj->period, 'gmt'); // End date of period
 	$chargesociale_static->type_accountancy_code = $obj->type_accountancy_code;
 	$chargesociale_static->note_private = $obj->note_private;
 	$chargesociale_static->note_public = $obj->note_public;

htdocs/compta/sociales/class/chargesociales.class.php

Spacing +2 added lines, -2 removed lines

@@ -226,7 +226,7 @@ 
 				$this->label				= $obj->label;
 				$this->type					= $obj->fk_type;
 				$this->type_label			= $obj->type_label;
-				$this->type_code			= $obj->type_code;
+				$this->type_code = $obj->type_code;
 				$this->type_accountancy_code = $obj->type_accountancy_code;
 				$this->fk_account			= $obj->fk_account;
 				$this->mode_reglement_id = $obj->fk_mode_reglement;
@@ -722,7 +722,7 @@ 
 		}
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {

htdocs/compta/bank/bankentries_list.php

Spacing +18 added lines, -19 removed lines

@@ -86,7 +86,7 @@ 
 $search_type = GETPOST("search_type", 'alpha');
 $search_account = GETPOST("search_account", 'int') ? GETPOST("search_account", 'int') : GETPOST("account", 'int');
 $search_accountancy_code = GETPOST('search_accountancy_code', 'alpha') ? GETPOST('search_accountancy_code', 'alpha') : GETPOST('accountancy_code', 'alpha');
-$search_bid = GETPOST("search_bid", 'int') ? GETPOST("search_bid", 'int') : GETPOST("bid", 'int');		// Category id
+$search_bid = GETPOST("search_bid", 'int') ? GETPOST("search_bid", 'int') : GETPOST("bid", 'int'); // Category id
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_description = GETPOST("search_description", 'alpha');
 $search_dt_start = dol_mktime(0, 0, 0, GETPOSTINT('search_start_dtmonth'), GETPOSTINT('search_start_dtday'), GETPOSTINT('search_start_dtyear'));
@@ -149,19 +149,19 @@ 
 $hookmanager->initHooks(array('banktransactionlist', $contextpage));
 $extrafields = new ExtraFields($db);
 
-$extrafieldsobjectkey = 'bank';	// Used by extrafields_..._tpl.php
+$extrafieldsobjectkey = 'bank'; // Used by extrafields_..._tpl.php
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($extrafieldsobjectkey);
 $search_array_options = $extrafields->getOptionalsFromPost($extrafieldsobjectkey, '', 'search_');
 
 $arrayfields = array(
-	'b.rowid' => array('label' => $langs->trans("Ref"), 'checked' => '1','position' => 10),
-	'b.label' => array('label' => $langs->trans("Description"), 'checked' => '1','position' => 20),
-	'b.dateo' => array('label' => $langs->trans("DateOperationShort"), 'checked' => '-1','position' => 30),
-	'b.datev' => array('label' => $langs->trans("DateValueShort"), 'checked' => '1','position' => 40),
-	'type' => array('label' => $langs->trans("Type"), 'checked' => '1','position' => 50),
-	'b.num_chq' => array('label' => $langs->trans("Numero"), 'checked' => '0','position' => 60),
+	'b.rowid' => array('label' => $langs->trans("Ref"), 'checked' => '1', 'position' => 10),
+	'b.label' => array('label' => $langs->trans("Description"), 'checked' => '1', 'position' => 20),
+	'b.dateo' => array('label' => $langs->trans("DateOperationShort"), 'checked' => '-1', 'position' => 30),
+	'b.datev' => array('label' => $langs->trans("DateValueShort"), 'checked' => '1', 'position' => 40),
+	'type' => array('label' => $langs->trans("Type"), 'checked' => '1', 'position' => 50),
+	'b.num_chq' => array('label' => $langs->trans("Numero"), 'checked' => '0', 'position' => 60),
 	'b.fk_bordereau' => array('label' => $langs->trans("ChequeNumber"), 'checked' => '0', 'position' => 65),
 	'bu.label' => array('label' => $langs->trans("ThirdParty").'/'.$langs->trans("User"), 'checked' => '1', 'position' => 70),
 	'ba.ref' => array('label' => $langs->trans("BankAccount"), 'checked' => (($id > 0 || !empty($ref)) ? '0' : '1'), 'position' => 80),
@@ -639,20 +639,20 @@ 
 	$sql .= " AND b.rappro = ".((int) $search_conciliated);
 }
 if ($search_fk_bordereau > 0) {
-	$sql .= " AND b.fk_bordereau = " . ((int) $search_fk_bordereau);
+	$sql .= " AND b.fk_bordereau = ".((int) $search_fk_bordereau);
 }
 if ($search_thirdparty_user) {
 	$sql .= " AND (b.rowid IN ";
 	$sql .= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
 	$sql .= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
 	$sql .= "	 JOIN ".MAIN_DB_PREFIX."user AS subUser ON (bu.type = 'user' AND bu.url_id = subUser.rowid)";
-	$sql .= "	  WHERE ". natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, 0, 1).")";
+	$sql .= "	  WHERE ".natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, 0, 1).")";
 
 	$sql .= " OR b.rowid IN ";
 	$sql .= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
 	$sql .= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
 	$sql .= "	 JOIN ".MAIN_DB_PREFIX."societe AS subSoc ON (bu.type = 'company' AND bu.url_id = subSoc.rowid)";
-	$sql .= "	  WHERE ". natural_search(array("subSoc.nom"), $search_thirdparty_user, 0, 1);
+	$sql .= "	  WHERE ".natural_search(array("subSoc.nom"), $search_thirdparty_user, 0, 1);
 	$sql .= "))";
 }
 if ($search_description) {
@@ -991,7 +991,7 @@ 
 		if (!empty($last_receipts)) {
 			print '<datalist id="num_releve_list">';
 			foreach ($last_receipts as $num_releve) {
-				print '<option value="'.$num_releve.'"></option>';	// TODO We can add some info into option
+				print '<option value="'.$num_releve.'"></option>'; // TODO We can add some info into option
 			}
 			print '</datalist>';
 		}
@@ -1096,7 +1096,7 @@ 
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 	$selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 	$selectedfields .= (($action == 'reconcile' || $action == 'confirm_deleteonreconcile') ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -1468,10 +1468,10 @@ 
 			$backgroundcolor = "class='oddeven'";
 		} else {
 			if ($objp->amount < 0) {
-				$color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR1', 'fca955');
+				$color = '#'.getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR1', 'fca955');
 				$backgroundcolor = 'style="background: '.$color.';"';
 			} else {
-				$color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR2', '7fdb86');
+				$color = '#'.getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR2', '7fdb86');
 				$backgroundcolor = 'style="background: '.$color.';"';
 			}
 		}
@@ -1620,7 +1620,7 @@ 
 				}
 			}
 
-			print $labeltoshow;	// Already escaped
+			print $labeltoshow; // Already escaped
 
 			print '</td>';
 			if (!$i) {
@@ -1726,8 +1726,7 @@ 
 					$companylinked_id = $donstatic->socid;
 					if (!$companylinked_id) {
 						$thirdstr = ($donstatic->societe !== "" ?
-									$donstatic->societe :
-									$donstatic->firstname." ".$donstatic->lastname);
+									$donstatic->societe : $donstatic->firstname." ".$donstatic->lastname);
 					}
 				}
 				if ($links[$key]['type'] == 'payment_expensereport') {
@@ -1886,7 +1885,7 @@ 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
 		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $objp, 'i' => $i, 'totalarray' => &$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);    // Note that $action and $objecttmpect may have been modified by hook
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $objecttmpect may have been modified by hook
 		print $hookmanager->resPrint;
 
 		// Action edit/delete and select