Dolibarr / dolibarr

htdocs/admin/index.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 
 // Define $nbmodulesnotautoenabled - TODO This code is at different places
 $nbmodulesnotautoenabled = count($conf->modules);
-$listofmodulesautoenabled = array('user', 'agenda', 'fckeditor', 'export', 'import');	// All modules with ->enabled_bydefault to true (so enabled during install)
+$listofmodulesautoenabled = array('user', 'agenda', 'fckeditor', 'export', 'import'); // All modules with ->enabled_bydefault to true (so enabled during install)
 foreach ($listofmodulesautoenabled as $moduleautoenable) {
 	if (in_array($moduleautoenable, $conf->modules)) {
 		$nbmodulesnotautoenabled--;

htdocs/comm/mailing/class/mailing_targets.class.php

Spacing +7 added lines, -7 removed lines

@@ -205,9 +205,9 @@ 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " (fk_mailing, fk_contact, email, statut)";
 		$sql .= " VALUES (".((int) $this->fk_mailing).", ";
-		$sql .=  ((int) $this->fk_contact).", ";
+		$sql .= ((int) $this->fk_contact).", ";
 		$sql .= "'".$this->db->escape($this->email)."', ";
-		$sql .=  ((int) $conf->statut)." )";
+		$sql .= ((int) $conf->statut)." )";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -225,7 +225,7 @@ 
 				return $this->id;
 			} else {
 				$this->db->rollback();
-				dol_syslog(__METHOD__ . ' ' . $this->error, LOG_ERR);
+				dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);
 				return -2;
 			}
 		} else {
@@ -248,12 +248,12 @@ 
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
-		$sql .= " WHERE rowid = " . ((int) $this->id);
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			dol_syslog(__METHOD__ . ' success');
+			dol_syslog(__METHOD__.' success');
 			$this->db->commit();
 			return 1;
 		} else {
@@ -428,7 +428,7 @@ 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			dol_syslog(__METHOD__ . ' success');
+			dol_syslog(__METHOD__.' success');
 			$this->db->commit();
 			return 1;
 		} else {
@@ -482,7 +482,7 @@ 
 				$this->email = $obj->email;
 				$this->other = $obj->other;
 				$this->tag = $obj->tag;
-				$this->statut = $obj->status;	// deprecated
+				$this->statut = $obj->status; // deprecated
 				$this->status = $obj->status;
 				$this->source_url = $obj->source_url;
 				$this->source_id = $obj->source_id;

htdocs/contrat/class/contrat.class.php

Spacing +23 added lines, -23 removed lines

@@ -317,7 +317,7 @@ 
 		if (getDolGlobalString('CONTRACT_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('CONTRACT_ADDON') . ".php";
+			$file = getDolGlobalString('CONTRACT_ADDON').".php";
 			$classname = getDolGlobalString('CONTRACT_ADDON');
 
 			// Include file with class
@@ -428,7 +428,7 @@ 
 			if ($contratline->statut != ContratLigne::STATUS_OPEN) {
 				$contratline->context = $this->context;
 
-				$result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment);	// This call trigger LINECONTRACT_ACTIVATE
+				$result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment); // This call trigger LINECONTRACT_ACTIVATE
 				if ($result < 0) {
 					$error++;
 					$this->error = $contratline->error;
@@ -481,7 +481,7 @@ 
 			// Close lines not already closed
 			if ($contratline->statut != ContratLigne::STATUS_CLOSED) {
 				$contratline->date_end_real = $now;
-				$contratline->date_cloture = $now;	// For backward compatibility
+				$contratline->date_cloture = $now; // For backward compatibility
 				$contratline->user_closing_id = $user->id;
 				$contratline->statut = ContratLigne::STATUS_CLOSED;
 
@@ -627,7 +627,7 @@ 
 			if (!$error) {
 				$this->ref = $num;
 				$this->status = self::STATUS_VALIDATED;
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
+				$this->statut = self::STATUS_VALIDATED; // deprecated
 				$this->date_validation = $now;
 			}
 		} else {
@@ -903,10 +903,10 @@ 
 				$line->localtax2_tx		= $objp->localtax2_tx;
 				$line->localtax1_type	= $objp->localtax1_type;
 				$line->localtax2_type	= $objp->localtax2_type;
-				$line->subprice			= $objp->subprice;
+				$line->subprice = $objp->subprice;
 				$line->statut           = $objp->status; // For backward compatibility
 				$line->status           = $objp->status;
-				$line->remise_percent	= $objp->remise_percent;
+				$line->remise_percent = $objp->remise_percent;
 				$line->total_ht			= $objp->total_ht;
 				$line->total_tva		= $objp->total_tva;
 				$line->total_localtax1	= $objp->total_localtax1;
@@ -1418,7 +1418,7 @@ 
 		}
 
 		if (!$error) {
-			$result = $this->insertExtraFields();	// This delete and reinsert extrafields
+			$result = $this->insertExtraFields(); // This delete and reinsert extrafields
 			if ($result < 0) {
 				$error++;
 			}
@@ -2045,7 +2045,7 @@ 
 				}
 				$datas['customer'] = '<br><b>'.$langs->trans('Customer').':</b> '.$this->thirdparty->getNomUrl(1, '', 0, 1);
 			}
-			$datas['refcustomer'] = '<br><b>'.$langs->trans('RefCustomer').':</b> '. $this->ref_customer;
+			$datas['refcustomer'] = '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_customer;
 			if (!$nofetch) {
 				$langs->load('project');
 				if (is_null($this->project) || (is_object($this->project) && $this->project->isEmpty())) {
@@ -2084,7 +2084,7 @@ 
 
 		$result = '';
 
-		$baseurl = DOL_URL_ROOT . '/contrat/card.php';
+		$baseurl = DOL_URL_ROOT.'/contrat/card.php';
 		$query = ['id' => $this->id];
 
 		//if ($option !== 'nolink')
@@ -2475,7 +2475,7 @@ 
 		$this->note_public = 'This is a comment (public)';
 		$this->fk_project = 0;
 		// Lines
-		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5);	// We can force the nb of lines to test from command line (but not more than 1000)
+		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000)
 		$xnbp = 0;
 		while ($xnbp < $nbp) {
 			$line = new ContratLigne($this->db);
@@ -2521,7 +2521,7 @@ 
 		global $user;
 
 		$ticket = new Ticket($this->db);
-		$nbTicket =  $ticket->fetchAll($user, 'ASC', 't.datec', 0, 0, 0, array('t.fk_contract' => $this->id));
+		$nbTicket = $ticket->fetchAll($user, 'ASC', 't.datec', 0, 0, 0, array('t.fk_contract' => $this->id));
 
 		return ($nbTicket < 0 ? $nbTicket : $ticket->lines);
 	}
@@ -2543,7 +2543,7 @@ 
 		global $conf, $langs;
 
 		if (!dol_strlen($modele)) {
-			$modele = '';	// No doc template/generation by default
+			$modele = ''; // No doc template/generation by default
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
@@ -2641,14 +2641,14 @@ 
 			}
 		}
 
-		if (!getDolGlobalString('CONTRACT_ADDON') || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/contract/" . getDolGlobalString('CONTRACT_ADDON').".php")) {
+		if (!getDolGlobalString('CONTRACT_ADDON') || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/contract/".getDolGlobalString('CONTRACT_ADDON').".php")) {
 			$this->error = 'ErrorSetupNotComplete';
 			dol_syslog($this->error);
 			return -1;
 		}
 
 		// Set ref
-		require_once DOL_DOCUMENT_ROOT."/core/modules/contract/" . getDolGlobalString('CONTRACT_ADDON').'.php';
+		require_once DOL_DOCUMENT_ROOT."/core/modules/contract/".getDolGlobalString('CONTRACT_ADDON').'.php';
 		$obj = getDolGlobalString('CONTRACT_ADDON');
 		$modContract = new $obj();
 		'@phan-var-force ModelNumRefContracts $modContract';
@@ -2771,7 +2771,7 @@ 
 
 					// Load contract
 					$object = new Contrat($this->db);
-					$object->fetch($obj->rowid);		// fetch also lines
+					$object->fetch($obj->rowid); // fetch also lines
 
 					if ($object->id <= 0) {
 						$error++;
@@ -2817,7 +2817,7 @@ 
 					if ($expirationdate && $expirationdate < $enddatetoscan) {
 						dol_syslog("Define the newdate of end of services from expirationdate=".$expirationdate);
 						$newdate = $expirationdate;
-						$protecti = 0;	// $protecti is to avoid infinite loop
+						$protecti = 0; // $protecti is to avoid infinite loop
 						while ($newdate < $enddatetoscan && $protecti < 1000) {
 							$newdate = dol_time_plus_duree($newdate, (int) $duration_value, $duration_unit);
 							$protecti++;
@@ -2856,21 +2856,21 @@ 
 
 								// Create an event
 								$actioncomm = new ActionComm($this->db);
-								$actioncomm->type_code    = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+								$actioncomm->type_code    = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 								$actioncomm->code         = 'AC_'.$actioncode;
 								$actioncomm->label        = $label;
 								$actioncomm->datep        = $now;
 								$actioncomm->datef        = $now;
-								$actioncomm->percentage   = -1;   // Not applicable
+								$actioncomm->percentage   = -1; // Not applicable
 								$actioncomm->socid        = $object->socid;
-								$actioncomm->authorid     = $user->id;   // User saving action
-								$actioncomm->userownerid  = $user->id;	// Owner of action
+								$actioncomm->authorid     = $user->id; // User saving action
+								$actioncomm->userownerid  = $user->id; // Owner of action
 								$actioncomm->fk_element   = $object->id;
 								$actioncomm->elementid    = $object->id;
 								$actioncomm->elementtype  = 'contract';
 								$actioncomm->note_private = $comment;
 
-								$ret = $actioncomm->create($user);       // User creating action
+								$ret = $actioncomm->create($user); // User creating action
 							} else {
 								$contracterror[$object->id] = $object->ref;
 
@@ -2879,7 +2879,7 @@ 
 								$this->error = $this->db->lasterror();
 							}
 
-							if (! $errorforlocaltransaction) {
+							if (!$errorforlocaltransaction) {
 								$this->db->commit();
 							} else {
 								$this->db->rollback();
@@ -2937,7 +2937,7 @@ 
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">' . $this->getNomUrl() . '</span>';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.$this->getNomUrl().'</span>';
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}

htdocs/install/repair.php

Spacing +16 added lines, -16 removed lines

@@ -269,7 +269,7 @@ 
 		],
 		[
 			'name' => 'force_utf8mb4_on_tables',
-			'info' => 'Force utf8mb4 + row=dynamic, for mysql/mariadb only' . $warning_using_utf8mb4
+			'info' => 'Force utf8mb4 + row=dynamic, for mysql/mariadb only'.$warning_using_utf8mb4
 		],
 		[
 			'name' => 'force_collation_from_conf_on_tables',
@@ -297,7 +297,7 @@ 
 		$url_test = $_SERVER['PHP_SELF'].'?'.$option.'=test';
 		$url_confirmed = $_SERVER['PHP_SELF'].'?'.$option.'=confirmed';
 		print '<tr>';
-		print '<td>' . $option . '</td>';
+		print '<td>'.$option.'</td>';
 		print '<td>';
 		if ($tooltip) {
 			print $form->textwithpicto($info, $tooltip);
@@ -1318,13 +1318,13 @@ 
 							}
 							if ($key == 'js') {
 								$value = $obj->value;
-								$valuearray = (array) json_decode($value);	// Force cast into array because sometimes it is a stdClass
+								$valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass
 								$reloffile = $valuearray[0];
 								$reloffile = preg_replace('/^\//', '', $valuearray[0]);
 							}
 							if ($key == 'css') {
 								$value = $obj->value;
-								$valuearray = (array) json_decode($value);	// Force cast into array because sometimes it is a stdClass
+								$valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass
 								if ($value && (!is_array($valuearray) || count($valuearray) == 0)) {
 									$valuearray = array();
 									$valuearray[0] = $value; // If value was not a json array but a string
@@ -1340,7 +1340,7 @@ 
 									$result = 'found'; // If error, we force like if we found to avoid any deletion
 								}
 							} else {
-								$result = 'found';	//
+								$result = 'found'; //
 							}
 
 							if (!$result) {
@@ -1915,7 +1915,7 @@ 
 
 					$sql_attach = 'INSERT INTO '.MAIN_DB_PREFIX.'receptiondet_batch';
 					$sql_attach .= ' (fk_element, fk_product, fk_elementdet, qty, fk_entrepot, fk_user, datec, comment, status, tms, batch, eatby, sellby)';
-					$sql_attach .= " VALUES (".$sql_attach_values.")";	// The string is already sanitized
+					$sql_attach .= " VALUES (".$sql_attach_values.")"; // The string is already sanitized
 				}
 
 				if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed') {
@@ -1962,16 +1962,16 @@ 
 
 // Repair llx_commande_fournisseur to eliminate duplicate reference
 if ($ok && GETPOST('repair_supplier_order_duplicate_ref')) {
-	require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
-	include_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 	$db->begin();
 
 	$err = 0;
 
 	// Query to find all duplicate supplier orders
-	$sql = "SELECT * FROM " . MAIN_DB_PREFIX . "commande_fournisseur";
-	$sql .= " WHERE ref IN (SELECT cf.ref FROM " . MAIN_DB_PREFIX . "commande_fournisseur cf GROUP BY cf.ref, cf.entity HAVING COUNT(cf.rowid) > 1)";
+	$sql = "SELECT * FROM ".MAIN_DB_PREFIX."commande_fournisseur";
+	$sql .= " WHERE ref IN (SELECT cf.ref FROM ".MAIN_DB_PREFIX."commande_fournisseur cf GROUP BY cf.ref, cf.entity HAVING COUNT(cf.rowid) > 1)";
 
 	// Build a list of ref => []CommandeFournisseur
 	$duplicateSupplierOrders = [];
@@ -1997,7 +1997,7 @@ 
 
 			$newRef = $supplierOrder->getNextNumRef($soc);
 
-			$sql = "UPDATE " . MAIN_DB_PREFIX . "commande_fournisseur cf SET cf.ref = '" . $db->escape($newRef) . "' WHERE cf.rowid = " . (int) $supplierOrder->id;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur cf SET cf.ref = '".$db->escape($newRef)."' WHERE cf.rowid = ".(int) $supplierOrder->id;
 			if (!$db->query($sql)) {
 				$err++;
 			}
@@ -2052,7 +2052,7 @@ 
 					// Calcul de la somme des paiements reçus
 					$sql_paiements = "SELECT SUM(amount) as somme from ".MAIN_DB_PREFIX."paiement_facture WHERE fk_facture = $obj->rowid";
 					$montantPaiements = $db->fetch_object($db->query($sql_paiements))->somme;
-					$totHt= ($obj_calcul->total_ht ? price2num($obj_calcul->total_ht, 'MT') : 0);
+					$totHt = ($obj_calcul->total_ht ? price2num($obj_calcul->total_ht, 'MT') : 0);
 					$totTva = ($obj_calcul->total_tva ? price2num($obj_calcul->total_tva, 'MT') : 0);
 					$totLocal1 = ($obj_calcul->localtax1 ? price2num($obj_calcul->localtax1, 'MT') : 0);
 					$totLocal2 = ($obj_calcul->localtax2 ? price2num($obj_calcul->localtax2, 'MT') : 0);
@@ -2065,8 +2065,8 @@ 
 							localtax1 = $totLocal1,
 							localtax2 = $totLocal2,
 							total_ttc = $totTtc,
-							fk_statut = ".($totTtc == price2num($montantPaiements, 'MT') ? 2 : 1 ).",
-							paid = ".($totTtc == price2num($montantPaiements, 'MT') ? 1 : 0 )."
+							fk_statut = ".($totTtc == price2num($montantPaiements, 'MT') ? 2 : 1).",
+							paid = ".($totTtc == price2num($montantPaiements, 'MT') ? 1 : 0)."
 						WHERE
 							rowid = $obj->rowid";
 					$db->query($sql_maj);
@@ -2130,7 +2130,7 @@ 
 							dol_mkdir($destin.'/'.$file);
 							while (($thumb = readdir($thumbs)) !== false) {
 								$res = dol_move($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb);
-								$msg = ($res ? '  * Migration successful' : 'Migration failed') . ' for file '.$origin.'/'.$file.'.<br>';
+								$msg = ($res ? '  * Migration successful' : 'Migration failed').' for file '.$origin.'/'.$file.'.<br>';
 								print ($msg);
 							}
 							// dol_delete_dir($origin.'/'.$file);
@@ -2138,7 +2138,7 @@ 
 					} else {
 						if (dol_is_file($origin.'/'.$file)) {
 							$res = dol_move($origin.'/'.$file, $destin.'/'.$file);
-							$msg = ($res ? '  * Migration successful' : 'Migration failed') . ' for file '.$origin.'/'.$file.'.<br>';
+							$msg = ($res ? '  * Migration successful' : 'Migration failed').' for file '.$origin.'/'.$file.'.<br>';
 							print ($msg);
 						}
 					}

htdocs/api/class/api_documents.class.php

Spacing +32 added lines, -32 removed lines

@@ -216,7 +216,7 @@ 
 				throw new RestException(500, 'Error generating document');
 			}
 		} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') {
-			require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 			$tmpobject = new FactureFournisseur($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
 			if (!$result) {
@@ -253,7 +253,7 @@ 
 				throw new RestException(500, 'Error generating document');
 			}
 		} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 			$tmpobject = new Contrat($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -269,7 +269,7 @@ 
 				throw new RestException(500, 'Error generating document missing doctemplate parameter');
 			}
 		} elseif ($modulepart == 'expedition' || $modulepart == 'shipment') {
-			require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
 			$tmpobject = new Expedition($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -285,7 +285,7 @@ 
 				throw new RestException(500, 'Error generating document missing doctemplate parameter');
 			}
 		} elseif ($modulepart == 'mrp') {
-			require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 
 			$tmpobject = new Mo($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -389,7 +389,7 @@ 
 				throw new RestException(404, 'User not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . '/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id;
+			$upload_dir = getMultidirOutput($object).'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id;
 		} elseif ($modulepart == 'adherent' || $modulepart == 'member') {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
@@ -403,7 +403,7 @@ 
 				throw new RestException(404, 'Member not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/".get_exdir(0, 0, 0, 1, $object, 'member');
+			$upload_dir = getMultidirOutput($object)."/".get_exdir(0, 0, 0, 1, $object, 'member');
 		} elseif ($modulepart == 'propal' || $modulepart == 'proposal') {
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
@@ -445,7 +445,7 @@ 
 				throw new RestException(404, 'Order not found');
 			}
 
-			$upload_dir = getMultidirOutput($object). "/".get_exdir(0, 0, 0, 1, $object, 'commande');
+			$upload_dir = getMultidirOutput($object)."/".get_exdir(0, 0, 0, 1, $object, 'commande');
 		} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order') {
 			$modulepart = 'supplier_order';
 
@@ -461,7 +461,7 @@ 
 				throw new RestException(404, 'Purchase order not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/commande/".dol_sanitizeFileName($object->ref);
+			$upload_dir = getMultidirOutput($object)."/commande/".dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'shipment' || $modulepart == 'expedition') {
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
@@ -475,7 +475,7 @@ 
 				throw new RestException(404, 'Shipment not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');
+			$upload_dir = getMultidirOutput($object)."/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');
 		} elseif ($modulepart == 'facture' || $modulepart == 'invoice') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -489,7 +489,7 @@ 
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/".get_exdir(0, 0, 0, 1, $object, 'invoice');
+			$upload_dir = getMultidirOutput($object)."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 		} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice') {
 			$modulepart = 'supplier_invoice';
 
@@ -505,7 +505,7 @@ 
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
+			$upload_dir = getMultidirOutput($object)."/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service') {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -535,7 +535,7 @@ 
 				throw new RestException(404, 'Event not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . '/'.dol_sanitizeFileName($object->ref);
+			$upload_dir = getMultidirOutput($object).'/'.dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'expensereport') {
 			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 
@@ -549,7 +549,7 @@ 
 				throw new RestException(404, 'Expense report not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . '/'.dol_sanitizeFileName($object->ref);
+			$upload_dir = getMultidirOutput($object).'/'.dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'ticket') {
 			require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 
@@ -577,7 +577,7 @@ 
 				throw new RestException(404, 'KM article not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . '/knowledgerecord/'.dol_sanitizeFileName($object->ref);
+			$upload_dir = getMultidirOutput($object).'/knowledgerecord/'.dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'categorie' || $modulepart == 'category') {
 			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
@@ -610,7 +610,7 @@ 
 			// $recursive = 0;
 		} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
 			$modulepart = 'contrat';
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 			$object = new Contrat($this->db);
 			$result = $object->fetch($id, $ref);
@@ -618,10 +618,10 @@ 
 				throw new RestException(404, 'Contract not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/" . get_exdir(0, 0, 0, 1, $object, 'contract');
+			$upload_dir = getMultidirOutput($object)."/".get_exdir(0, 0, 0, 1, $object, 'contract');
 		} elseif ($modulepart == 'intervention' || $modulepart == 'ficheinter') {
 			$modulepart = 'ficheinter';
-			require_once DOL_DOCUMENT_ROOT . '/fichinter/class/fichinter.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 
 			$object = new Fichinter($this->db);
 			$result = $object->fetch($id, $ref);
@@ -629,20 +629,20 @@ 
 				throw new RestException(404, 'Interventional not found');
 			}
 
-			$upload_dir = $conf->ficheinter->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'ficheinter');
+			$upload_dir = $conf->ficheinter->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'ficheinter');
 		} elseif ($modulepart == 'projet' || $modulepart == 'project') {
 			$modulepart = 'project';
-			require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 			$object = new Project($this->db);
 			$result = $object->fetch($id, $ref);
 			if (!$result) {
 				throw new RestException(404, 'Project not found');
 			}
-			$upload_dir = $conf->project->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'project');
+			$upload_dir = $conf->project->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'project');
 		} elseif ($modulepart == 'task' || $modulepart == 'project_task') {
 			$modulepart = 'project_task';
-			require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 			if (!DolibarrApiAccess::$user->hasRight('projet', 'lire')) {
 				throw new RestException(403);
@@ -660,10 +660,10 @@ 
 				throw new RestException(500, 'Error while fetching project for task');
 			}
 
-			$upload_dir = $conf->project->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . "/" . dol_sanitizeFileName($object->ref);
+			$upload_dir = $conf->project->dir_output."/".dol_sanitizeFileName($object->project->ref)."/".dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'mrp') {
 			$modulepart = 'mrp';
-			require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 
 			$object = new Mo($this->db);
 			$result = $object->fetch($id, $ref);
@@ -671,23 +671,23 @@ 
 				throw new RestException(404, 'MO not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/" . get_exdir(0, 0, 0, 1, $object, 'mrp');
+			$upload_dir = getMultidirOutput($object)."/".get_exdir(0, 0, 0, 1, $object, 'mrp');
 		} elseif ($modulepart == 'contact' || $modulepart == 'socpeople') {
 			$modulepart = 'contact';
 			require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
 			$object = new Contact($this->db);
-			$result = $object->fetch($id?$id:$ref);
+			$result = $object->fetch($id ? $id : $ref);
 			if (!$result) {
 				throw new RestException(404, 'Contact not found');
 			}
-			$upload_dir = $conf->societe->multidir_output[$object->entity ?? $conf->entity] . "/contact/" . get_exdir(0, 0, 0, 1, $object, 'contact');
+			$upload_dir = $conf->societe->multidir_output[$object->entity ?? $conf->entity]."/contact/".get_exdir(0, 0, 0, 1, $object, 'contact');
 		} else {
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
 
 		$objectType = $modulepart;
-		if (! empty($object->id) && ! empty($object->table_element)) {
+		if (!empty($object->id) && !empty($object->table_element)) {
 			$objectType = $object->table_element;
 		}
 
@@ -705,7 +705,7 @@ 
 					throw new RestException(503, 'Error when retrieve ecm list : '.$this->db->lasterror());
 				} elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
 					$count = count($filearray);
-					for ($i = 0 ; $i < $count ; $i++) {
+					for ($i = 0; $i < $count; $i++) {
 						foreach ($ecmfile->lines as $line) {
 							unset($line->db);
 							if ($filearray[$i]['name'] == $line->filename) {
@@ -885,7 +885,7 @@ 
 				$object = new Propal($this->db);
 			} elseif ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event') {
 				$modulepart = 'agenda';
-				require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 				$object = new ActionComm($this->db);
 			} elseif ($modulepart == 'contact' || $modulepart == 'socpeople') {
 				$modulepart = 'contact';
@@ -897,18 +897,18 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 				$object = new Societe($this->db);
 				$fetchbyid = true;
-			} elseif ($modulepart == 'ticket' ) {
+			} elseif ($modulepart == 'ticket') {
 				$modulepart = 'ticket';
 				require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 				$object = new Ticket($this->db);
 				$fetchbyid = true;
 			} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
 				$modulepart = 'contrat';
-				require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 				$object = new Contrat($this->db);
 			} elseif ($modulepart == 'mrp') {
 				$modulepart = 'mrp';
-				require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 				$object = new Mo($this->db);
 			} elseif ($modulepart == 'ecm') {
 				throw new RestException(500, 'Using a non empty "ref" is not compatible with using modulepart = '.$modulepart);

htdocs/fourn/facture/card.php

Spacing +53 added lines, -53 removed lines

@@ -205,7 +205,7 @@ 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
-		'@phan-var-force FactureFournisseur $objectutil';  // Same object type for cloned object
+		'@phan-var-force FactureFournisseur $objectutil'; // Same object type for cloned object
 
 		if (GETPOST('newsupplierref', 'alphanohtml')) {
 			$objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
@@ -800,7 +800,7 @@ 
 		$db->begin();
 
 		$error = 0;
-		$tmpproject = 0;  // Ensure a value
+		$tmpproject = 0; // Ensure a value
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -808,7 +808,7 @@ 
 			$error++;
 		}
 
-		$dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
+		$dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server
 		$datedue = dol_mktime(0, 0, 0, GETPOSTINT('echmonth'), GETPOSTINT('echday'), GETPOSTINT('echyear'), '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'));
@@ -847,7 +847,7 @@ 
 				$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
 				$object->socid = GETPOSTINT('socid');
 				$object->label = GETPOST('label', 'alphanohtml');
-				$object->libelle = $object->label;	// deprecated
+				$object->libelle = $object->label; // deprecated
 				$object->date = $dateinvoice;
 				$object->date_echeance = $datedue;
 				$object->note_public = GETPOST('note_public', 'restricthtml');
@@ -921,7 +921,7 @@ 
 				$object->subtype            = GETPOST('subtype', 'alphanohtml');
 				$object->socid				= GETPOSTINT('socid');
 				$object->label				= GETPOST('label', 'alphanohtml');
-				$object->libelle            = $object->label;  // Deprecated
+				$object->libelle            = $object->label; // Deprecated
 				$object->date               = $dateinvoice;
 				$object->date_echeance      = $datedue;
 				$object->note_public        = GETPOST('note_public', 'restricthtml');
@@ -1031,7 +1031,7 @@ 
 				$object->cond_reglement_id	= (GETPOSTINT('type') == 3 ? 1 : GETPOSTINT('cond_reglement_id'));
 				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
 				$object->fk_account         = GETPOSTINT('fk_account');
-				$object->amount             = (float) price2num(GETPOST('amount'));  // FIXME: FactureFournisseur::$amount is deprecated and not used?
+				$object->amount             = (float) price2num(GETPOST('amount')); // FIXME: FactureFournisseur::$amount is deprecated and not used?
 				//$object->remise_absolue		= price2num(GETPOST('remise_absolue'), 'MU');
 				//$object->remise_percent		= price2num(GETPOST('remise_percent'), '', 2);
 				$object->fk_incoterms       = GETPOSTINT('incoterm_id');
@@ -1084,28 +1084,28 @@ 
 				$tmpproject = GETPOSTINT('projectid');
 
 				// Creation invoice
-				$object->socid				= GETPOSTINT('socid');
-				$object->type				= GETPOST('type', 'alphanohtml');
-				$object->subtype            = GETPOSTINT('subtype');
-				$object->ref				= GETPOST('ref', 'alphanohtml');
-				$object->ref_supplier		= GETPOST('ref_supplier', 'alphanohtml');
+				$object->socid = GETPOSTINT('socid');
+				$object->type = GETPOST('type', 'alphanohtml');
+				$object->subtype = GETPOSTINT('subtype');
+				$object->ref = GETPOST('ref', 'alphanohtml');
+				$object->ref_supplier = GETPOST('ref_supplier', 'alphanohtml');
 				$object->socid				= GETPOSTINT('socid');
 				$object->label				= GETPOST('label', 'alphanohtml');
-				$object->libelle			= $object->label;	// deprecated
-				$object->date				= $dateinvoice;
-				$object->date_echeance		= $datedue;
-				$object->note_public		= GETPOST('note_public', 'restricthtml');
-				$object->note_private		= GETPOST('note_private', 'restricthtml');
+				$object->libelle = $object->label; // deprecated
+				$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	= GETPOSTINT('cond_reglement_id');
 				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
 				$object->fk_account			= GETPOSTINT('fk_account');
 				$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->fk_project			= ($tmpproject > 0) ? $tmpproject : null;
-				$object->fk_incoterms		= GETPOSTINT('incoterm_id');
+				$object->fk_incoterms = GETPOSTINT('incoterm_id');
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx	= GETPOSTFLOAT('originmulticurrency_tx');
-				$object->transport_mode_id	= GETPOSTINT('transport_mode_id');
+				$object->multicurrency_tx = GETPOSTFLOAT('originmulticurrency_tx');
+				$object->transport_mode_id = GETPOSTINT('transport_mode_id');
 
 				// Auto calculation of date due if not filled by user
 				if (empty($object->date_echeance)) {
@@ -1318,7 +1318,7 @@ 
 									0,
 									$object->lines[0]->date_start,
 									$object->lines[0]->date_end,
-									array(),  // array_options
+									array(), // array_options
 									0,
 									0,
 									'',
@@ -1467,7 +1467,7 @@ 
 		// Edit line
 		$db->begin();
 
-		if (! $object->fetch($id) > 0) {
+		if (!$object->fetch($id) > 0) {
 			dol_print_error($db);
 		}
 		$object->fetch_thirdparty();
@@ -1638,7 +1638,7 @@ 
 			$price_ttc_devise = price2num(GETPOST('multicurrency_price_ttc'), 'CU', 2);
 		}
 
-		$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)'
 
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
 
@@ -1781,7 +1781,7 @@ 
 
 				// Get vat rate
 				if (!GETPOSTISSET('tva_tx')) {	// If vat rate not provided from the form (the form has the priority)
-					$tmpidprodfournprice = GETPOST('idprodfournprice', 'alpha');	// can be an id of price, or -1, -2, -99 or 'idprod_...'
+					$tmpidprodfournprice = GETPOST('idprodfournprice', 'alpha'); // can be an id of price, or -1, -2, -99 or 'idprod_...'
 					if (is_numeric($tmpidprodfournprice) && (int) $tmpidprodfournprice > 0) {
 						$tmpidprodfournprice = (int) $tmpidprodfournprice;
 					} else {
@@ -2063,7 +2063,7 @@ 
 		}
 	}
 	if ($action == 'update_extras' && $permissiontoeditextra) {
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		$attribute_name = GETPOST('attribute', 'aZ09');
 
@@ -2154,7 +2154,7 @@ 
 // Mode creation
 if ($action == 'create') {
 	$facturestatic = new FactureFournisseur($db);
-	$selectedLines = array();  // Ensure initialised
+	$selectedLines = array(); // Ensure initialised
 
 	print load_fiche_titre($langs->trans('NewSupplierInvoice'), '', 'supplier_invoice');
 
@@ -2172,7 +2172,7 @@ 
 		}
 	}
 
-	$objectsrc = null;  // Initialise
+	$objectsrc = null; // Initialise
 	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = $origin;
@@ -2351,7 +2351,7 @@ 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="changecompany" value="0">';	// will be set to 1 by javascript so we know post is done after a company change
+	print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change
 
 	if (!empty($societe->id) && $societe->id > 0) {
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">'."\n";
@@ -2435,7 +2435,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) {
@@ -2502,7 +2502,7 @@ 
 			// Deposit - Down payment
 			if (!getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-				$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOSTINT('type') == 3 ? ' checked' : '') . '> ';
+				$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"'.(GETPOSTINT('type') == 3 ? ' checked' : '').'> ';
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					jQuery("#typestandardinvoice, #valuestandardinvoice").click(function() {
@@ -2572,7 +2572,7 @@ 
 					print $form->selectarray('typedeposit', $arraylist, $typedeposit, 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="' . $valuedeposit . '"/>';
+					print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="'.$valuedeposit.'"/>';
 					print '</td>';
 				}
 				print '</tr></table>';
@@ -2821,8 +2821,8 @@ 
 
 		// Vat reverse-charge by default
 		if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-			print '<tr><td>' . $langs->trans('VATReverseCharge') . '</td><td>';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+			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 (GETPOSTISSET('vat_reverse_charge')) {  // Check if form was submitted previously
 				$vat_reverse_charge = (GETPOST('vat_reverse_charge', 'alpha') == 'on' || GETPOST('vat_reverse_charge', 'alpha') == '1') ? 1 : 0;
@@ -2832,7 +2832,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>';
 		}
 
@@ -3404,7 +3404,7 @@ 
 					$creditnote->fetch($invoiceid);
 					$invoicecredits[] = $creditnote->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) {
@@ -3551,12 +3551,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>';
 			}
@@ -3652,15 +3652,15 @@ 
 			include DOL_DOCUMENT_ROOT.'/core/tpl/object_currency_amount.tpl.php';
 
 			print '<tr>';
-			print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_ht, 0, $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, 0, $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, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ht, 0, $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');
@@ -3674,40 +3674,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&token='.newToken().'&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&token='.newToken().'&calculationrule=totalofround">'.$langs->trans("Mode1").'</a>';
 				$s .= ' / ';
-				$s .= '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=calculate&token='.newToken().'&calculationrule=roundoftotal">' . $langs->trans("Mode2") . '</a>';
+				$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&token='.newToken().'&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 '<span class="nowraponall">'.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency).'</span>';
 			print '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowraponall amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowraponall amountcard right">'.price($object->multicurrency_total_tva, 0, $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, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td>'.$langs->trans('AmountTTC').'</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_ttc, 0, $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, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 
@@ -4249,7 +4249,7 @@ 
 				}
 
 				// Clone as predefined / Create template
-				if (($object->type ==  FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->status == 0 && $usercancreate) {
+				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->status == 0 && $usercancreate) {
 					if (!$objectidnext && count($object->lines) > 0) {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card-rec.php?facid='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableInvoice").'</a>';
 					}

htdocs/modulebuilder/template/core/modules/modMyModule.class.php

Spacing +4 added lines, -4 removed lines

@@ -72,8 +72,8 @@ 
 
 		// Author
 		$this->editor_name = 'Editor name';
-		$this->editor_url = 'https://www.example.com';		// Must be an external online web site
-		$this->editor_squarred_logo = '';					// Must be image filename into the module/img directory followed with @modulename. Example: 'myimage.png@mymodule'
+		$this->editor_url = 'https://www.example.com'; // Must be an external online web site
+		$this->editor_squarred_logo = ''; // Must be image filename into the module/img directory followed with @modulename. Example: 'myimage.png@mymodule'
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated', 'experimental_deprecated' or a version string like 'x.y.z'
 		$this->version = '1.0';
@@ -163,8 +163,8 @@ 
 		$this->need_javascript_ajax = 0;
 
 		// Messages at activation
-		$this->warnings_activation = array(); 		// Warning to show when we activate a module. Example: array('always'='text') or array('FR'='textfr','MX'='textmx'...)
-		$this->warnings_activation_ext = array(); 	// Warning to show when we activate a module if another module is on. Example: array('modOtherModule' => array('always'=>'text')) or array('always' => array('FR'=>'textfr','MX'=>'textmx'...))
+		$this->warnings_activation = array(); // Warning to show when we activate a module. Example: array('always'='text') or array('FR'='textfr','MX'='textmx'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate a module if another module is on. Example: array('modOtherModule' => array('always'=>'text')) or array('always' => array('FR'=>'textfr','MX'=>'textmx'...))
 		//$this->automatic_activation = array('FR'=>'MyModuleWasAutomaticallyActivatedBecauseOfYourCountryChoice');
 		//$this->always_enabled = false;			// If true, can't be disabled. Value true is reserved for core modules. Not allowed for external modules.