Dolibarr / dolibarr

htdocs/accountancy/class/lettering.class.php

Spacing +48 added lines, -48 removed lines

@@ -291,12 +291,12 @@ 
 		$lettre = 'AAA';
 
 		$sql = "SELECT DISTINCT ab2.lettering_code";
-		$sql .=	" FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab";
-		$sql .=	" LEFT JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab2 ON ab2.subledger_account = ab.subledger_account";
-		$sql .=	" WHERE ab.rowid IN (" . $this->db->sanitize(implode(',', $ids)) . ")";
-		$sql .=	" AND ab2.lettering_code != ''";
-		$sql .=	" ORDER BY ab2.lettering_code DESC";
-		$sql .=	" LIMIT 1 ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS ab";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_bookkeeping AS ab2 ON ab2.subledger_account = ab.subledger_account";
+		$sql .= " WHERE ab.rowid IN (".$this->db->sanitize(implode(',', $ids)).")";
+		$sql .= " AND ab2.lettering_code != ''";
+		$sql .= " ORDER BY ab2.lettering_code DESC";
+		$sql .= " LIMIT 1 ";
 
 		$resqla = $this->db->query($sql);
 		if ($resqla) {
@@ -400,7 +400,7 @@ 
 	 */
 	public function bookkeepingLetteringAll($bookkeeping_ids, $unlettering = false)
 	{
-		dol_syslog(__METHOD__ . " - ", LOG_DEBUG);
+		dol_syslog(__METHOD__." - ", LOG_DEBUG);
 
 		$error = 0;
 		$errors = array();
@@ -517,25 +517,25 @@ 
 
 		// Get all bookkeeping lines
 		$sql = "SELECT DISTINCT ab.doc_type, ab.fk_doc";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab";
-		$sql .= " WHERE ab.entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS ab";
+		$sql .= " WHERE ab.entity IN (".getEntity('accountancy').")";
 		$sql .= " AND ab.fk_doc > 0";
 		if (!empty($bookkeeping_ids)) {
 			// Get all bookkeeping lines of piece number
 			$sql .= " AND EXISTS (";
 			$sql .= "  SELECT rowid";
-			$sql .= "  FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS pn";
-			$sql .= "  WHERE pn.entity IN (" . getEntity('accountancy') . ")";
-			$sql .= "  AND pn.rowid IN (" . $this->db->sanitize(implode(',', $bookkeeping_ids)) . ")";
+			$sql .= "  FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS pn";
+			$sql .= "  WHERE pn.entity IN (".getEntity('accountancy').")";
+			$sql .= "  AND pn.rowid IN (".$this->db->sanitize(implode(',', $bookkeeping_ids)).")";
 			$sql .= "  AND pn.piece_num = ab.piece_num";
 			$sql .= " )";
 		}
 		if ($only_has_subledger_account) $sql .= " AND ab.subledger_account != ''";
 
-		dol_syslog(__METHOD__ . " - Get all bookkeeping lines", LOG_DEBUG);
+		dol_syslog(__METHOD__." - Get all bookkeeping lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
@@ -582,34 +582,34 @@ 
 
 				// Get all bookkeeping lines linked
 				$sql = "SELECT DISTINCT ab.rowid, ab.piece_num, ab.debit, ab.credit, ab.lettering_code";
-				$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab";
-				$sql .= " WHERE ab.entity IN (" . getEntity('accountancy') . ")";
+				$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS ab";
+				$sql .= " WHERE ab.entity IN (".getEntity('accountancy').")";
 				$sql .= " AND (";
 				if (!empty($bank_ids)) {
 					$sql .= " EXISTS (";
 					$sql .= "  SELECT bpn.rowid";
-					$sql .= "  FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS bpn";
-					$sql .= "  WHERE bpn.entity IN (" . getEntity('accountancy') . ")";
+					$sql .= "  FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS bpn";
+					$sql .= "  WHERE bpn.entity IN (".getEntity('accountancy').")";
 					$sql .= "  AND bpn.doc_type = 'bank'";
-					$sql .= "  AND bpn.fk_doc IN (" . $this->db->sanitize(implode(',', $bank_ids)) . ")";
+					$sql .= "  AND bpn.fk_doc IN (".$this->db->sanitize(implode(',', $bank_ids)).")";
 					$sql .= "  AND bpn.piece_num = ab.piece_num";
 					$sql .= " ) OR ";
 				}
 				$sql .= " EXISTS (";
 				$sql .= "  SELECT dpn.rowid";
-				$sql .= "  FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS dpn";
-				$sql .= "  WHERE dpn.entity IN (" . getEntity('accountancy') . ")";
-				$sql .= "  AND dpn.doc_type = '" . $this->db->escape($doc_type) . "'";
-				$sql .= "  AND dpn.fk_doc IN (" . $this->db->sanitize(implode(',', $doc_ids)) . ")";
+				$sql .= "  FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS dpn";
+				$sql .= "  WHERE dpn.entity IN (".getEntity('accountancy').")";
+				$sql .= "  AND dpn.doc_type = '".$this->db->escape($doc_type)."'";
+				$sql .= "  AND dpn.fk_doc IN (".$this->db->sanitize(implode(',', $doc_ids)).")";
 				$sql .= "  AND dpn.piece_num = ab.piece_num";
 				$sql .= " )";
 				$sql .= ")";
 				if ($only_has_subledger_account) $sql .= " AND ab.subledger_account != ''";
 
-				dol_syslog(__METHOD__ . " - Get all bookkeeping lines linked", LOG_DEBUG);
+				dol_syslog(__METHOD__." - Get all bookkeeping lines linked", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = "Error " . $this->db->lasterror();
+					$this->errors[] = "Error ".$this->db->lasterror();
 					return -1;
 				}
 
@@ -640,7 +640,7 @@ 
 	 */
 	public function getDocTypeAndFkDocFromBankLines($bank_ids)
 	{
-		dol_syslog(__METHOD__ . " - bank_ids=".json_encode($bank_ids), LOG_DEBUG);
+		dol_syslog(__METHOD__." - bank_ids=".json_encode($bank_ids), LOG_DEBUG);
 
 		// Clean parameters
 		$bank_ids = is_array($bank_ids) ? $bank_ids : array();
@@ -652,16 +652,16 @@ 
 		$bookkeeping_lines_by_type = array();
 		foreach (self::$doc_type_infos as $doc_type => $doc_type_info) {
 			// Get all fk_doc by doc_type from bank ids
-			$sql = "SELECT DISTINCT dp." . $doc_type_info['doc_payment_table_fk_doc'] . " AS fk_doc";
-			$sql .= " FROM " . MAIN_DB_PREFIX . $doc_type_info['payment_table'] . " AS p";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $doc_type_info['doc_payment_table'] . " AS dp ON dp." . $doc_type_info['doc_payment_table_fk_payment'] . " = p.rowid";
-			$sql .= " WHERE p." . $doc_type_info['payment_table_fk_bank'] . " IN (" . $this->db->sanitize(implode(',', $bank_ids)) . ")";
-			$sql .= " AND dp." . $doc_type_info['doc_payment_table_fk_doc'] . " > 0";
+			$sql = "SELECT DISTINCT dp.".$doc_type_info['doc_payment_table_fk_doc']." AS fk_doc";
+			$sql .= " FROM ".MAIN_DB_PREFIX.$doc_type_info['payment_table']." AS p";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$doc_type_info['doc_payment_table']." AS dp ON dp.".$doc_type_info['doc_payment_table_fk_payment']." = p.rowid";
+			$sql .= " WHERE p.".$doc_type_info['payment_table_fk_bank']." IN (".$this->db->sanitize(implode(',', $bank_ids)).")";
+			$sql .= " AND dp.".$doc_type_info['doc_payment_table_fk_doc']." > 0";
 
-			dol_syslog(__METHOD__ . " - Get all fk_doc by doc_type from list of bank ids for '" . $doc_type . "'", LOG_DEBUG);
+			dol_syslog(__METHOD__." - Get all fk_doc by doc_type from list of bank ids for '".$doc_type."'", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				return -1;
 			}
 
@@ -685,7 +685,7 @@ 
 	{
 		global $langs;
 
-		dol_syslog(__METHOD__ . " - bank_ids=".json_encode($document_ids) . ", doc_type=$doc_type", LOG_DEBUG);
+		dol_syslog(__METHOD__." - bank_ids=".json_encode($document_ids).", doc_type=$doc_type", LOG_DEBUG);
 
 		// Clean parameters
 		$document_ids = is_array($document_ids) ? $document_ids : array();
@@ -704,16 +704,16 @@ 
 		$bank_ids = array();
 
 		// Get all fk_doc by doc_type from bank ids
-		$sql = "SELECT DISTINCT p." . $doc_type_info['payment_table_fk_bank'] . " AS fk_doc";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $doc_type_info['payment_table'] . " AS p";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $doc_type_info['doc_payment_table'] . " AS dp ON dp." . $doc_type_info['doc_payment_table_fk_payment'] . " = p.rowid";
-		$sql .= " WHERE dp." . $doc_type_info['doc_payment_table_fk_doc'] . " IN (" . $this->db->sanitize(implode(',', $document_ids)) . ")";
-		$sql .= " AND p." . $doc_type_info['payment_table_fk_bank'] . " > 0";
+		$sql = "SELECT DISTINCT p.".$doc_type_info['payment_table_fk_bank']." AS fk_doc";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$doc_type_info['payment_table']." AS p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$doc_type_info['doc_payment_table']." AS dp ON dp.".$doc_type_info['doc_payment_table_fk_payment']." = p.rowid";
+		$sql .= " WHERE dp.".$doc_type_info['doc_payment_table_fk_doc']." IN (".$this->db->sanitize(implode(',', $document_ids)).")";
+		$sql .= " AND p.".$doc_type_info['payment_table_fk_bank']." > 0";
 
-		dol_syslog(__METHOD__ . " - Get all bank ids from list of document ids of a type '" . $doc_type . "'", LOG_DEBUG);
+		dol_syslog(__METHOD__." - Get all bank ids from list of document ids of a type '".$doc_type."'", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
@@ -756,15 +756,15 @@ 
 		$link_by_element = array();
 		$element_by_link = array();
 		foreach ($doc_type_info['linked_info'] as $linked_info) {
-			$sql = "SELECT DISTINCT tl2." . $linked_info['fk_link'] . " AS fk_link, tl2." . $linked_info['fk_doc'] . " AS fk_doc";
-			$sql .= " FROM " . MAIN_DB_PREFIX . $linked_info['table'] . " AS tl";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $linked_info['table'] . " AS tl2 ON tl2." . $linked_info['fk_link'] . " = tl." . $linked_info['fk_link'];
-			$sql .= " WHERE tl." . $linked_info['fk_doc'] . " IN (" . $this->db->sanitize(implode(',', $document_ids)) . ")";
+			$sql = "SELECT DISTINCT tl2.".$linked_info['fk_link']." AS fk_link, tl2.".$linked_info['fk_doc']." AS fk_doc";
+			$sql .= " FROM ".MAIN_DB_PREFIX.$linked_info['table']." AS tl";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$linked_info['table']." AS tl2 ON tl2.".$linked_info['fk_link']." = tl.".$linked_info['fk_link'];
+			$sql .= " WHERE tl.".$linked_info['fk_doc']." IN (".$this->db->sanitize(implode(',', $document_ids)).")";
 
-			dol_syslog(__METHOD__ . " - Get document lines", LOG_DEBUG);
+			dol_syslog(__METHOD__." - Get document lines", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				return -1;
 			}
 
@@ -772,7 +772,7 @@ 
 			while ($obj = $this->db->fetch_object($resql)) {
 				$current_document_ids[$obj->fk_doc] = $obj->fk_doc;
 
-				$link_key = $linked_info['prefix'] . $obj->fk_link;
+				$link_key = $linked_info['prefix'].$obj->fk_link;
 				$element_by_link[$link_key][$obj->fk_doc] = $obj->fk_doc;
 				$link_by_element[$obj->fk_doc][$link_key] = $link_key;
 				if ($is_fk_link_is_also_fk_doc) {

Braces +26 added lines, -9 removed lines

@@ -468,9 +468,15 @@ 
 						$group_error++;
 						break;
 					}
-					if (!isset($lettering_code)) $lettering_code = (string) $line_infos['lettering_code'];
-					if (!empty($line_infos['lettering_code'])) $do_it = true;
-				} elseif (!empty($line_infos['lettering_code'])) $do_it = false;
+					if (!isset($lettering_code)) {
+						$lettering_code = (string) $line_infos['lettering_code'];
+					}
+					if (!empty($line_infos['lettering_code'])) {
+						$do_it = true;
+					}
+				} elseif (!empty($line_infos['lettering_code'])) {
+					$do_it = false;
+				}
 			}
 
 			// Check balance amount
@@ -481,8 +487,11 @@ 
 
 			// Lettering/Unlettering the group of bookkeeping lines
 			if (!$group_error && $do_it) {
-				if ($unlettering) $result = $this->deleteLettering($bookkeeping_lines);
-				else $result = $this->updateLettering($bookkeeping_lines);
+				if ($unlettering) {
+					$result = $this->deleteLettering($bookkeeping_lines);
+				} else {
+					$result = $this->updateLettering($bookkeeping_lines);
+				}
 				if ($result < 0) {
 					$group_error++;
 				} elseif ($result > 0) {
@@ -533,7 +542,9 @@ 
 			$sql .= "  AND pn.piece_num = ab.piece_num";
 			$sql .= " )";
 		}
-		if ($only_has_subledger_account) $sql .= " AND ab.subledger_account != ''";
+		if ($only_has_subledger_account) {
+			$sql .= " AND ab.subledger_account != ''";
+		}
 
 		dol_syslog(__METHOD__ . " - Get all bookkeeping lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -607,7 +618,9 @@ 
 				$sql .= "  AND dpn.piece_num = ab.piece_num";
 				$sql .= " )";
 				$sql .= ")";
-				if ($only_has_subledger_account) $sql .= " AND ab.subledger_account != ''";
+				if ($only_has_subledger_account) {
+					$sql .= " AND ab.subledger_account != ''";
+				}
 
 				dol_syslog(__METHOD__ . " - Get all bookkeeping lines linked", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -628,7 +641,9 @@ 
 				}
 				$this->db->free($resql);
 
-				if (!empty($group)) $grouped_lines[] = $group;
+				if (!empty($group)) {
+					$grouped_lines[] = $group;
+				}
 			}
 		}
 
@@ -830,7 +845,9 @@ 
 
 			foreach ($element_ids as $element_id) {
 				// Continue if element id in not found
-				if (!isset($link_by_element[$element_id])) continue;
+				if (!isset($link_by_element[$element_id])) {
+					continue;
+				}
 
 				// Set the element in the current group
 				$current_group[$element_id] = $element_id;

htdocs/fichinter/stats/index.php

Spacing +1 added lines, -1 removed lines

@@ -288,7 +288,7 @@
 	print '<tr class="oddeven" height="24">';
 	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']): "0").'%</td>';
+	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']) : "0").'%</td>';
 	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
 	print '<td class="right opacitylow" style="'.((!isset($val['total_diff']) || $val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['total_diff']) ? round($val['total_diff']) : "0").'%</td>';
 	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';

htdocs/fichinter/card-rec.php

Spacing +1 added lines, -1 removed lines

@@ -357,7 +357,7 @@
 		if (isModEnabled('contrat')) {
 			$formcontract = new FormContract($db);
 			print "<tr><td>".$langs->trans("Contract")."</td><td>";
-			$contractid = GETPOST('contractid') ? GETPOST('contractid') : (!empty($object->fk_contract) ? $object->fk_contract : 0) ;
+			$contractid = GETPOST('contractid') ? GETPOST('contractid') : (!empty($object->fk_contract) ? $object->fk_contract : 0);
 			$numcontract = $formcontract->select_contract($object->thirdparty->id, $contractid, 'contracttid');
 			print "</td></tr>";
 		}

htdocs/fourn/facture/card.php

Braces +6 added lines, -3 removed lines

@@ -3640,9 +3640,12 @@
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-				if (empty($reshook))
-					$object->formAddObjectLine(1, $societe, $mysoc);
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
+									$object->formAddObjectLine(1, $societe, $mysoc);
+				}
 			}
 		}
 

Spacing +44 added lines, -44 removed lines

@@ -720,7 +720,7 @@ 
 			$error++;
 		}
 
-		$dateinvoice = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'), 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
+		$dateinvoice = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'), 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server
 		$datedue = dol_mktime(0, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'), 'tzserver');
 		//var_dump($dateinvoice.' '.dol_print_date($dateinvoice, 'dayhour'));
 		//var_dump(dol_now('tzuserrel').' '.dol_get_last_hour(dol_now('tzuserrel')).' '.dol_print_date(dol_now('tzuserrel'),'dayhour').' '.dol_print_date(dol_get_last_hour(dol_now('tzuserrel')), 'dayhour'));
@@ -758,7 +758,7 @@ 
 				$object->ref = GETPOST('ref', 'alphanohtml');
 				$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
 				$object->socid = GETPOST('socid', 'int');
-				$object->libelle = GETPOST('label', 'alphanohtml');	// deprecated
+				$object->libelle = GETPOST('label', 'alphanohtml'); // deprecated
 				$object->label = GETPOST('label', 'alphanohtml');
 				$object->date = $dateinvoice;
 				$object->date_echeance = $datedue;
@@ -976,27 +976,27 @@ 
 				$tmpproject = GETPOST('projectid', 'int');
 
 				// Creation invoice
+				$object->socid = GETPOST('socid', 'int');
+				$object->type = GETPOST('type', 'alphanohtml');
+				$object->ref = GETPOST('ref', 'alphanohtml');
+				$object->ref_supplier = GETPOST('ref_supplier', 'alphanohtml');
 				$object->socid				= GETPOST('socid', 'int');
-				$object->type				= GETPOST('type', 'alphanohtml');
-				$object->ref				= GETPOST('ref', 'alphanohtml');
-				$object->ref_supplier		= GETPOST('ref_supplier', 'alphanohtml');
-				$object->socid				= GETPOST('socid', 'int');
-				$object->libelle			= GETPOST('label', 'alphanohtml');	// deprecated
+				$object->libelle = GETPOST('label', 'alphanohtml'); // deprecated
 				$object->label				= GETPOST('label', 'alphanohtml');
-				$object->date				= $dateinvoice;
-				$object->date_echeance		= $datedue;
-				$object->note_public		= GETPOST('note_public', 'restricthtml');
-				$object->note_private		= GETPOST('note_private', 'restricthtml');
+				$object->date = $dateinvoice;
+				$object->date_echeance = $datedue;
+				$object->note_public = GETPOST('note_public', 'restricthtml');
+				$object->note_private = GETPOST('note_private', 'restricthtml');
 				$object->cond_reglement_id	= GETPOST('cond_reglement_id');
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
 				$object->fk_account			= GETPOST('fk_account', 'int');
 				$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->fk_project			= ($tmpproject > 0) ? $tmpproject : null;
-				$object->fk_incoterms		= GETPOST('incoterm_id', 'int');
+				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx	= GETPOST('originmulticurrency_tx', 'int');
-				$object->transport_mode_id	= GETPOST('transport_mode_id');
+				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				$object->transport_mode_id = GETPOST('transport_mode_id');
 
 				// Auto calculation of date due if not filled by user
 				if (empty($object->date_echeance)) {
@@ -1335,7 +1335,7 @@ 
 		// Edit line
 		$db->begin();
 
-		if (! $object->fetch($id) > 0) {
+		if (!$object->fetch($id) > 0) {
 			dol_print_error($db);
 		}
 		$object->fetch_thirdparty();
@@ -1479,7 +1479,7 @@ 
 			$idprod = GETPOST('idprod', 'int');
 		}
 
-		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);		// Can be '1.2' or '1.2 (CODE)'
+		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)'
 
 		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
@@ -2246,7 +2246,7 @@ 
 
 		$sql = 'SELECT r.rowid, r.titre as title, r.total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_rec as r';
-		$sql .= ' WHERE r.fk_soc = '. (int) $invoice_predefined->socid;
+		$sql .= ' WHERE r.fk_soc = '.(int) $invoice_predefined->socid;
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -2304,7 +2304,7 @@ 
 
 	// Standard invoice
 	print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-	$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOST('type', 'int')? '' : 'checked').'> ';
+	$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOST('type', 'int') ? '' : 'checked').'> ';
 	$desc = $form->textwithpicto($tmp.'<label for="radio_standard">'.$langs->trans("InvoiceStandardAsk").'</label>', $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3);
 	print $desc;
 	print '</div></div>';
@@ -2313,7 +2313,7 @@ 
 		// Deposit - Down payment
 		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-			$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOST('type') == 3 ? ' checked' : '') . '> ';
+			$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"'.(GETPOST('type') == 3 ? ' checked' : '').'> ';
 			print '<script type="text/javascript">
 			jQuery(document).ready(function() {
     			jQuery("#typestandardinvoice, #valuestandardinvoice").click(function() {
@@ -2359,7 +2359,7 @@ 
 				print $form->selectarray('typedeposit', $arraylist, GETPOST('typedeposit', 'aZ09'), 0, 0, 0, '', 1);
 				print '</td>';
 				print '<td class="nowrap" style="padding-left: 5px">';
-				print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="' . GETPOST('valuedeposit', 'int') . '"/>';
+				print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="'.GETPOST('valuedeposit', 'int').'"/>';
 				print '</td>';
 			}
 			print '</tr></table>';
@@ -2514,7 +2514,7 @@ 
 			if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
 				$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 			} else {
-				$tmp='<input type="radio" name="type" id="radio_creditnote" value="2"> ';
+				$tmp = '<input type="radio" name="type" id="radio_creditnote" value="2"> ';
 			}
 			$text = $tmp.$langs->trans("InvoiceAvoir").' ';
 			$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromSupplierThird").')</span> ';
@@ -2597,7 +2597,7 @@ 
 
 	// Vat reverse-charge by default
 	if (!empty($conf->global->ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE)) {
-		print '<tr><td>' . $langs->trans('VATReverseCharge') . '</td><td>';
+		print '<tr><td>'.$langs->trans('VATReverseCharge').'</td><td>';
 		// Try to propose to use VAT reverse charge even if the VAT reverse charge is not activated in the supplier card, if this corresponds to the context of use, the activation is proposed
 		if ($vat_reverse_charge == 1 || $societe->vat_reverse_charge == 1 || ($societe->country_code != 'FR' && isInEEC($societe) && !empty($societe->tva_intra))) {
 			$vat_reverse_charge = 1;
@@ -2605,7 +2605,7 @@ 
 			$vat_reverse_charge = 0;
 		}
 
-		print '<input type="checkbox" name="vat_reverse_charge"'. (!empty($vat_reverse_charge) ? ' checked ' : '') . '>';
+		print '<input type="checkbox" name="vat_reverse_charge"'.(!empty($vat_reverse_charge) ? ' checked ' : '').'>';
 		print '</td></tr>';
 	}
 
@@ -3113,7 +3113,7 @@ 
 				$facavoir->fetch($id);
 				$invoicecredits[] = $facavoir->getNomUrl(1);
 			}
-			print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
+			print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir").(count($invoicecredits) ? ' ' : '').implode(',', $invoicecredits);
 			print '</span>';
 		}
 		if (isset($objectidnext) && $objectidnext > 0) {
@@ -3309,12 +3309,12 @@ 
 				print '<input type="hidden" name="action" value="setvatreversecharge">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 
-				print '<input type="checkbox" name="vat_reverse_charge"' . ($object->vat_reverse_charge == '1' ? ' checked ' : '') . '>';
+				print '<input type="checkbox" name="vat_reverse_charge"'.($object->vat_reverse_charge == '1' ? ' checked ' : '').'>';
 
 				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				print '</form>';
 			} else {
-				print '<input type="checkbox" name="vat_reverse_charge"'. ($object->vat_reverse_charge == '1' ? ' checked ' : '') . ' disabled>';
+				print '<input type="checkbox" name="vat_reverse_charge"'.($object->vat_reverse_charge == '1' ? ' checked ' : '').' disabled>';
 			}
 			print '</td></tr>';
 		}
@@ -3375,15 +3375,15 @@ 
 		print '<table class="border tableforfield centpercent">';
 
 		print '<tr>';
-		print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
+		print '<td class="nowrap amountcard right">'.price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
 		print '<tr>';
-		print '<td>' . $langs->trans('AmountVAT') . '</td>';
+		print '<td>'.$langs->trans('AmountVAT').'</td>';
 		print '<td class="nowrap amountcard right">';
 		if (GETPOST('calculationrule')) {
 			$calculationrule = GETPOST('calculationrule', 'alpha');
@@ -3397,40 +3397,40 @@ 
 		}
 		// Show link for "recalculate"
 		if ($object->getVentilExportCompta() == 0) {
-			$s = '<span class="hideonsmartphone opacitymedium">' . $langs->trans("ReCalculate") . ' </span>';
-			$s .= '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=calculate&calculationrule=totalofround">' . $langs->trans("Mode1") . '</a>';
+			$s = '<span class="hideonsmartphone opacitymedium">'.$langs->trans("ReCalculate").' </span>';
+			$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=totalofround">'.$langs->trans("Mode1").'</a>';
 			$s .= ' / ';
-			$s .= '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=calculate&calculationrule=roundoftotal">' . $langs->trans("Mode2") . '</a>';
+			$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=roundoftotal">'.$langs->trans("Mode2").'</a>';
 			print '<div class="inline-block">';
-			print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc", $calculationrulenum) . '<br>' . $langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('', 'help'), '', 3, '', 0, 'recalculate');
+			print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc", $calculationrulenum).'<br>'.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('', 'help'), '', 3, '', 0, 'recalculate');
 			print '&nbsp; &nbsp; &nbsp; &nbsp;';
 			print '</div>';
 		}
 		print price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency);
 		print '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
 		if ($societe->localtax1_assuj == "1") { //Localtax1
 			print '<tr>';
-			print '<td>' . $langs->transcountry("AmountLT1", $societe->country_code) . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 			print '</tr>';
 		}
 		if ($societe->localtax2_assuj == "1") { //Localtax2
 			print '<tr>';
-			print '<td>' . $langs->transcountry("AmountLT2", $societe->country_code) . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 			print '</tr>';
 		}
 
 		print '<tr>';
-		print '<td>' . $langs->trans('AmountTTC') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td>'.$langs->trans('AmountTTC').'</td>';
+		print '<td class="nowrap amountcard right">'.price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
@@ -3736,7 +3736,7 @@ 
 				print '<tr><td colspan="'.$nbcols.'" class="right">';
 				print '<span class="opacitymedium">';
 				print $langs->trans('RemainderToPayBackMulticurrency');
-				if ($resteapayeraffiche> 0) {
+				if ($resteapayeraffiche > 0) {
 					print ' ('.$langs->trans('NegativeIfExcessRefunded').')';
 				}
 				print '</span>';
@@ -3965,7 +3965,7 @@ 
 				}
 
 				// Clone as predefined / Create template
-				if (($object->type ==  FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut == 0 && $usercancreate) {
+				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut == 0 && $usercancreate) {
 					if (!$objectidnext && count($object->lines) > 0) {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card-rec.php?facid='.$object->id.'&amp;action=create">'.$langs->trans("ChangeIntoRepeatableInvoice").'</a>';
 					}

htdocs/fourn/paiement/document.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 
 	// Amount
-	$morehtmlref .= '<br>'.$langs->trans('Amount').' : '. price($object->amount, '', $langs, 0, 0, -1, $conf->currency);
+	$morehtmlref .= '<br>'.$langs->trans('Amount').' : '.price($object->amount, '', $langs, 0, 0, -1, $conf->currency);
 
 	$allow_delete = 1;
 	// Bank account

htdocs/fourn/commande/card.php

Braces +9 added lines, -5 removed lines

@@ -687,8 +687,9 @@ 
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
 					$newlang = $object->thirdparty->default_lang;
-					if (GETPOST('lang_id', 'aZ09'))
-						$newlang = GETPOST('lang_id', 'aZ09');
+					if (GETPOST('lang_id', 'aZ09')) {
+											$newlang = GETPOST('lang_id', 'aZ09');
+					}
 				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
@@ -2427,9 +2428,12 @@ 
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-			if (empty($reshook))
-				$object->formAddObjectLine(1, $societe, $mysoc);
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			}
+			if (empty($reshook)) {
+							$object->formAddObjectLine(1, $societe, $mysoc);
+			}
 		}
 	}
 	print '</table>';

Spacing +28 added lines, -28 removed lines

@@ -137,7 +137,7 @@ 
 $result = restrictedArea($user, 'fournisseur', $object, 'commande_fournisseur', 'commande', 'fk_soc', 'rowid', $isdraft);
 
 // Common permissions
-$usercanread	= ($user->hasRight("fournisseur", "commande", "lire") || $user->hasRight("supplier_order", "lire"));
+$usercanread = ($user->hasRight("fournisseur", "commande", "lire") || $user->hasRight("supplier_order", "lire"));
 $usercancreate	= ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
 $usercandelete	= (($user->hasRight("fournisseur", "commande", "supprimer") || $user->hasRight("supplier_order", "supprimer")) || ($usercancreate && isset($object->statut) && $object->statut == $object::STATUS_DRAFT));
 
@@ -145,9 +145,9 @@ 
 $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_order_advance", "validate")));
 
 // Additional area permissions
-$usercanapprove			= $user->hasRight("fournisseur", "commande", "approuver");
-$usercanapprovesecond	= $user->hasRight("fournisseur", "commande", "approve2");
-$usercanorder			= $user->hasRight("fournisseur", "commande", "commander");
+$usercanapprove = $user->hasRight("fournisseur", "commande", "approuver");
+$usercanapprovesecond = $user->hasRight("fournisseur", "commande", "approve2");
+$usercanorder = $user->hasRight("fournisseur", "commande", "commander");
 if (empty($conf->reception->enabled)) {
 	$usercanreceive = $user->hasRight("fournisseur", "commande", "receptionner");
 } else {
@@ -156,8 +156,8 @@ 
 
 // Permissions for includes
 $permissionnote		= $usercancreate; // Used by the include of actions_setnotes.inc.php
-$permissiondellink	= $usercancreate; // Used by the include of actions_dellink.inc.php
-$permissiontoedit	= $usercancreate; // Used by the include of actions_lineupdown.inc.php
+$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
 $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
 
 // Project permission
@@ -180,7 +180,7 @@ 
 }
 
 if (empty($reshook)) {
-	$backurlforlist = DOL_URL_ROOT.'/fourn/commande/list.php'.($socid > 0 ? '?socid='.((int) $socid)  : '');
+	$backurlforlist = DOL_URL_ROOT.'/fourn/commande/list.php'.($socid > 0 ? '?socid='.((int) $socid) : '');
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
@@ -435,7 +435,7 @@ 
 			$idprod = GETPOST('idprod', 'int');
 		}
 
-		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);		// Can be '1.2' or '1.2 (CODE)'
+		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)'
 
 		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
@@ -553,7 +553,7 @@ 
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
 				if (trim($product_desc) == trim($desc) && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
-					$product_desc='';
+					$product_desc = '';
 				}
 
 				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
@@ -1743,7 +1743,7 @@ 
 	// Payment term
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	print img_picto('', 'payment', 'class="pictofixedwidth"');
-	print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') &&  GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);
+	print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);
 	print '</td></tr>';
 
 	// Payment mode
@@ -1991,7 +1991,7 @@ 
 				'morecss' => 'minwidth300'
 			)
 		);
-		$formconfirm  = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1);
 	}
 
 	// Confirmation of cancellation
@@ -2320,40 +2320,40 @@ 
 
 	print '<tr>';
 	// Amount HT
-	print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-	print '<td class="nowrap amountcard right">' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+	print '<td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
+	print '<td class="nowrap amountcard right">'.price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency).'</td>';
 	if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount HT
-		print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+		print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 	}
 	print '</tr>';
 
 	print '<tr>';
 	// Amount VAT
-	print '<td class="titlefieldmiddle">' . $langs->trans('AmountVAT') . '</td>';
-	print '<td class="nowrap amountcard right">' . price($object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+	print '<td class="titlefieldmiddle">'.$langs->trans('AmountVAT').'</td>';
+	print '<td class="nowrap amountcard right">'.price($object->total_tva, '', $langs, 0, -1, -1, $conf->currency).'</td>';
 	if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount VAT
-		print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+		print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 	}
 	print '</tr>';
 
 	// Amount Local Taxes
 	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
 		print '<tr>';
-		print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="titlefieldmiddle">'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+		print '<td class="nowrap amountcard right">'.price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
 		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
 			print '<tr>';
-			print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">'.price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 		}
@@ -2361,16 +2361,16 @@ 
 
 	$alert = '';
 	if (!empty($conf->global->ORDER_MANAGE_MIN_AMOUNT) && $object->total_ht < $object->thirdparty->supplier_order_min_amount) {
-		$alert = ' ' . img_warning($langs->trans('OrderMinAmount') . ': ' . price($object->thirdparty->supplier_order_min_amount));
+		$alert = ' '.img_warning($langs->trans('OrderMinAmount').': '.price($object->thirdparty->supplier_order_min_amount));
 	}
 
 	print '<tr>';
 	// Amount TTC
-	print '<td>' . $langs->trans('AmountTTC') . '</td>';
-	print '<td class="nowrap amountcard right">' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . $alert . '</td>';
+	print '<td>'.$langs->trans('AmountTTC').'</td>';
+	print '<td class="nowrap amountcard right">'.price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency).$alert.'</td>';
 	if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount TTC
-		print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+		print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 	}
 	print '</tr>';
 
@@ -2696,7 +2696,7 @@ 
 			$action = 'presend';
 		}
 
-		if ($action != 'createorder' && $action != 'presend' ) {
+		if ($action != 'createorder' && $action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
 			// Generated documents

htdocs/supplier_proposal/list.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 $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_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
 $search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
@@ -82,7 +82,7 @@ 
 $search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
 $search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
 $search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
-$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver
 $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
@@ -442,7 +442,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}

htdocs/ecm/dir_add_card.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  *	\brief		Main page for ECM section area
  */
 
-if (! defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
+if (!defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
 
 // Load Dolibarr environment
 require '../main.inc.php';

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
  *	\brief		Main page for ECM section area
  */
 
-if (! defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
+if (! defined('DISABLE_JS_GRAHP')) {
+	define('DISABLE_JS_GRAPH', 1);
+}
 
 // Load Dolibarr environment
 require '../main.inc.php';

htdocs/admin/workflow.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 		'enabled'=>(isModEnabled('commande') && isModEnabled('facture')),
 		'picto'=>'bill'
 	),
-	'WORKFLOW_TICKET_CREATE_INTERVENTION' => array (
+	'WORKFLOW_TICKET_CREATE_INTERVENTION' => array(
 		'family'=>'create',
 		'position'=>25,
 		'enabled'=>(isModEnabled('ticket') && isModEnabled('ficheinter')),
@@ -192,7 +192,7 @@ 
 }
 
 // remove not available workflows (based on activated modules and global defined keys)
-$workflowcodes = array_filter($workflowcodes, function ($var) {
+$workflowcodes = array_filter($workflowcodes, function($var) {
 	return $var['enabled'];
 });