Dolibarr / dolibarr

htdocs/product/admin/inventory_extrafields.php

Braces +24 added lines, -8 removed lines

@@ -29,16 +29,28 @@ 
 // Load Dolibarr environment
 $res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
 // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
 $tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
 while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
 // Try main.inc.php using relative path
-if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
-if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
-if (!$res) die("Include of main fails");
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
@@ -52,13 +64,17 @@ 
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'inventory'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*

htdocs/asset/model/note.php

Braces +12 added lines, -4 removed lines

@@ -55,12 +55,20 @@
 $permissionnote = $permissiontoadd; // Used by the include of actions_setnotes.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->asset->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

htdocs/asset/class/asset.class.php

Braces +38 added lines, -13 removed lines

@@ -225,14 +225,20 @@ 
 	 */
 	public function create(User $user, $notrigger = false)
 	{
-		if (!isset($this->date_start) || $this->date_start === "") $this->date_start = $this->date_acquisition;
+		if (!isset($this->date_start) || $this->date_start === "") {
+			$this->date_start = $this->date_acquisition;
+		}
 
 		$this->db->begin();
 
 		$result = $result_create = $this->createCommon($user, $notrigger);
-		if ($result > 0 && $this->fk_asset_model > 0) $result = $this->setDataFromAssetModel($user, $notrigger);
+		if ($result > 0 && $this->fk_asset_model > 0) {
+			$result = $this->setDataFromAssetModel($user, $notrigger);
+		}
 		if ($result > 0) {
-			if ($this->supplier_invoice_id > 0) $this->add_object_linked('invoice_supplier', $this->supplier_invoice_id);
+			if ($this->supplier_invoice_id > 0) {
+				$this->add_object_linked('invoice_supplier', $this->supplier_invoice_id);
+			}
 		}
 
 		if ($result < 0) {
@@ -355,7 +361,9 @@ 
 	{
 		$result = $this->fetchCommon($id, $ref);
 		if ($result > 0) {
-			if (!empty($this->table_element_line)) $this->fetchLines();
+			if (!empty($this->table_element_line)) {
+				$this->fetchLines();
+			}
 
 			$res = $this->hasDepreciationLinesInBookkeeping();
 			if ($res < 0) {
@@ -474,7 +482,9 @@ 
 	 */
 	public function update(User $user, $notrigger = false)
 	{
-		if (!isset($this->date_start) || $this->date_start === "") $this->date_start = $this->date_acquisition;
+		if (!isset($this->date_start) || $this->date_start === "") {
+			$this->date_start = $this->date_acquisition;
+		}
 
 		$this->db->begin();
 
@@ -669,7 +679,9 @@ 
 		}
 
 		while ($obj = $this->db->fetch_object($resql)) {
-			if (!isset($this->depreciation_lines[$obj->depreciation_mode])) $this->depreciation_lines[$obj->depreciation_mode] = array();
+			if (!isset($this->depreciation_lines[$obj->depreciation_mode])) {
+				$this->depreciation_lines[$obj->depreciation_mode] = array();
+			}
 			$this->depreciation_lines[$obj->depreciation_mode][] = array(
 				'id' => $obj->rowid,
 				'ref' => $obj->ref,
@@ -907,7 +919,9 @@ 
 				$sql .= " WHERE " . MAIN_DB_PREFIX . "asset_depreciation.fk_asset = " . (int) $this->id;
 				$sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.depreciation_mode = '" . $this->db->escape($mode_key) . "'";
 				$sql .= " AND ab.fk_docdet IS NULL";
-				if ($last_depreciation_date !== "") $sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.ref != ''";
+				if ($last_depreciation_date !== "") {
+					$sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.ref != ''";
+				}
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
@@ -985,7 +999,9 @@ 
 				do {
 					// Loop security
 					$idx_loop++;
-					if ($idx_loop > $max_loop) break;
+					if ($idx_loop > $max_loop) {
+						break;
+					}
 
 					if ($last_depreciation_date < $fiscal_period_end && ($first_period_date <= $start_date || $first_period_found)) {
 						// Disposal not depreciated
@@ -1152,10 +1168,14 @@ 
 			$this->fields[$field]['notnull'] = 0;
 		}
 		if ($result > 0) {
-			if ($disposal_invoice_id > 0) $this->add_object_linked('facture', $disposal_invoice_id);
+			if ($disposal_invoice_id > 0) {
+				$this->add_object_linked('facture', $disposal_invoice_id);
+			}
 			$result = $this->setStatusCommon($user, self::STATUS_DISPOSED, $notrigger, 'ASSET_DISPOSED');
 		}
-		if ($result > 0) $result = $this->calculationDepreciation();
+		if ($result > 0) {
+			$result = $this->calculationDepreciation();
+		}
 
 		if ($result < 0) {
 			$this->db->rollback();
@@ -1218,7 +1238,9 @@ 
 			$this->deleteObjectLinked(null, 'facture');
 			$result = $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'ASSET_REOPEN');
 		}
-		if ($result > 0) $result = $this->calculationDepreciation();
+		if ($result > 0) {
+			$result = $this->calculationDepreciation();
+		}
 
 		if ($result < 0) {
 			$this->db->rollback();
@@ -1352,8 +1374,11 @@ 
 
 		if ($withpicto != 2) {
 			$name = $this->ref;
-			if ($option == 'label') $name = $this->label;
-			elseif ($option == 'with_label') $name .= ' - ' . $this->label;
+			if ($option == 'label') {
+				$name = $this->label;
+			} elseif ($option == 'with_label') {
+				$name .= ' - ' . $this->label;
+			}
 			$result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
 		}
 

htdocs/asset/class/assetaccountancycodes.class.php

Braces +6 added lines, -2 removed lines

@@ -90,7 +90,9 @@ 
 			$this->accountancy_codes[$mode_key] = array();
 			foreach ($mode_info['fields'] as $field_key => $field_info) {
 				$accountancy_code = GETPOST($mode_key . '_' . $field_key, 'aZ09');
-				if (empty($accountancy_code) || $accountancy_code == '-1') $accountancy_code = '';
+				if (empty($accountancy_code) || $accountancy_code == '-1') {
+					$accountancy_code = '';
+				}
 				$this->accountancy_codes[$mode_key][$field_key] = $accountancy_code;
 			}
 		}
@@ -251,7 +253,9 @@ 
 			require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
 			$asset = new Asset($this->db);
 			$result = $asset->fetch($asset_id);
-			if ($result > 0) $result = $asset->calculationDepreciation();
+			if ($result > 0) {
+				$result = $asset->calculationDepreciation();
+			}
 			if ($result < 0) {
 				$this->errors[] = $langs->trans('AssetErrorCalculationDepreciationLines');
 				$this->errors[] = $asset->errorsToString();

htdocs/asset/class/assetdepreciationoptions.class.php

Braces +6 added lines, -2 removed lines

@@ -352,7 +352,9 @@ 
 				$error++;
 			} elseif ($result > 0) {
 				foreach ($this->fields as $field_key => $field_info) {
-					if (in_array($field_key, array('rowid', 'fk_asset', 'fk_asset_model', 'tms', 'fk_user_modif'))) continue;
+					if (in_array($field_key, array('rowid', 'fk_asset', 'fk_asset_model', 'tms', 'fk_user_modif'))) {
+						continue;
+					}
 					$deprecation_options[$mode_key][$field_key] = $this->{$field_key};
 				}
 			}
@@ -504,7 +506,9 @@ 
 			require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
 			$asset = new Asset($this->db);
 			$result = $asset->fetch($this->fk_asset);
-			if ($result > 0) $result = $asset->calculationDepreciation();
+			if ($result > 0) {
+				$result = $asset->calculationDepreciation();
+			}
 			if ($result < 0) {
 				$this->errors[] = $langs->trans('AssetErrorCalculationDepreciationLines');
 				$this->errors[] = $asset->errorsToString();

htdocs/core/tpl/objectline_view.tpl.php

Braces +9 added lines, -3 removed lines

@@ -397,9 +397,15 @@
 		) {
 			$accountancy_category_asset = $conf->global->ASSET_ACCOUNTANCY_CATEGORY;
 			$filters = array();
-			if (!empty($product_static->accountancy_code_buy)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'";
-			if (!empty($product_static->accountancy_code_buy_intra)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'";
-			if (!empty($product_static->accountancy_code_buy_export)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'";
+			if (!empty($product_static->accountancy_code_buy)) {
+				$filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'";
+			}
+			if (!empty($product_static->accountancy_code_buy_intra)) {
+				$filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'";
+			}
+			if (!empty($product_static->accountancy_code_buy_export)) {
+				$filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'";
+			}
 			$sql = "SELECT COUNT(*) AS found";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account";
 			$sql .= " WHERE pcg_type = '" . $this->db->escape($conf->global->ASSET_ACCOUNTANCY_CATEGORY) . "'";

htdocs/reception/list.php

Braces +6 added lines, -3 removed lines

@@ -349,8 +349,9 @@ 
 
 							$rang = $i;
 							//there may already be rows from previous receptions
-							if (!empty($createbills_onebythird))
-								$rang = $TFactThirdNbLines[$rcp->socid];
+							if (!empty($createbills_onebythird)) {
+															$rang = $TFactThirdNbLines[$rcp->socid];
+							}
 
 							$result = $objecttmp->addline(
 								$desc,
@@ -380,8 +381,10 @@ 
 
 							if ($result > 0) {
 								$lineid = $result;
-								if (!empty($createbills_onebythird)) //increment rang to keep order
+								if (!empty($createbills_onebythird)) {
+									//increment rang to keep order
 									$TFactThirdNbLines[$rcp->socid]++;
+								}
 							} else {
 								$lineid = 0;
 								$error++;

htdocs/fourn/class/fournisseur.facture-rec.class.php

Braces +3 added lines, -1 removed lines

@@ -479,7 +479,9 @@
 		$sql .= " titre = '" . (!empty($this->titre) ? $this->db->escape($this->titre) : "")."'," ;
 		$sql .= " ref_supplier = '". (!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "")."',";
 		$sql .= " entity = ". (!empty($this->entity) ? ((int) $this->entity) : 1) . ',';
-		if ($this->fk_soc > 0) $sql .= " fk_soc = ". (int) $this->fk_soc. ',';
+		if ($this->fk_soc > 0) {
+			$sql .= " fk_soc = ". (int) $this->fk_soc. ',';
+		}
 		$sql .= " suspended = ". (!empty($this->suspended) ? ((int) $this->suspended) : 0) . ',';
 		$sql .= " libelle = ". (!empty($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : 'NULL') . ",";
 		$sql .= " vat_src_code = ". (!empty($this->vat_src_code) ? "'".$this->db->escape($this->vat_src_code)."'" : 'NULL') . ',';

htdocs/fourn/class/fournisseur.facture.class.php

Braces +10 added lines, -4 removed lines

@@ -1204,8 +1204,11 @@ 
 			$this->fk_facture_source = trim($this->fk_facture_source);
 		}
 		if (isset($this->fk_project)) {
-			if (empty($this->fk_project)) $this->fk_project = null;
-			else $this->fk_project = intval($this->fk_project);
+			if (empty($this->fk_project)) {
+				$this->fk_project = null;
+			} else {
+				$this->fk_project = intval($this->fk_project);
+			}
 		}
 		if (isset($this->cond_reglement_id)) {
 			$this->cond_reglement_id = trim($this->cond_reglement_id);
@@ -3654,8 +3657,11 @@ 
 		$sql .= ", pu_ttc = ".price2num($this->pu_ttc);
 		$sql .= ", qty = ".price2num($this->qty);
 		$sql .= ", remise_percent = ".price2num($this->remise_percent);
-		if ($this->fk_remise_except > 0) $sql .= ", fk_remise_except=".((int) $this->fk_remise_except);
-		else $sql .= ", fk_remise_except=null";
+		if ($this->fk_remise_except > 0) {
+			$sql .= ", fk_remise_except=".((int) $this->fk_remise_except);
+		} else {
+			$sql .= ", fk_remise_except=null";
+		}
 		$sql .= ", vat_src_code = '".$this->db->escape(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
 		$sql .= ", tva_tx = ".price2num($this->tva_tx);
 		$sql .= ", localtax1_tx = ".price2num($this->localtax1_tx);