Dolibarr / dolibarr

htdocs/expensereport/class/expensereport.class.php

Spacing +26 added lines, -26 removed lines

@@ -126,8 +126,8 @@ 
 	// Paiement
 	public $user_paid_infos;
 
-	public $localtax1;	// for backward compatibility (real field should be total_localtax1 defined into CommonObject)
-	public $localtax2;	// for backward compatibility (real field should be total_localtax2 defined into CommonObject)
+	public $localtax1; // for backward compatibility (real field should be total_localtax1 defined into CommonObject)
+	public $localtax2; // for backward compatibility (real field should be total_localtax2 defined into CommonObject)
 
 	public $statuts = array();
 	public $statuts_short = array();
@@ -224,8 +224,8 @@ 
 		$this->total_tva = 0;
 		$this->total_localtax1 = 0;
 		$this->total_localtax2 = 0;
-		$this->localtax1 = 0;	// For backward compatibility
-		$this->localtax2 = 0;	// For backward compatibility
+		$this->localtax1 = 0; // For backward compatibility
+		$this->localtax2 = 0; // For backward compatibility
 		$this->modepaymentid = 0;
 
 		// List of language codes for status
@@ -584,8 +584,8 @@ 
 				$this->total_ht     = $obj->total_ht;
 				$this->total_tva    = $obj->total_tva;
 				$this->total_ttc    = $obj->total_ttc;
-				$this->localtax1    = $obj->total_localtax1;		// For backward compatibility
-				$this->localtax2    = $obj->total_localtax2;		// For backward compatibility
+				$this->localtax1    = $obj->total_localtax1; // For backward compatibility
+				$this->localtax2    = $obj->total_localtax2; // For backward compatibility
 				$this->total_localtax1 = $obj->total_localtax1;
 				$this->total_localtax2 = $obj->total_localtax2;
 
@@ -1066,7 +1066,7 @@ 
 
 				$deplig->rule_warning_message = $objp->rule_warning_message;
 
-				$deplig->rang               = $objp->rang;
+				$deplig->rang = $objp->rang;
 
 				$this->lines[$i] = $deplig;
 
@@ -1718,7 +1718,7 @@ 
 		$result .= $linkend;
 
 		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) {
@@ -1811,8 +1811,8 @@ 
 			$this->line = new ExpenseReportLine($this->db);
 
 			// We don't know seller and buyer for expense reports
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
 			$buyer = new Societe($this->db);
 
 			$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -1894,8 +1894,8 @@ 
 
 		// We don't know seller and buyer for expense reports
 		if (!is_object($seller)) {
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
 		}
 
 		$expensereportrule = new ExpenseReportRule($db);
@@ -1979,8 +1979,8 @@ 
 
 		// We don't know seller and buyer for expense reports
 		if (!is_object($seller)) {
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
 		}
 
 		$expenseik = new ExpenseReportIk($this->db);
@@ -2074,10 +2074,10 @@ 
 			$type = 0; // TODO What if type is service ?
 
 			// We don't know seller and buyer for expense reports
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
-			$seller->localtax1_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
-			$seller->localtax2_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
+			$seller->localtax1_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
+			$seller->localtax2_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
 			$buyer = new Societe($this->db);
 
 			$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -2191,7 +2191,7 @@ 
 	 */
 	public function deleteline($rowid, $fuser = '', $notrigger = 0)
 	{
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
@@ -2210,7 +2210,7 @@ 
 		dol_syslog(get_class($this)."::deleteline sql=".$sql);
 		$result = $this->db->query($sql);
 
-		if (!$result || $error > 0 ) {
+		if (!$result || $error > 0) {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::deleteline  Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
@@ -2617,10 +2617,10 @@ 
 				$sql = " SELECT count(n.qty) as cumul FROM ".MAIN_DB_PREFIX."expensereport_det n";
 				$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."expensereport e ON e.rowid = n.fk_expensereport";
 				$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."c_type_fees tf ON tf.id = n.fk_c_type_fees";
-				$sql.= " WHERE e.fk_user_author = ".(int) $this->fk_user_author;
-				$sql.= " AND YEAR(n.date) = ".(int) $arrayDate['year'];
-				$sql.= " AND tf.code = 'EX_KME' ";
-				$sql.= " AND e.fk_statut = ".(int) ExpenseReport::STATUS_VALIDATED;
+				$sql .= " WHERE e.fk_user_author = ".(int) $this->fk_user_author;
+				$sql .= " AND YEAR(n.date) = ".(int) $arrayDate['year'];
+				$sql .= " AND tf.code = 'EX_KME' ";
+				$sql .= " AND e.fk_statut = ".(int) ExpenseReport::STATUS_VALIDATED;
 
 				$resql = $this->db->query($sql);
 
@@ -2643,7 +2643,7 @@ 
 
 				for ($i = 0; $i < $num; $i++) {
 					if ($i < ($num - 1)) {
-						if ($qty > $ranges[$i]->range_ik && $qty < $ranges[$i+1]->range_ik) {
+						if ($qty > $ranges[$i]->range_ik && $qty < $ranges[$i + 1]->range_ik) {
 							$coef = $ranges[$i]->coef;
 							$offset = $ranges[$i]->offset;
 						}
@@ -2942,7 +2942,7 @@ 
 		} elseif ($mode == 'mon' || $mode == 'EX_MON') {
 			$sql .= " AND DATE_FORMAT(d.date, '%Y-%m') = '".dol_print_date($this->date, '%Y-%m')."'"; // @todo DATE_FORMAT is forbidden
 		} elseif ($mode == 'year' || $mode == 'EX_YEA') {
-			$sql .= " AND DATE_FORMAT(d.date, '%Y') = '".dol_print_date($this->date, '%Y')."'"; 	// @todo DATE_FORMAT is forbidden
+			$sql .= " AND DATE_FORMAT(d.date, '%Y') = '".dol_print_date($this->date, '%Y')."'"; // @todo DATE_FORMAT is forbidden
 		}
 
 		dol_syslog('ExpenseReportLine::getExpAmount');

htdocs/product/class/productbatch.class.php

Spacing +8 added lines, -8 removed lines

@@ -44,8 +44,8 @@ 
 
 	public $tms = '';
 	public $fk_product_stock;
-	public $sellby = '';	// dlc
-	public $eatby = '';		// dmd/dluo
+	public $sellby = ''; // dlc
+	public $eatby = ''; // dmd/dluo
 	public $batch = '';
 	public $qty;
 	public $warehouseid;
@@ -89,15 +89,15 @@ 
 		// Insert request
 		$sql = "INSERT INTO ".$this->db->prefix()."product_batch (";
 		$sql .= "fk_product_stock,";
-		$sql .= "sellby,";				// no more used
-		$sql .= "eatby,";				// no more used
+		$sql .= "sellby,"; // no more used
+		$sql .= "eatby,"; // no more used
 		$sql .= "batch,";
 		$sql .= "qty,";
 		$sql .= "import_key";
 		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->fk_product_stock) ? 'NULL' : $this->fk_product_stock).",";
-		$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").",";		// no more used
-		$sql .= " ".(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").",";			// no more used
+		$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").","; // no more used
+		$sql .= " ".(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").","; // no more used
 		$sql .= " ".(!isset($this->batch) ? 'NULL' : "'".$this->db->escape($this->batch)."'").",";
 		$sql .= " ".(!isset($this->qty) ? 'NULL' : $this->qty).",";
 		$sql .= " ".(!isset($this->import_key) ? 'NULL' : "'".$this->db->escape($this->import_key)."'");
@@ -148,7 +148,7 @@ 
 		$sql .= " pl.eatby,";
 		$sql .= " pl.sellby";
 		$sql .= " FROM ".$this->db->prefix()."product_batch as t";
-		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock w on t.fk_product_stock = w.rowid";	// llx_product_stock is a parent table so this link does NOT generate duplicate record
+		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock w on t.fk_product_stock = w.rowid"; // llx_product_stock is a parent table so this link does NOT generate duplicate record
 		$sql .= " LEFT JOIN ".$this->db->prefix()."product_lot as pl on pl.fk_product = w.fk_product and pl.batch = t.batch";
 		$sql .= " WHERE t.rowid = ".((int) $id);
 
@@ -466,7 +466,7 @@ 
 		// TODO : use product lifo and fifo when product will implement it
 		if ($fk_product > 0) { $sql .= "pl.eatby ASC, pl.sellby ASC, "; }
 		$sql .= "t.eatby ASC, t.sellby ASC ";
-		$sql .= ", t.qty ".(!empty($conf->global->DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE)?'DESC':'ASC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation
+		$sql .= ", t.qty ".(!empty($conf->global->DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE) ? 'DESC' : 'ASC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation
 
 		dol_syslog("productbatch::findAll", LOG_DEBUG);
 		$resql = $dbs->query($sql);

htdocs/theme/eldy/global.inc.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 	print "/* For dark mode */\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
-		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
+		print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
 	} else {
 		print "@media not print {";
 	}
@@ -5052,7 +5052,7 @@ 
 if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 	print "/* For dark mode */\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
-		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
+		print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
 	} else {
 		print "@media not print {";
 	}

htdocs/salaries/card.php

Spacing +12 added lines, -12 removed lines

@@ -280,7 +280,7 @@ 
 			$paiement = new PaymentSalary($db);
 			$paiement->chid         = $object->id;
 			$paiement->datepaye     = $datep;
-			$paiement->datev		= $datev;
+			$paiement->datev = $datev;
 			$paiement->amounts      = array($object->id=>$amount); // Tableau de montant
 			$paiement->paiementtype = $type_payment;
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
@@ -309,10 +309,10 @@ 
 
 			if (GETPOST('saveandnew', 'alpha')) {
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				header("Location: card.php?action=create&fk_project=" . urlencode($projectid) . "&accountid=" . urlencode($accountid) . '&paymenttype=' . urlencode(GETPOST('paymenttype', 'az09')) . '&datepday=' . GETPOST("datepday", 'int') . '&datepmonth=' . GETPOST("datepmonth", 'int') . '&datepyear=' . GETPOST("datepyear", 'int'));
+				header("Location: card.php?action=create&fk_project=".urlencode($projectid)."&accountid=".urlencode($accountid).'&paymenttype='.urlencode(GETPOST('paymenttype', 'az09')).'&datepday='.GETPOST("datepday", 'int').'&datepmonth='.GETPOST("datepmonth", 'int').'&datepyear='.GETPOST("datepyear", 'int'));
 				exit;
 			} else {
-				header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id);
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$object->id);
 				exit;
 			}
 		} else {
@@ -583,7 +583,7 @@ 
 
 	// Auto create payment
 	print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>';
-	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n";	// Date payment
+	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_paiement) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n"; // Date payment
 
 	// Bank
 	if (isModEnabled("banque")) {
@@ -765,10 +765,10 @@ 
 			$userstatic = new User($db);
 			$result = $userstatic->fetch($object->fk_user);
 			if ($result > 0) {
-				$morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
+				$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
 			}
 		} else {
-			$morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
+			$morehtmlref .= '<br>'.$form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
 
 			if (!empty($object->fk_user)) {
 				$userstatic = new User($db);
@@ -834,7 +834,7 @@ 
 		print "</td></tr>";
 	} else {
 		print "<tr>";
-		print '<td class="titlefield">' . $langs->trans("DateStartPeriod") . '</td><td>';
+		print '<td class="titlefield">'.$langs->trans("DateStartPeriod").'</td><td>';
 		print dol_print_date($object->datesp, 'day');
 		print '</td></tr>';
 	}
@@ -845,7 +845,7 @@ 
 		print "</td></tr>";
 	} else {
 		print "<tr>";
-		print '<td>' . $langs->trans("DateEndPeriod") . '</td><td>';
+		print '<td>'.$langs->trans("DateEndPeriod").'</td><td>';
 		print dol_print_date($object->dateep, 'day');
 		print '</td></tr>';
 	}
@@ -860,9 +860,9 @@ 
 	print '</td></tr>';*/
 
 	if ($action == 'edit') {
-		print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>';
 	} else {
-		print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
 	}
 
 	// Default mode of payment
@@ -1043,7 +1043,7 @@ 
 
 		// Emit payment
 		if ($object->paye == 0 && ((price2num($object->amount) < 0 && $resteapayer < 0) || (price2num($object->amount) > 0 && $resteapayer > 0)) && $user->rights->salaries->write) {
-			print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='. $object->id, '');
+			print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='.$object->id, '');
 		}
 
 		// Classify 'paid'
@@ -1060,7 +1060,7 @@ 
 		if (!empty($user->rights->salaries->delete) && empty($totalpaid)) {
 			print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id, '');
 		} else {
-			print dolGetButtonAction($langs->trans('DisabledBecausePayments'), $langs->trans('Delete'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
+			print dolGetButtonAction($langs->trans('DisabledBecausePayments'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 		}
 	}
 	print "</div>";

htdocs/core/class/html.formticket.class.php

Spacing +43 added lines, -43 removed lines

@@ -25,9 +25,9 @@ 
  *    \brief      File of class to generate the form for creating a new ticket.
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
 if (!class_exists('FormCompany')) {
 	include DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -76,20 +76,20 @@ 
 
 	public $backtopage;
 
-	public $ispublic;  // to show information or not into public form
+	public $ispublic; // to show information or not into public form
 
 	public $withtitletopic;
 	public $withtopicreadonly;
 	public $withreadid;
 
-	public $withcompany;  // to show company drop-down list
+	public $withcompany; // to show company drop-down list
 	public $withfromsocid;
 	public $withfromcontactid;
 	public $withnotifytiersatcreate;
-	public $withusercreate;  // to show name of creating user in form
+	public $withusercreate; // to show name of creating user in form
 	public $withcreatereadonly;
 
-	public $withref;  // to show ref field
+	public $withref; // to show ref field
 
 	public $withcancel;
 
@@ -128,14 +128,14 @@ 
 		$this->withcompany = isModEnabled("societe");
 		$this->withfromsocid = 0;
 		$this->withfromcontactid = 0;
-		$this->withreadid=0;
+		$this->withreadid = 0;
 		//$this->withtitletopic='';
 		$this->withnotifytiersatcreate = 0;
 		$this->withusercreate = 1;
 		$this->withcreatereadonly = 1;
 		$this->withemail = 0;
 		$this->withref = 0;
-		$this->withextrafields = 0;  // to show extrafields or not
+		$this->withextrafields = 0; // to show extrafields or not
 		//$this->withtopicreadonly=0;
 	}
 
@@ -206,7 +206,7 @@ 
 				$html_contact_search  = '';
 				$html_contact_search .= '<tr id="contact_search_line">';
 				$html_contact_search .= '<td class="titlefield">';
-				$html_contact_search .= '<label for="contact"><span class="fieldrequired">' . $langs->trans('Contact') . '</span></label>';
+				$html_contact_search .= '<label for="contact"><span class="fieldrequired">'.$langs->trans('Contact').'</span></label>';
 				$html_contact_search .= '<input type="hidden" id="contact_id" name="contact_id" value="" />';
 				$html_contact_search .= '</td>';
 				$html_contact_search .= '<td id="contact_search_result"></td>';
@@ -214,26 +214,26 @@ 
 				print $html_contact_search;
 				// contact lastname
 				$html_contact_lastname = '';
-				$html_contact_lastname .= '<tr id="contact_lastname_line" class="contact_field"><td class="titlefield"><label for="contact_lastname"><span class="fieldrequired">' . $langs->trans('Lastname') . '</span></label></td><td>';
-				$html_contact_lastname .= '<input type="text" id="contact_lastname" name="contact_lastname" value="' . dol_escape_htmltag(GETPOSTISSET('contact_lastname') ? GETPOST('contact_lastname', 'alphanohtml') : '') . '" />';
+				$html_contact_lastname .= '<tr id="contact_lastname_line" class="contact_field"><td class="titlefield"><label for="contact_lastname"><span class="fieldrequired">'.$langs->trans('Lastname').'</span></label></td><td>';
+				$html_contact_lastname .= '<input type="text" id="contact_lastname" name="contact_lastname" value="'.dol_escape_htmltag(GETPOSTISSET('contact_lastname') ? GETPOST('contact_lastname', 'alphanohtml') : '').'" />';
 				$html_contact_lastname .= '</td></tr>';
 				print $html_contact_lastname;
 				// contact firstname
 				$html_contact_firstname  = '';
-				$html_contact_firstname .= '<tr id="contact_firstname_line" class="contact_field"><td class="titlefield"><label for="contact_firstname"><span class="fieldrequired">' . $langs->trans('Firstname') . '</span></label></td><td>';
-				$html_contact_firstname .= '<input type="text" id="contact_firstname" name="contact_firstname" value="' . dol_escape_htmltag(GETPOSTISSET('contact_firstname') ? GETPOST('contact_firstname', 'alphanohtml') : '') . '" />';
+				$html_contact_firstname .= '<tr id="contact_firstname_line" class="contact_field"><td class="titlefield"><label for="contact_firstname"><span class="fieldrequired">'.$langs->trans('Firstname').'</span></label></td><td>';
+				$html_contact_firstname .= '<input type="text" id="contact_firstname" name="contact_firstname" value="'.dol_escape_htmltag(GETPOSTISSET('contact_firstname') ? GETPOST('contact_firstname', 'alphanohtml') : '').'" />';
 				$html_contact_firstname .= '</td></tr>';
 				print $html_contact_firstname;
 				// company name
 				$html_company_name  = '';
-				$html_company_name .= '<tr id="contact_company_name_line" class="contact_field"><td><label for="company_name"><span>' . $langs->trans('Company') . '</span></label></td><td>';
-				$html_company_name .= '<input type="text" id="company_name" name="company_name" value="' . dol_escape_htmltag(GETPOSTISSET('company_name') ? GETPOST('company_name', 'alphanohtml') : '') . '" />';
+				$html_company_name .= '<tr id="contact_company_name_line" class="contact_field"><td><label for="company_name"><span>'.$langs->trans('Company').'</span></label></td><td>';
+				$html_company_name .= '<input type="text" id="company_name" name="company_name" value="'.dol_escape_htmltag(GETPOSTISSET('company_name') ? GETPOST('company_name', 'alphanohtml') : '').'" />';
 				$html_company_name .= '</td></tr>';
 				print $html_company_name;
 				// contact phone
 				$html_contact_phone  = '';
-				$html_contact_phone .= '<tr id="contact_phone_line" class="contact_field"><td><label for="contact_phone"><span>' . $langs->trans('Phone') . '</span></label></td><td>';
-				$html_contact_phone .= '<input type="text" id="contact_phone" name="contact_phone" value="' . dol_escape_htmltag(GETPOSTISSET('contact_phone') ? GETPOST('contact_phone', 'alphanohtml') : '') . '" />';
+				$html_contact_phone .= '<tr id="contact_phone_line" class="contact_field"><td><label for="contact_phone"><span>'.$langs->trans('Phone').'</span></label></td><td>';
+				$html_contact_phone .= '<input type="text" id="contact_phone" name="contact_phone" value="'.dol_escape_htmltag(GETPOSTISSET('contact_phone') ? GETPOST('contact_phone', 'alphanohtml') : '').'" />';
 				$html_contact_phone .= '</td></tr>';
 				print $html_contact_phone;
 
@@ -501,7 +501,7 @@ 
 				$maxfilesizearray = getMaxFileSizeArray();
 				$maxmin = $maxfilesizearray['maxmin'];
 				if ($maxmin > 0) {
-					$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+					$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 				}
 				$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
 				$out .= ' ';
@@ -689,7 +689,7 @@ 
 		$selected = is_array($selected) ? $selected : (!empty($selected) ? array($selected) : array());
 		$ticketstat = new Ticket($this->db);
 
-		dol_syslog(get_class($this) . "::select_types_tickets " . implode(';', $selected) . ", " . $htmlname . ", " . $filtertype . ", " . $format . ", " . $multiselect, LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_types_tickets ".implode(';', $selected).", ".$htmlname.", ".$filtertype.", ".$format.", ".$multiselect, LOG_DEBUG);
 
 		$filterarray = array();
 
@@ -699,7 +699,7 @@ 
 
 		$ticketstat->loadCacheTypesTickets();
 
-		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.($multiselect?'[]':'').'"'.($multiselect?' multiple':'').'>';
+		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.($multiselect ? '[]' : '').'"'.($multiselect ? ' multiple' : '').'>';
 		if ($empty) {
 			print '<option value="">&nbsp;</option>';
 		}
@@ -876,11 +876,11 @@ 
 			}
 
 			print ajax_combobox('select'.$htmlname);
-		} elseif ($htmlname!='') {
+		} elseif ($htmlname != '') {
 			$selectedgroups = array();
 			$groupvalue = "";
-			$groupticket=GETPOST($htmlname, 'aZ09');
-			$child_id=GETPOST($htmlname.'_child_id', 'aZ09')?GETPOST($htmlname.'_child_id', 'aZ09'):0;
+			$groupticket = GETPOST($htmlname, 'aZ09');
+			$child_id = GETPOST($htmlname.'_child_id', 'aZ09') ?GETPOST($htmlname.'_child_id', 'aZ09') : 0;
 			if (!empty($groupticket)) {
 				$tmpgroupticket = $groupticket;
 				$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code FROM ".$this->db->prefix()."c_ticket_category as ctc WHERE ctc.code = '".$this->db->escape($tmpgroupticket)."'";
@@ -938,9 +938,9 @@ 
 
 						$isparent = $obj->isparent;
 						if (is_array($selectedgroups)) {
-							$iselected = in_array($obj->code, $selectedgroups) ?'selected':'';
+							$iselected = in_array($obj->code, $selectedgroups) ? 'selected' : '';
 						} else {
-							$iselected = $groupticket == $obj->code ?'selected':'';
+							$iselected = $groupticket == $obj->code ? 'selected' : '';
 						}
 						$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.dol_escape_htmltag($grouprowid).'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
 						if ($isparent == 'NOTPARENT') {
@@ -962,7 +962,7 @@ 
 			}
 			$stringtoprint .= '</select>&nbsp;';
 
-			$levelid = 1;	// The first combobox
+			$levelid = 1; // The first combobox
 			while ($levelid <= $use_multilevel) {	// Loop to take the child of the combo
 				$tabscript = array();
 				$stringtoprint .= '<select id ="'.$htmlname.'_child_'.$levelid.'" class="maxwidth500 minwidth400 groupticketchild" child_id="'.$levelid.'">';
@@ -993,7 +993,7 @@ 
 				if ($resql) {
 					$num_rows = $this->db->num_rows($resql);
 					$i = 0;
-					$arrayidused=array();
+					$arrayidused = array();
 					while ($i < $num_rows) {
 						$obj = $this->db->fetch_object($resql);
 						if ($obj) {
@@ -1016,13 +1016,13 @@ 
 								$arraycodenotparent[] = $groupvalue;
 							}
 							if (is_array($selectedgroups)) {
-								$iselected = in_array($obj->code, $selectedgroups) ?'selected':'';
+								$iselected = in_array($obj->code, $selectedgroups) ? 'selected' : '';
 							} else {
-								$iselected = $groupticket == $obj->code ?'selected':'';
+								$iselected = $groupticket == $obj->code ? 'selected' : '';
 							}
 							$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
 							if (empty($tabscript[$groupcodefather])) {
-								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ?'_child_'.($levelid-1):'').'").val() == "'.dol_escape_js($groupcodefather).'"){
+								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ? '_child_'.($levelid - 1) : '').'").val() == "'.dol_escape_js($groupcodefather).'"){
 									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").show()
 									console.log("We show childs tickets of '.$groupcodefather.' group ticket")
 								}else{
@@ -1036,11 +1036,11 @@ 
 				} else {
 					dol_print_error($this->db);
 				}
-				$stringtoprint .='</select>';
+				$stringtoprint .= '</select>';
 
-				$stringtoprint .='<script>';
-				$stringtoprint .='arraynotparents = '.json_encode($arraycodenotparent).';';	// when the last visible combo list is number x, this is the array of group
-				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ?'_child_'.($levelid-1):'').'").val())){
+				$stringtoprint .= '<script>';
+				$stringtoprint .= 'arraynotparents = '.json_encode($arraycodenotparent).';'; // when the last visible combo list is number x, this is the array of group
+				$stringtoprint .= 'if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ? '_child_'.($levelid - 1) : '').'").val())){
 					console.log("'.$htmlname.'_child_'.$levelid.'")
 					if($("#'.$htmlname.'_child_'.$levelid.'").val() == "" && ($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")>'.$child_id.')){
 						$("#'.$htmlname.'_child_'.$levelid.'").hide();
@@ -1052,8 +1052,8 @@ 
 						console.log("We choose '.$htmlname.' input and reload hidden input");
 					}
 				}
-				$("#'.$htmlname.($levelid > 1 ?'_child_'.($levelid-1):'').'").change(function() {
-					child_id = $("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid:'').'").attr("child_id");
+				$("#'.$htmlname.($levelid > 1 ? '_child_'.($levelid - 1) : '').'").change(function() {
+					child_id = $("#'.$htmlname.($levelid > 1 ? '_child_'.$levelid : '').'").attr("child_id");
 
 					/* Change of value to select this value*/
 					if (arraynotparents.includes($(this).val()) || $(this).attr("child_id") == '.$use_multilevel.') {
@@ -1096,16 +1096,16 @@ 
 				foreach ($tabscript as $script) {
 					$stringtoprint .= $script;
 				};
-				$stringtoprint .='})';
-				$stringtoprint .='</script>';
+				$stringtoprint .= '})';
+				$stringtoprint .= '</script>';
 			}
-			$stringtoprint .='<script>';
-			$stringtoprint .='$("#'.$htmlname.'_child_'.$use_multilevel.'").change(function() {
+			$stringtoprint .= '<script>';
+			$stringtoprint .= '$("#'.$htmlname.'_child_'.$use_multilevel.'").change(function() {
 				$("#ticketcategory_select").val($(this).val());
 				$("#ticketcategory_select_child_id").val($(this).attr("child_id"));
 				console.log($("#ticketcategory_select").val());
 			})';
-			$stringtoprint .='</script>';
+			$stringtoprint .= '</script>';
 			$stringtoprint .= ajax_combobox($htmlname);
 
 			return $stringtoprint;
@@ -1415,7 +1415,7 @@ 
 			$res = $ticketstat->fetch('', '', $this->track_id);
 
 			print '<tr><td></td><td>';
-			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : ($conf->global->TICKETS_MESSAGE_FORCE_MAIL?'checked':''));
+			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : ($conf->global->TICKETS_MESSAGE_FORCE_MAIL ? 'checked' : ''));
 			print '<input type="checkbox" name="send_email" value="1" id="send_msg_email" '.$checkbox_selected.'/> ';
 			print '<label for="send_msg_email">'.$langs->trans('SendMessageByEmail').'</label>';
 			$texttooltip = $langs->trans("TicketMessageSendEmailHelp", '{s1}');

htdocs/core/class/utils.class.php

Spacing +9 added lines, -9 removed lines

@@ -101,14 +101,14 @@ 
 			if ($choice == 'allfiles') {
 				// Delete all files (except install.lock, do not follow symbolic links)
 				if ($dolibarr_main_data_root) {
-					$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);	// No need to use recursive, we will delete directory
+					$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1); // No need to use recursive, we will delete directory
 				}
 			}
 
 			if ($choice == 'allfilesold') {
 				// Delete all files (except install.lock, do not follow symbolic links)
 				if ($dolibarr_main_data_root) {
-					$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 1, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1, $nbsecondsold);	// No need to use recursive, we will delete directory
+					$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 1, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1, $nbsecondsold); // No need to use recursive, we will delete directory
 				}
 			}
 
@@ -1303,14 +1303,14 @@ 
 		}
 		if ($tmpfiles && is_array($tmpfiles)) {
 			foreach ($tmpfiles as $key => $val) {
-				if ($key  == 'fullname') {
+				if ($key == 'fullname') {
 					$filepath = array($val);
 					$filesize = dol_filesize($val);
 				}
-				if ($key  == 'type') {
+				if ($key == 'type') {
 					$mimetype = array($val);
 				}
-				if ($key  == 'relativename') {
+				if ($key == 'relativename') {
 					$filename = array($val);
 				}
 			}
@@ -1319,7 +1319,7 @@ 
 		if ($filepath) {
 			if ($filesize > $sizelimit) {
 				$message .= '<br>'.$langs->trans("BackupIsTooLargeSend");
-				$documenturl =  $dolibarr_main_url_root.'/document.php?modulepart=systemtools&atachement=1&file=backup/'.urlencode($filename[0]);
+				$documenturl = $dolibarr_main_url_root.'/document.php?modulepart=systemtools&atachement=1&file=backup/'.urlencode($filename[0]);
 				$message .= '<br><a href='.$documenturl.'>Lien de téléchargement</a>';
 				$filepath = '';
 				$mimetype = '';
@@ -1331,7 +1331,7 @@ 
 		}
 
 		if (!$error) {
-			include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
 			if ($mailfile->error) {
 				$error++;
@@ -1390,7 +1390,7 @@ 
 		}
 
 		$cron_job = new Cronjob($db);
-		$cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, '', 1);	// Fetch jobs that are currently running
+		$cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, '', 1); // Fetch jobs that are currently running
 
 		// Iterate over all jobs in processing (this can't be this job since his state is set to 0 before)
 		foreach ($cron_job->lines as $job_line) {
@@ -1408,7 +1408,7 @@ 
 			}
 
 			// Calling posix_kill with the 0 kill signal will return true if the process is running, false otherwise.
-			if (! posix_kill($job->pid, 0)) {
+			if (!posix_kill($job->pid, 0)) {
 				// Clean processing and pid values
 				$job->processing = 0;
 				$job->pid = null;

htdocs/core/class/lessc.class.php

Spacing +2 added lines, -2 removed lines

@@ -704,7 +704,7 @@ 
 					$value = $a[2];
 				} else {
 					$value = null; // :(
-					$this->throwError("Failed to assign arg ".$a[1]);	// This end function by throwing an exception
+					$this->throwError("Failed to assign arg ".$a[1]); // This end function by throwing an exception
 				}
 
 				$value = $this->reduce($value);
@@ -1118,7 +1118,7 @@ 
 				if (isset($items[0])) {
 					return $this->lib_e($items[0]);
 				}
-				$this->throwError("unrecognised input");	// This end function by throwing an exception
+				$this->throwError("unrecognised input"); // This end function by throwing an exception
 			case "string":
 				$arg[1] = "";
 				return $arg;

htdocs/hrm/class/skill.class.php

Spacing +8 added lines, -8 removed lines

@@ -108,7 +108,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2',),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3,),
@@ -227,7 +227,7 @@ 
 	 */
 	public function create(User $user, $notrigger = false)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -255,24 +255,24 @@ 
 
 		$error = 0;
 
-		require_once __DIR__ . '/skilldet.class.php';
+		require_once __DIR__.'/skilldet.class.php';
 
 		$this->db->begin();
 
 		// Create level of skills
-		for ($i; $i <= $MaxNumberSkill ; $i++) {
+		for ($i; $i <= $MaxNumberSkill; $i++) {
 			$skilldet = new Skilldet($this->db);
-			$skilldet->description = $defaultSkillDesc . " " . $i;
+			$skilldet->description = $defaultSkillDesc." ".$i;
 			$skilldet->rankorder = $i;
 			$skilldet->fk_skill = $this->id;
 
-			$result =  $skilldet->create($user);
+			$result = $skilldet->create($user);
 			if ($result <= 0) {
 				$error++;
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 
 			setEventMessage($langs->trans('SkillCreated'), $i);
@@ -406,7 +406,7 @@ 
 	public function fetchLines()
 	{
 		$this->lines = array();
-		require_once __DIR__ . '/skilldet.class.php';
+		require_once __DIR__.'/skilldet.class.php';
 		$skilldet = new Skilldet($this->db);
 		$this->lines = $skilldet->fetchAll('ASC', '', '', '', array('fk_skill' => $this->id), '');
 

htdocs/societe/card.php

Spacing +42 added lines, -42 removed lines

@@ -93,7 +93,7 @@ 
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
-$confirm 	= GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 
 if (!empty($backtopagejsfields)) {
 	$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
@@ -141,12 +141,12 @@ 
 }
 
 // Permissions
-$permissiontoread 	= $user->hasRight('societe', 'lire');
-$permissiontoadd 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoread = $user->hasRight('societe', 'lire');
+$permissiontoadd = $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->hasRight('societe', 'supprimer') || ($permissiontoadd && isset($object->status) && $object->status == 0);
-$permissionnote 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php
 $permissiondellink 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_dellink.inc.php
-$upload_dir 		= $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
+$upload_dir = $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
@@ -430,12 +430,12 @@ 
 			$error++;
 		}
 
-		if (isModEnabled('mailing') && !empty($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && !empty($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST('contact_no_email', 'int') == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
 
-		if (isModEnabled('mailing') && GETPOST("private", 'int') == 1 && !empty($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && GETPOST("private", 'int') == 1 && !empty($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST('contact_no_email', 'int') == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
@@ -454,19 +454,19 @@ 
 				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
 				$object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
 				// Add non official properties
-				$object->name_bis			= GETPOST('name', 'alphanohtml');
-				$object->firstname			= GETPOST('firstname', 'alphanohtml');
+				$object->name_bis = GETPOST('name', 'alphanohtml');
+				$object->firstname = GETPOST('firstname', 'alphanohtml');
 			} else {
-				$object->name				= GETPOST('name', 'alphanohtml');
+				$object->name = GETPOST('name', 'alphanohtml');
 			}
 			$object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
-			$object->name_alias				= GETPOST('name_alias', 'alphanohtml');
+			$object->name_alias = GETPOST('name_alias', 'alphanohtml');
 			$object->parent					= GETPOST('parent_company_id', 'int');
 			$object->address				= GETPOST('address', 'alphanohtml');
-			$object->zip					= GETPOST('zipcode', 'alphanohtml');
-			$object->town					= GETPOST('town', 'alphanohtml');
-			$object->country_id				= GETPOST('country_id', 'int');
-			$object->state_id				= GETPOST('state_id', 'int');
+			$object->zip = GETPOST('zipcode', 'alphanohtml');
+			$object->town = GETPOST('town', 'alphanohtml');
+			$object->country_id = GETPOST('country_id', 'int');
+			$object->state_id = GETPOST('state_id', 'int');
 
 			$object->socialnetworks = array();
 			if (isModEnabled('socialnetworks')) {
@@ -480,7 +480,7 @@ 
 			$object->phone					= GETPOST('phone', 'alpha');
 			$object->fax					= GETPOST('fax', 'alpha');
 			$object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
-			$object->no_email 				= GETPOST("no_email", "int");
+			$object->no_email = GETPOST("no_email", "int");
 			$object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
 			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
 			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
@@ -490,7 +490,7 @@ 
 			$object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
 			$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
 			$object->code_client			= GETPOSTISSET('customer_code') ?GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
-			$object->code_fournisseur		= GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
+			$object->code_fournisseur = GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
 			$object->capital				= GETPOST('capital', 'alphanohtml');
 			$object->barcode				= GETPOST('barcode', 'alphanohtml');
 
@@ -505,24 +505,24 @@ 
 			$object->localtax1_value		= GETPOST('lt1', 'alpha');
 			$object->localtax2_value		= GETPOST('lt2', 'alpha');
 
-			$object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
+			$object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
 			$object->effectif_id			= GETPOST('effectif_id', 'int');
-			$object->typent_id				= GETPOST('typent_id', 'int');
+			$object->typent_id = GETPOST('typent_id', 'int');
 
 			$object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
 
-			$object->client					= GETPOST('client', 'int');
+			$object->client = GETPOST('client', 'int');
 			$object->fournisseur			= GETPOST('fournisseur', 'int');
 
-			$object->commercial_id			= GETPOST('commercial_id', 'int');
-			$object->default_lang			= GETPOST('default_lang');
+			$object->commercial_id = GETPOST('commercial_id', 'int');
+			$object->default_lang = GETPOST('default_lang');
 
 			// Webservices url/key
 			$object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
 			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
 			if (GETPOSTISSET('accountancy_code_sell')) {
-				$accountancy_code_sell		= GETPOST('accountancy_code_sell', 'alpha');
+				$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 				if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 					$object->accountancy_code_sell = '';
@@ -531,7 +531,7 @@ 
 				}
 			}
 			if (GETPOSTISSET('accountancy_code_buy')) {
-				$accountancy_code_buy		= GETPOST('accountancy_code_buy', 'alpha');
+				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 				if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 					$object->accountancy_code_buy = '';
@@ -978,7 +978,7 @@ 
 
 	// Actions to build doc
 	$id = $socid;
-	$upload_dir = !empty($conf->societe->multidir_output[$object->entity])?$conf->societe->multidir_output[$object->entity]:$conf->societe->dir_output;
+	$upload_dir = !empty($conf->societe->multidir_output[$object->entity]) ? $conf->societe->multidir_output[$object->entity] : $conf->societe->dir_output;
 	$permissiontoadd = $user->hasRight('societe', 'creer');
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
@@ -1154,7 +1154,7 @@ 
 		$object->default_lang = GETPOST('default_lang');
 
 		if (GETPOSTISSET('accountancy_code_sell')) {
-			$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+			$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 			if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 				$object->accountancy_code_sell = '';
@@ -1163,7 +1163,7 @@ 
 			}
 		}
 		if (GETPOSTISSET('accountancy_code_buy')) {
-			$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+			$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 			if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 				$object->accountancy_code_buy = '';
@@ -1248,7 +1248,7 @@ 
                         	document.formsoc.private.value=1;
                         });
 
-						var canHaveCategoryIfNotCustomerProspectSupplier = ' . (empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT) ? '0' : '1') . ';
+						var canHaveCategoryIfNotCustomerProspectSupplier = ' . (empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT) ? '0' : '1').';
 
 						init_customer_categ();
 			  			$("#customerprospect").change(function() {
@@ -1624,7 +1624,7 @@ 
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
-			print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email') .' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
+			print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email').' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
 			print '<td class="individualline" '.(($conf->browser->layout == 'phone') || !isModEnabled('mailing') ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ? GETPOST("contact_no_email", 'alpha') : (empty($object->no_email) ? 0 : 1)), 1, false, 1).'</td>';
 		}
 		print '</tr>';
@@ -1683,7 +1683,7 @@ 
 		$i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
 		while ($i <= 6) {
 			$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-			if ($idprof != '-')	{
+			if ($idprof != '-') {
 				$key = 'idprof'.$i;
 
 				if (($j % $NBCOLS) == 0) {
@@ -1721,7 +1721,7 @@ 
 		if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object)) {
 			$s .= ' ';
 
-			if (!empty($conf->use_javascript_ajax))	{
+			if (!empty($conf->use_javascript_ajax)) {
 				$widthpopup = 600;
 				if (!empty($conf->dol_use_jmobile)) {
 					$widthpopup = 350;
@@ -1767,7 +1767,7 @@ 
 		}
 
 		// Type - Workforce/Staff
-		print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.( ($conf->browser->layout == 'phone' || !empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) ? ' colspan="3"' : '').'>'."\n";
+		print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.(($conf->browser->layout == 'phone' || !empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) ? ' colspan="3"' : '').'>'."\n";
 		$sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 		print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
 		if ($user->admin) {
@@ -2003,7 +2003,7 @@ 
 				$object->phone					= GETPOST('phone', 'alpha');
 				$object->fax					= GETPOST('fax', 'alpha');
 				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-				$object->no_email				= GETPOST("no_email", "int");
+				$object->no_email = GETPOST("no_email", "int");
 				$object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
 				$object->capital				= GETPOST('capital', 'alphanohtml');
 				$object->idprof1				= GETPOST('idprof1', 'alphanohtml');
@@ -2027,7 +2027,7 @@ 
 				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
 				if (GETPOSTISSET('accountancy_code_sell')) {
-					$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+					$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 					if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 						$object->accountancy_code_sell = '';
@@ -2036,7 +2036,7 @@ 
 					}
 				}
 				if (GETPOSTISSET('accountancy_code_buy')) {
-					$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+					$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 					if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 						$object->accountancy_code_buy = '';
@@ -2118,7 +2118,7 @@ 
     				}
     			});
 
-				var canHaveCategoryIfNotCustomerProspectSupplier = ' . (empty($conf->global->THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT) ? '0' : '1') . ';
+				var canHaveCategoryIfNotCustomerProspectSupplier = ' . (empty($conf->global->THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT) ? '0' : '1').';
 
 				init_customer_categ();
 	  			$("#customerprospect").change(function() {
@@ -2302,13 +2302,13 @@ 
 			print '</td></tr>';
 
 			// Zip / Town
-			print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
+			print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
 			print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100');
 			print '</td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
-			print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
+			print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
 			print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 			print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
 			print '</td></tr>';
@@ -2337,12 +2337,12 @@ 
 
 			// Phone / Fax
 			print '<tr><td>'.$form->editfieldkey('Phone', 'phone', GETPOST('phone', 'alpha'), $object, 0).'</td>';
-			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
 			print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
-			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
+			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
 			print '</tr>';
 
 			// Web
@@ -2516,7 +2516,7 @@ 
 			print '</tr>';
 
 			// Type - Workforce/Staff
-			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.( ($conf->browser->layout == 'phone' || !empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) ? ' colspan="3"' : '').'>';
+			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.(($conf->browser->layout == 'phone' || !empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) ? ' colspan="3"' : '').'>';
 			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -2652,7 +2652,7 @@ 
 				$maxfilesizearray = getMaxFileSizeArray();
 				$maxmin = $maxfilesizearray['maxmin'];
 				if ($maxmin > 0) {
-					print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+					print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 				}
 				print '<input type="file" class="flat" name="photo" id="photoinput">';
 				print '</td></tr>';