Dolibarr / dolibarr

htdocs/projet/class/api_projects.class.php

Spacing +38 added lines, -38 removed lines

@@ -22,8 +22,8 @@ 
 
 use Luracast\Restler\RestException;
 
-require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 /**
  * API class for projects
@@ -85,7 +85,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$this->project->fetchObjectLinked();
@@ -116,7 +116,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$this->project->fetchObjectLinked();
@@ -147,7 +147,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$this->project->fetchObjectLinked();
@@ -178,7 +178,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$this->project->fetchObjectLinked();
@@ -221,34 +221,34 @@ 
 		}
 
 		$sql = "SELECT t.rowid";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe AS s ON (s.rowid = t.fk_soc)";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe AS s ON (s.rowid = t.fk_soc)";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
 		if ($category > 0) {
-			$sql .= ", " . MAIN_DB_PREFIX . "categorie_project as c";
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_project as c";
 		}
-		$sql .= ' WHERE t.entity IN (' . getEntity('project') . ')';
+		$sql .= ' WHERE t.entity IN ('.getEntity('project').')';
 		if ($socids) {
-			$sql .= " AND t.fk_soc IN (" . $this->db->sanitize($socids) . ")";
+			$sql .= " AND t.fk_soc IN (".$this->db->sanitize($socids).")";
 		}
 		// Search on sale representative
 		if ($search_sale && $search_sale != '-1') {
 			if ($search_sale == -2) {
-				$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc)";
+				$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc)";
 			} elseif ($search_sale > 0) {
-				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc AND sc.fk_user = " . ((int) $search_sale) . ")";
+				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
 			}
 		}
 		// Select projects of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = " . ((int) $category) . " AND c.fk_project = t.rowid ";
+			$sql .= " AND c.fk_categorie = ".((int) $category)." AND c.fk_project = t.rowid ";
 		}
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
 			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
 			if ($errormessage) {
-				throw new RestException(400, 'Error when validating parameter sqlfilters -> ' . $errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 		}
 
@@ -281,7 +281,7 @@ 
 				$i++;
 			}
 		} else {
-			throw new RestException(503, 'Error when retrieve project list : ' . $this->db->lasterror());
+			throw new RestException(503, 'Error when retrieve project list : '.$this->db->lasterror());
 		}
 
 		//if $pagination_data is true the response will contain element data with all values and element pagination with pagination data(total,page,limit)
@@ -349,7 +349,7 @@ 
 
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 			foreach ($dirmodels as $reldir) {
-				$file = dol_buildpath($reldir . "core/modules/project/" . $modele . '.php', 0);
+				$file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
 				if (file_exists($file)) {
 					$filefound = 1;
 					$classname = $modele;
@@ -357,16 +357,16 @@ 
 				}
 			}
 			if ($filefound && !empty($classname)) {
-				$result = dol_include_once($reldir . "core/modules/project/" . $modele . '.php');
+				$result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
 				if ($result !== false && class_exists($classname)) {
 					$modProject = new $classname();
 					'@phan-var-force ModeleNumRefProjects $modProject';
 					$defaultref = $modProject->getNextValue(null, $this->project);
 				} else {
-					dol_syslog("Failed to include module file or invalid classname: " . $reldir . "core/modules/project/" . $modele . '.php', LOG_ERR);
+					dol_syslog("Failed to include module file or invalid classname: ".$reldir."core/modules/project/".$modele.'.php', LOG_ERR);
 				}
 			} else {
-				dol_syslog("Module file not found or classname is empty: " . $modele, LOG_ERR);
+				dol_syslog("Module file not found or classname is empty: ".$modele, LOG_ERR);
 			}
 
 			if (is_numeric($defaultref) && $defaultref <= 0) {
@@ -374,7 +374,7 @@ 
 			}
 
 			if (empty($defaultref)) {
-				$defaultref = 'PJ' . dol_print_date(dol_now(), 'dayrfc');
+				$defaultref = 'PJ'.dol_print_date(dol_now(), 'dayrfc');
 			}
 
 			$this->project->ref = $defaultref;
@@ -417,12 +417,12 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('ficheinter', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->project->add_contact($fk_socpeople, $type_contact, $source, $notrigger);
 		if ($result < 0) {
-			throw new RestException(500, 'Error : ' . $this->project->error);
+			throw new RestException(500, 'Error : '.$this->project->error);
 		}
 
 		return $this->_cleanObjectDatas($this->project);
@@ -455,7 +455,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach (array('internal', 'external') as $source) {
 			$contacts = $this->project->liste_contact(-1, $source);
@@ -495,7 +495,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		$this->project->getLinesArray(DolibarrApiAccess::$user);
 		$result = array();
@@ -535,10 +535,10 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$taskstatic = new Task($this->db);
 		$userp = DolibarrApiAccess::$user;
 		if ($userid > 0) {
@@ -713,7 +713,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
 			if ($field == 'id') {
@@ -761,11 +761,11 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		if (!$this->project->delete(DolibarrApiAccess::$user)) {
-			throw new RestException(500, 'Error when delete project : ' . $this->project->error);
+			throw new RestException(500, 'Error when delete project : '.$this->project->error);
 		}
 
 		return array(
@@ -809,7 +809,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->project->setValid(DolibarrApiAccess::$user, $notrigger);
@@ -817,7 +817,7 @@ 
 			throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}
 		if ($result < 0) {
-			throw new RestException(500, 'Error when validating Project: ' . $this->project->error);
+			throw new RestException(500, 'Error when validating Project: '.$this->project->error);
 		}
 
 		return array(
@@ -1044,7 +1044,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$contacts = $this->project->liste_contact(-1, 'external', 0, $type);
@@ -1086,13 +1086,13 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		// Ajouter le contact au projet
 		$result = $this->project->add_contact($fk_socpeople, $type_contact, $source, $notrigger);
 		if ($result <= 0) {
-			throw new RestException(500, 'Error : ' . $this->project->error . 'result :' . $result);
+			throw new RestException(500, 'Error : '.$this->project->error.'result :'.$result);
 		}
 
 		// Si demandé, ajouter le contact aux tâches
@@ -1141,7 +1141,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		foreach (array('internal', 'external') as $source) {
@@ -1183,7 +1183,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 

htdocs/projet/class/api_tasks.class.php

Spacing +33 added lines, -33 removed lines

@@ -21,8 +21,8 @@ 
 
 use Luracast\Restler\RestException;
 
-require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 
 /**
@@ -80,7 +80,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		if ($includetimespent == 1) {
@@ -130,19 +130,19 @@ 
 		}
 
 		$sql = "SELECT t.rowid";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task AS t";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_task_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "projet AS p ON p.rowid = t.fk_projet";
-		$sql .= ' WHERE t.entity IN (' . getEntity('project') . ')';
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task AS t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."projet AS p ON p.rowid = t.fk_projet";
+		$sql .= ' WHERE t.entity IN ('.getEntity('project').')';
 		if ($socids) {
-			$sql .= " AND t.fk_soc IN (" . $this->db->sanitize((string) $socids) . ")";
+			$sql .= " AND t.fk_soc IN (".$this->db->sanitize((string) $socids).")";
 		}
 		// Search on sale representative
 		if ($search_sale && $search_sale != '-1') {
 			if ($search_sale == -2) {
-				$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc)";
+				$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc)";
 			} elseif ($search_sale > 0) {
-				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = " . ((int) $search_sale) . ")";
+				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
 			}
 		}
 		// Add sql filters
@@ -150,7 +150,7 @@ 
 			$errormessage = '';
 			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
 			if ($errormessage) {
-				throw new RestException(400, 'Error when validating parameter sqlfilters -> ' . $errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 		}
 
@@ -180,7 +180,7 @@ 
 				$i++;
 			}
 		} else {
-			throw new RestException(503, 'Error when retrieve task list : ' . $this->db->lasterror());
+			throw new RestException(503, 'Error when retrieve task list : '.$this->db->lasterror());
 		}
 
 		return $obj_ret;
@@ -239,16 +239,16 @@ 
 				}
 			}
 			if ($filefound && !empty($classname)) {
-				$result = dol_include_once($reldir . "core/modules/project/task/" . $modele . '.php');
+				$result = dol_include_once($reldir."core/modules/project/task/".$modele.'.php');
 				if ($result !== false && class_exists($classname)) {
 					$modTask = new $classname();
 					'@phan-var-force ModeleNumRefTask $modTask';
 					$defaultref = $modTask->getNextValue(null, $this->task);
 				} else {
-					dol_syslog("Failed to include module file or invalid classname: " . $reldir . "core/modules/project/task/" . $modele . '.php', LOG_ERR);
+					dol_syslog("Failed to include module file or invalid classname: ".$reldir."core/modules/project/task/".$modele.'.php', LOG_ERR);
 				}
 			} else {
-				dol_syslog("Module file not found or classname is empty: " . $modele, LOG_ERR);
+				dol_syslog("Module file not found or classname is empty: ".$modele, LOG_ERR);
 			}
 
 			if (is_numeric($defaultref) && $defaultref <= 0) {
@@ -256,7 +256,7 @@ 
 			}
 
 			if (empty($defaultref)) {
-				$defaultref = 'TK' . dol_print_date(dol_now(), 'dayrfc');
+				$defaultref = 'TK'.dol_print_date(dol_now(), 'dayrfc');
 			}
 
 			$this->task->ref = $defaultref;
@@ -289,7 +289,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('tasks', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		$this->task->fetchTimeSpentOnTask();
 		$result = array();
@@ -324,7 +324,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('tasks', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$usert = DolibarrApiAccess::$user;
@@ -497,7 +497,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
 			if ($field == 'id') {
@@ -546,11 +546,11 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		if ($this->task->delete(DolibarrApiAccess::$user) <= 0) {
-			throw new RestException(500, 'Error when delete task : ' . $this->task->error);
+			throw new RestException(500, 'Error when delete task : '.$this->task->error);
 		}
 
 		return array(
@@ -593,7 +593,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->task->fk_project)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$uid = $user_id;
@@ -609,14 +609,14 @@ 
 		$this->task->timespent_fk_user  = $uid;
 		$this->task->timespent_note     = $note;
 		if (!empty($this->task->progress))
-			$this->task->progress  		= $progress;
+			$this->task->progress = $progress;
 
 		$result = $this->task->addTimeSpent(DolibarrApiAccess::$user, 0);
 		if ($result == 0) {
 			throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}
 		if ($result < 0) {
-			throw new RestException(500, 'Error when adding time: ' . $this->task->error);
+			throw new RestException(500, 'Error when adding time: '.$this->task->error);
 		}
 
 		return array(
@@ -654,7 +654,7 @@ 
 		$this->timespentRecordChecks($id, $timespent_id);
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$newdate = dol_stringtotime($date, 1);
@@ -670,7 +670,7 @@ 
 			throw new RestException(304, 'Error nothing done.');
 		}
 		if ($result < 0) {
-			throw new RestException(500, 'Error when updating time spent: ' . $this->task->error);
+			throw new RestException(500, 'Error when updating time spent: '.$this->task->error);
 		}
 
 		return array(
@@ -701,11 +701,11 @@ 
 		$this->timespentRecordChecks($id, $timespent_id);
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		if ($this->task->delTimeSpent(DolibarrApiAccess::$user, 0) < 0) {
-			throw new RestException(500, 'Error when deleting time spent: ' . $this->task->error);
+			throw new RestException(500, 'Error when deleting time spent: '.$this->task->error);
 		}
 
 		return array(
@@ -838,7 +838,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$contacts = $this->task->liste_contact(-1, 'external', 0, $type);
@@ -846,7 +846,7 @@ 
 
 		$contacts = array_merge($contacts, $socpeoples);
 
-		return $contacts;	// Return array
+		return $contacts; // Return array
 	}
 
 	/**
@@ -879,12 +879,12 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->task->add_contact($fk_socpeople, $type_contact, $source, $notrigger);
 		if ($result <= 0) {
-			throw new RestException(500, 'Error : ' . $this->task->error);
+			throw new RestException(500, 'Error : '.$this->task->error);
 		}
 
 		$result = $this->task->fetch($id);
@@ -922,7 +922,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		foreach (array('internal', 'external') as $source) {

htdocs/compta/facture/card.php

Spacing +71 added lines, -71 removed lines

@@ -91,14 +91,14 @@ 
 }
 
 // General $Variables
-$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid'));    // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');					// if not set, a default page will be used
-$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');	// if not set, $backtopage will be used
+$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
 $lineid = GETPOSTINT('lineid');
 $userid = GETPOSTINT('userid');
 $search_ref = GETPOST('sf_ref', 'alpha') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
@@ -274,7 +274,7 @@ 
 					setEventMessages('', $warningMsgLineList, 'warnings');
 				}
 
-				header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $result);
+				header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
 				exit();
 			} else {
 				$langs->load("errors");
@@ -399,7 +399,7 @@ 
 		// Validation
 		$object->fetch($id);
 
-		if ((preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) &&	// empty should not happened, but when it occurs, the test save life
+		if ((preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) && // empty should not happened, but when it occurs, the test save life
 			getDolGlobalString('FAC_FORCE_DATE_VALIDATION')								// If option enabled, we force invoice date
 		) {
 			$object->date = dol_now();
@@ -841,8 +841,8 @@ 
 			// We check if invoice has payments
 			$totalpaid = 0;
 			$sql = 'SELECT pf.amount';
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . 'paiement_facture as pf';
-			$sql .= ' WHERE pf.fk_facture = ' . ((int) $object->id);
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
+			$sql .= ' WHERE pf.fk_facture = '.((int) $object->id);
 
 			$result = $db->query($sql);
 			if ($result) {
@@ -918,7 +918,7 @@ 
 					$tempTva->datev = $object->date;
 					$tempTva->datep = $object->date;
 					$tempTva->amount = $amount;
-					$tempTva->label = $langs->trans('WithholdingTax') . ' - ' . $object->ref;
+					$tempTva->label = $langs->trans('WithholdingTax').' - '.$object->ref;
 					//$tempTva->paye = 1;
 					$valid = $tempTva->getIdForLabel($tempTva->label);
 					if (!$valid) {
@@ -946,7 +946,7 @@ 
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 				} else {
-					$object->fetch($object->id);	// Reload properties
+					$object->fetch($object->id); // Reload properties
 				}
 			}
 		} else {
@@ -962,7 +962,7 @@ 
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
-				$object->fetch($object->id);	// Reload properties
+				$object->fetch($object->id); // Reload properties
 			}
 		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
@@ -1163,7 +1163,7 @@ 
 					// Set invoice as paid
 					$result = $object->setPaid($user);
 					if ($result >= 0) {
-						$object->fetch($object->id);	// Reload properties
+						$object->fetch($object->id); // Reload properties
 						$db->commit();
 					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -1214,7 +1214,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
 		$date_pointoftax = dol_mktime(0, 0, 0, GETPOSTINT('date_pointoftaxmonth'), GETPOSTINT('date_pointoftaxday'), GETPOSTINT('date_pointoftaxyear'), 'tzserver');
 
 		// Replacement invoice
@@ -1246,7 +1246,7 @@ 
 				$object->note_private		= trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client			= GETPOST('ref_client', 'alphanohtml');
 				$object->ref_customer		= GETPOST('ref_client', 'alphanohtml');
-				$object->model_pdf          = GETPOST('model', 'alphanohtml');
+				$object->model_pdf = GETPOST('model', 'alphanohtml');
 				$object->fk_project			= GETPOSTINT('projectid');
 				$object->cond_reglement_id	= GETPOSTINT('cond_reglement_id');
 				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
@@ -1307,9 +1307,9 @@ 
 				$object->note_private		= trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client			= GETPOST('ref_client', 'alphanohtml');
 				$object->ref_customer		= GETPOST('ref_client', 'alphanohtml');
-				$object->model_pdf          = GETPOST('model');
+				$object->model_pdf = GETPOST('model');
 				$object->fk_project			= GETPOSTINT('projectid');
-				$object->cond_reglement_id	= 0;		// No payment term for a credit note
+				$object->cond_reglement_id	= 0; // No payment term for a credit note
 				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
 				$object->fk_account         = GETPOSTINT('fk_account');
 				//$object->remise_absolue		= price2num(GETPOST('remise_absolue'), 'MU');
@@ -1636,7 +1636,7 @@ 
 				$object->note_public		= trim(GETPOST('note_public', 'restricthtml'));
 				$object->note_private       = trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client			= GETPOST('ref_client');
-				$object->ref_customer		= GETPOST('ref_client');
+				$object->ref_customer = GETPOST('ref_client');
 				$object->model_pdf          = GETPOST('model');
 				$object->fk_project			= GETPOSTINT('projectid');
 				$object->cond_reglement_id	= (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
@@ -1700,7 +1700,7 @@ 
 						$element = $subelement = 'expedition';
 					}
 
-					$object->origin = $origin;		// deprecated
+					$object->origin = $origin; // deprecated
 					$object->origin_type = $origin;
 					$object->origin_id = $originid;
 
@@ -1735,7 +1735,7 @@ 
 						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines or deposit lines");
 						$result = $srcobject->fetch($object->origin_id);
 
-						$i = -1;  // Ensure initialised for static analysis, but with invalid idx.
+						$i = -1; // Ensure initialised for static analysis, but with invalid idx.
 						// If deposit invoice - down payment with 1 line (fixed amount or percent)
 						if (GETPOST('type') == Facture::TYPE_DEPOSIT && in_array($typeamount, array('amount', 'variable'))) {
 							// Define the array $amountdeposit
@@ -2160,7 +2160,7 @@ 
 				if (!empty($origin) && !empty($originid)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-					$object->origin = $origin;		// deprecated
+					$object->origin = $origin; // deprecated
 					$object->origin_type = $origin;
 					$object->origin_id = $originid;
 
@@ -2186,7 +2186,7 @@ 
 						$line->fk_prev_id = $line->id;
 						$line->fetch_optionals();
 						if (getDolGlobalInt('INVOICE_USE_SITUATION') == 2) {
-							$line->situation_percent = 0;  // New situation percent must be 0 (No cumulative)
+							$line->situation_percent = 0; // New situation percent must be 0 (No cumulative)
 						} else {
 							$line->situation_percent = $line->get_prev_progress($object->id); // get good progress including credit note
 						}
@@ -2303,7 +2303,7 @@ 
 		} else {
 			$db->rollback();
 			$action = 'create';
-			$_GET["origin"] = $_POST["origin"];		// Keep GET and POST here ?
+			$_GET["origin"] = $_POST["origin"]; // Keep GET and POST here ?
 			$_GET["originid"] = $_POST["originid"]; // Keep GET and POST here ?
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -2769,7 +2769,7 @@ 
 			 */
 
 			// Margin
-			$fournprice = (int) (GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');				// This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
+			$fournprice = (int) (GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : ''); // This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
 			$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we must keep this value
 
 
@@ -2905,7 +2905,7 @@ 
 				if ($prod->price_min > $line->subprice) {
 					$price_subprice = price($line->subprice, 0, $outlangs, 1, -1, -1, 'auto');
 					$price_price_min = price($prod->price_min, 0, $outlangs, 1, -1, -1, 'auto');
-					setEventMessages($prod->ref . ' - ' . $prod->label . ' (' . $price_subprice . ' < ' . $price_price_min . ' ' . strtolower($langs->trans("MinPrice")) . ')' . "\n", null, 'warnings');
+					setEventMessages($prod->ref.' - '.$prod->label.' ('.$price_subprice.' < '.$price_price_min.' '.strtolower($langs->trans("MinPrice")).')'."\n", null, 'warnings');
 				} else {
 					setEventMessages($prod->error, $prod->errors, 'errors');
 				}
@@ -3056,7 +3056,7 @@ 
 		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty);
 
 		// Add buying price
-		$fournprice = (int) (GETPOST('fournprice') ? GETPOST('fournprice') : '');				// This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
+		$fournprice = (int) (GETPOST('fournprice') ? GETPOST('fournprice') : ''); // This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
 		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we must keep this value
 
 		// Prepare a price equivalent for minimum price check
@@ -3099,7 +3099,7 @@ 
 		// Define special_code for special lines
 		$special_code = GETPOSTINT('special_code');
 		if ($special_code == 3) {
-			$special_code = 0;	// Options should not exists on invoices
+			$special_code = 0; // Options should not exists on invoices
 		}
 
 		$line = new FactureLigne($db);
@@ -3553,7 +3553,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');
 
@@ -3670,7 +3670,7 @@ 
 	$fk_account = GETPOSTINT('fk_account');
 
 	// Load objectsrc
-	$objectsrc = null;  // Initialise
+	$objectsrc = null; // Initialise
 	//$remise_absolue = 0;
 	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
@@ -3681,7 +3681,7 @@ 
 			$subelement = $regs[2];
 		}
 
-		$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
 		$date_pointoftax = dol_mktime(0, 0, 0, GETPOSTINT('date_pointoftaxmonth'), GETPOSTINT('date_pointoftaxday'), GETPOSTINT('date_pointoftaxyear'), 'tzserver');
 
 		if ($element == 'project') {
@@ -3761,8 +3761,8 @@ 
 				$fk_account        = (!empty($expesrc->fk_account) ? $expesrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : 0));
 
 				if (isModEnabled('multicurrency')) {
-					$currency_code 	= (!empty($expesrc->multicurrency_code) ? $expesrc->multicurrency_code : (!empty($soc->multicurrency_code) ? $soc->multicurrency_code : $objectsrc->multicurrency_code));
-					$currency_tx 	= (!empty($expesrc->multicurrency_tx) ? $expesrc->multicurrency_tx : (!empty($soc->multicurrency_tx) ? $soc->multicurrency_tx : $objectsrc->multicurrency_tx));
+					$currency_code = (!empty($expesrc->multicurrency_code) ? $expesrc->multicurrency_code : (!empty($soc->multicurrency_code) ? $soc->multicurrency_code : $objectsrc->multicurrency_code));
+					$currency_tx = (!empty($expesrc->multicurrency_tx) ? $expesrc->multicurrency_tx : (!empty($soc->multicurrency_tx) ? $soc->multicurrency_tx : $objectsrc->multicurrency_tx));
 				}
 
 				// replicate input reason
@@ -3862,7 +3862,7 @@ 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST" id="formtocreate" name="formtocreate">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" id="formtocreateaction" 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 ($soc->id > 0) {
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
 	}
@@ -4051,7 +4051,7 @@ 
 			print $form->selectarray('typestandard', $arraylist, GETPOST('typestandard', 'aZ09'), 0, 0, 0, '', 1);
 			print '</td>';*/
 			if (!getDolGlobalInt('INVOICE_DEPOSIT_INVOICE_ONLY_SAME_LINES')) {
-				print '<span class="opacitymedium marginleftonly">' . $langs->trans('PercentOfOriginalObject') . '</span>:<input class="right" placeholder="100%" type="text" id="valuestandardinvoice" name="valuestandardinvoice" size="3" value="' . (GETPOSTISSET('valuestandardinvoice') ? GETPOST('valuestandardinvoice', 'alpha') : '100%') . '"/>';
+				print '<span class="opacitymedium marginleftonly">'.$langs->trans('PercentOfOriginalObject').'</span>:<input class="right" placeholder="100%" type="text" id="valuestandardinvoice" name="valuestandardinvoice" size="3" value="'.(GETPOSTISSET('valuestandardinvoice') ? GETPOST('valuestandardinvoice', 'alpha') : '100%').'"/>';
 			}
 		}
 		print '</div></div>'."\n";
@@ -4405,8 +4405,8 @@ 
 		if ($socid > 0) {
 			print '<tr><td>'.$langs->trans('DiscountStillRemaining').'</td><td colspan="2">';
 
-			$thirdparty = $soc;	// used by object_discounts.tpl.php
-			$discount_type = 0;	// used by object_discounts.tpl.php
+			$thirdparty = $soc; // used by object_discounts.tpl.php
+			$discount_type = 0; // used by object_discounts.tpl.php
 			$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode((string) (GETPOST('origin'))).'&originid='.urlencode((string) (GETPOSTINT('originid')));
 
 			// loading object_discounts.tpl.php from module core/tpl if exists
@@ -4466,7 +4466,7 @@ 
 			if (empty($retained_warranty)) {
 				if ($objectsrc !== null && property_exists($objectsrc, 'retained_warranty') && !empty($objectsrc->retained_warranty)) { // use previous situation value
 					// Facture->retained_warranty  (does not exist on Expedition)
-					$retained_warranty = $objectsrc->retained_warranty;  // @phan-suppress-current-line PhanUndeclaredProperty
+					$retained_warranty = $objectsrc->retained_warranty; // @phan-suppress-current-line PhanUndeclaredProperty
 				}
 			}
 			$retained_warranty_js_default = !empty($retained_warranty) ? $retained_warranty : getDolGlobalString('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT');
@@ -4975,7 +4975,7 @@ 
 		$nbMandated = 0;
 		foreach ($object->lines as $line) {
 			$res = $line->fetch_product();
-			if ($res  > 0) {
+			if ($res > 0) {
 				if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end))) {
 					$nbMandated++;
 					break;
@@ -5218,7 +5218,7 @@ 
 	}
 	// Ref customer
 	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_customer, $object, (int) $usercancreate, 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_customer, $object, (int) $usercancreate, 'string'.(getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_customer, $object, (int) $usercancreate, 'string'.(getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer');
 	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
@@ -5350,7 +5350,7 @@ 
 			print '</td><td class="valuefield fieldname_type">';
 			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="formposinfo">';
 			print '<input type="hidden" name="action" value="setposinfo">';
-			print '<input type="hidden" name="token" value="' . newToken() . '">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			if ($action == 'editposinfo') {
 				print '<input type="text" class="maxwidth150" name="posmodule" placeholder="'.$langs->trans("POSModule").'" value="'.$object->module_source.'"> ';
 				print '<input type="text" class="maxwidth100" name="posterminal" placeholder="'.$langs->trans("Terminal").'" value="'.$object->pos_source.'">';
@@ -5713,45 +5713,45 @@ 
 		}
 		print '<tr>';
 		// Amount HT
-		print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-		print '<td class="nowraponall amountcard right">' . price($sign * $object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
+		print '<td class="nowraponall amountcard right">'.price($sign * $object->total_ht, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 			// Multicurrency Amount HT
-			print '<td class="nowraponall amountcard right">' . price($sign * $object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowraponall amountcard right">'.price($sign * $object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
 		print '<tr>';
 		// Amount VAT
-		print '<td>' . $langs->trans('AmountVAT') . '</td>';
-		print '<td class="nowraponall amountcard right">' . price($sign * $object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td>'.$langs->trans('AmountVAT').'</td>';
+		print '<td class="nowraponall amountcard right">'.price($sign * $object->total_tva, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 			// Multicurrency Amount VAT
-			print '<td class="nowraponall amountcard right">' . price($sign * $object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowraponall amountcard right">'.price($sign * $object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
 		// Amount Local Taxes
 		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) {
 			print '<tr>';
-			print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-			print '<td class="nowraponall amountcard right">' . price($sign * $object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="titlefieldmiddle">'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+			print '<td class="nowraponall amountcard right">'.price($sign * $object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 				$object->multicurrency_total_localtax1 = (float) price2num($object->total_localtax1 * $object->multicurrency_tx, 'MT');
 
-				print '<td class="nowraponall amountcard right">' . price($sign * $object->multicurrency_total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowraponall amountcard right">'.price($sign * $object->multicurrency_total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 		}
 
 		if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) {
 			print '<tr>';
-			print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-			print '<td class="nowraponall amountcard right">' . price($sign * $object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+			print '<td class="nowraponall amountcard right">'.price($sign * $object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 				$object->multicurrency_total_localtax2 = (float) price2num($object->total_localtax2 * $object->multicurrency_tx, 'MT');
 
-				print '<td class="nowraponall amountcard right">' . price($sign * $object->multicurrency_total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowraponall amountcard right">'.price($sign * $object->multicurrency_total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 		}
@@ -5811,11 +5811,11 @@ 
 
 		print '<tr>';
 		// Amount TTC
-		print '<td>' . $langs->trans('AmountTTC') . '</td>';
-		print '<td class="nowraponall amountcard right">' . price($sign * $object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td>'.$langs->trans('AmountTTC').'</td>';
+		print '<td class="nowraponall amountcard right">'.price($sign * $object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 			// Multicurrency Amount TTC
-			print '<td class="nowrap amountcard right">' . price($sign * $object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">'.price($sign * $object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
@@ -6109,7 +6109,7 @@ 
 		if ($object->type != Facture::TYPE_CREDIT_NOTE) {
 			// Total already paid
 			print '<tr>';
-			print '<td colspan="'.($nbcols+1).'" class="right">';
+			print '<td colspan="'.($nbcols + 1).'" class="right">';
 			print '<span class="opacitymedium">';
 			if ($object->type != Facture::TYPE_DEPOSIT) {
 				print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
@@ -6191,7 +6191,7 @@ 
 			// Partially paid or abandoned 'badcustomer'
 			if (($object->status == Facture::STATUS_CLOSED || $object->status == Facture::STATUS_ABANDONED) && $object->close_code == 'badcustomer') {
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="nowrap right">';
+				print '<td colspan="'.($nbcols + 1).'" class="nowrap right">';
 				print '<span class="opacitymedium">';
 				print $form->textwithpicto($langs->trans("Abandoned"), $langs->trans("HelpAbandonBadCustomer"), - 1);
 				print '</span>';
@@ -6206,7 +6206,7 @@ 
 			// Partially paid or abandoned 'product_returned'
 			if (($object->status == Facture::STATUS_CLOSED || $object->status == Facture::STATUS_ABANDONED) && $object->close_code == 'product_returned') {
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="nowrap right">';
+				print '<td colspan="'.($nbcols + 1).'" class="nowrap right">';
 				print '<span class="opacitymedium">';
 				print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1);
 				print '</span>';
@@ -6221,7 +6221,7 @@ 
 			// Partially paid or abandoned 'abandoned'
 			if (($object->status == Facture::STATUS_CLOSED || $object->status == Facture::STATUS_ABANDONED) && $object->close_code == 'abandon') {
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="nowrap right">';
+				print '<td colspan="'.($nbcols + 1).'" class="nowrap right">';
 				$text = $langs->trans("HelpAbandonOther");
 				if ($object->close_note) {
 					$text .= '<br><br><b>'.$langs->trans("Reason").'</b>:'.$object->close_note;
@@ -6241,7 +6241,7 @@ 
 
 			// Billed
 			print '<tr>';
-			print '<td colspan="'.($nbcols+1).'" class="right">';
+			print '<td colspan="'.($nbcols + 1).'" class="right">';
 			print '<span class="opacitymedium">';
 			print $langs->trans("Billed");
 			print '</td>';
@@ -6251,7 +6251,7 @@ 
 
 			// Remainder to pay
 			print '<tr>';
-			print '<td colspan="'.($nbcols+1).'" class="right">';
+			print '<td colspan="'.($nbcols + 1).'" class="right">';
 			print '<span class="opacitymedium">';
 			print $langs->trans('RemainderToPay');
 			if ($resteapayeraffiche < 0) {
@@ -6266,7 +6266,7 @@ 
 			// Remainder to pay Multicurrency
 			if (isModEnabled('multicurrency') && $object->multicurrency_code && ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)) {
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="right">';
+				print '<td colspan="'.($nbcols + 1).'" class="right">';
 				print '<span class="opacitymedium">';
 				print $langs->trans('RemainderToPayMulticurrency');
 				if ($resteapayeraffiche < 0) {
@@ -6294,14 +6294,14 @@ 
 				$billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
 
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="right">'.$langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')).' :</td>';
+				print '<td colspan="'.($nbcols + 1).'" class="right">'.$langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')).' :</td>';
 				//print '<td></td>';
 				print '<td class="right">'.price($billedWithRetainedWarranty).'</td>';
 				print '</tr>';
 
 				// retained warranty
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="right">';
+				print '<td colspan="'.($nbcols + 1).'" class="right">';
 				print $langs->trans("RetainedWarranty").' ('.$object->retained_warranty.'%)';
 				print !empty($object->retained_warranty_date_limit) ? ' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 				print '</td>';
@@ -6316,7 +6316,7 @@ 
 
 			// Total already paid back
 			print '<tr>';
-			print '<td colspan="'.($nbcols+1).'" class="right">';
+			print '<td colspan="'.($nbcols + 1).'" class="right">';
 			print '<span class="opacitymedium">'.$langs->trans('AlreadyPaidBack').'</span>';
 			print '</td>';
 			//print '<td></td>';
@@ -6325,13 +6325,13 @@ 
 
 			// Billed
 			print '<tr>';
-			print '<td colspan="'.($nbcols+1).'" class="right"><span class="opacitymedium">'.$langs->trans("Billed").'</span></td>';
+			print '<td colspan="'.($nbcols + 1).'" class="right"><span class="opacitymedium">'.$langs->trans("Billed").'</span></td>';
 			//print '<td></td>';
 			print '<td class="right">'.price($sign * $object->total_ttc).'</td>';
 			print '</tr>';
 
 			// Remainder to pay back
-			print '<tr><td colspan="'.($nbcols+1).'" class="right">';
+			print '<tr><td colspan="'.($nbcols + 1).'" class="right">';
 			print '<span class="opacitymedium">'.$langs->trans('RemainderToPayBack');
 			if ($resteapayeraffiche > 0) {
 				print ' ('.$langs->trans('NegativeIfExcessRefunded').')';
@@ -6347,7 +6347,7 @@ 
 			// Remainder to pay back Multicurrency
 			if (isModEnabled('multicurrency') && (($object->multicurrency_code && $object->multicurrency_code != $conf->currency) || $object->multicurrency_tx != 1)) {
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="right">';
+				print '<td colspan="'.($nbcols + 1).'" class="right">';
 				print '<span class="opacitymedium">'.$langs->trans('RemainderToPayBackMulticurrency');
 				if ($resteapayeraffiche > 0) {
 					print ' ('.$langs->trans('NegativeIfExcessRefunded').')';
@@ -6455,7 +6455,7 @@ 
 			if (isModEnabled('subtotals')) {
 				include DOL_DOCUMENT_ROOT.'/core/tpl/subtotal_ajaxrow.tpl.php';
 			} else {
-				include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+				include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 			}
 		}
 
@@ -6518,10 +6518,10 @@ 
 						if (!$objectidnext && $object->is_last_in_cycle()) {
 							if ($usercanunvalidate) {
 								unset($params['attr']['title']);
-								print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&action=modif&token=' . newToken(), '', true, $params);
+								print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=modif&token='.newToken(), '', true, $params);
 							} else {
 								$params['attr']['title'] = $langs->trans('NotEnoughPermissions');
-								print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&action=modif&token=' . newToken(), '', false, $params);
+								print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=modif&token='.newToken(), '', false, $params);
 							}
 						} elseif (!$object->is_last_in_cycle()) {
 							$params['attr']['title'] = $langs->trans('NotLastInCycle');
@@ -6562,7 +6562,7 @@ 
 					$langs->load("contracts");
 
 					if ($usercancreatecontract) {
-						print '<a class="butAction" href="' . DOL_URL_ROOT . '/contrat/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddContract') . '</a>';
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans('AddContract').'</a>';
 					}
 				}
 			}
@@ -6812,7 +6812,7 @@ 
 			if ($usercandelete || ($usercancreate && $isErasable == 1)) {	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
 				$enableDelete = false;
 				$deleteHref = '#';
-				if ($isErasable > 0 && ! $objectidnext) {
+				if ($isErasable > 0 && !$objectidnext) {
 					$deleteHref = $_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=delete&token='.newToken();
 					$enableDelete = true;
 				}

htdocs/fourn/facture/card.php

Spacing +65 added lines, -65 removed lines

@@ -204,7 +204,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');
@@ -799,7 +799,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);
@@ -807,7 +807,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'));
@@ -846,7 +846,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');
@@ -920,7 +920,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');
@@ -1030,7 +1030,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');
@@ -1083,28 +1083,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)) {
@@ -1317,7 +1317,7 @@ 
 									0,
 									$object->lines[0]->date_start,
 									$object->lines[0]->date_end,
-									array(),  // array_options
+									array(), // array_options
 									0,
 									0,
 									'',
@@ -1466,7 +1466,7 @@ 
 		// Edit line
 		$db->begin();
 
-		if (! $object->fetch($id) > 0) {
+		if (!$object->fetch($id) > 0) {
 			dol_print_error($db);
 		}
 		$object->fetch_thirdparty();
@@ -1637,7 +1637,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');
 
@@ -1780,7 +1780,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 {
@@ -2062,7 +2062,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');
 
@@ -2153,7 +2153,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');
 
@@ -2171,7 +2171,7 @@ 
 		}
 	}
 
-	$objectsrc = null;  // Initialise
+	$objectsrc = null; // Initialise
 	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = $origin;
@@ -2350,7 +2350,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";
@@ -2434,7 +2434,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) {
@@ -2501,7 +2501,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() {
@@ -2571,7 +2571,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>';
@@ -2820,8 +2820,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;
@@ -2831,7 +2831,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>';
 		}
 
@@ -3401,7 +3401,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) {
@@ -3548,12 +3548,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>';
 			}
@@ -3649,15 +3649,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');
@@ -3671,40 +3671,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>';
 
@@ -3859,7 +3859,7 @@ 
 
 			if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE) {
 				// Total already paid
-				print '<tr><td colspan="'.($nbcols+1).'" class="right">';
+				print '<tr><td colspan="'.($nbcols + 1).'" class="right">';
 				print '<span class="opacitymedium">';
 				if ($object->type != FactureFournisseur::TYPE_DEPOSIT) {
 					print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
@@ -3925,7 +3925,7 @@ 
 
 				// Pay partially 'escompte'
 				if (($object->status == FactureFournisseur::STATUS_CLOSED || $object->status == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'discount_vat') {
-					print '<tr><td colspan="'.($nbcols+1).'" class="right nowrap">';
+					print '<tr><td colspan="'.($nbcols + 1).'" class="right nowrap">';
 					print '<span class="opacitymedium">';
 					print $form->textwithpicto($langs->trans("Discount"), $langs->trans("HelpEscompte"), - 1);
 					print '</span>';
@@ -3938,7 +3938,7 @@ 
 				}
 				// Paye partiellement ou Abandon 'badsupplier'
 				if (($object->status == FactureFournisseur::STATUS_CLOSED || $object->status == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'badsupplier') {
-					print '<tr><td colspan="'.($nbcols+1).'" class="right nowrap">';
+					print '<tr><td colspan="'.($nbcols + 1).'" class="right nowrap">';
 					print '<span class="opacitymedium">';
 					print $form->textwithpicto($langs->trans("Abandoned"), $langs->trans("HelpAbandonBadCustomer"), - 1);
 					print '</span>';
@@ -3951,7 +3951,7 @@ 
 				}
 				// Paye partiellement ou Abandon 'product_returned'
 				if (($object->status == FactureFournisseur::STATUS_CLOSED || $object->status == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'product_returned') {
-					print '<tr><td colspan="'.($nbcols+1).'" class="right nowrap">';
+					print '<tr><td colspan="'.($nbcols + 1).'" class="right nowrap">';
 					print '<span class="opacitymedium">';
 					print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1);
 					print '</span>';
@@ -3964,7 +3964,7 @@ 
 				}
 				// Paye partiellement ou Abandon 'abandon'
 				if (($object->status == FactureFournisseur::STATUS_CLOSED || $object->status == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'abandon') {
-					print '<tr><td colspan="'.($nbcols+1).'" class="right nowrap">';
+					print '<tr><td colspan="'.($nbcols + 1).'" class="right nowrap">';
 					$text = $langs->trans("HelpAbandonOther");
 					if ($object->close_note) {
 						$text .= '<br><br><b>'.$langs->trans("Reason").'</b>:'.$object->close_note;
@@ -3982,7 +3982,7 @@ 
 				}
 
 				// Billed
-				print '<tr><td colspan="'.($nbcols+1).'" class="right">';
+				print '<tr><td colspan="'.($nbcols + 1).'" class="right">';
 				print '<span class="opacitymedium">';
 				print $langs->trans("Billed");
 				print '</span>';
@@ -3992,7 +3992,7 @@ 
 				print '</tr>';
 
 				// Remainder to pay
-				print '<tr><td colspan="'.($nbcols+1).'" class="right">';
+				print '<tr><td colspan="'.($nbcols + 1).'" class="right">';
 				print '<span class="opacitymedium">';
 				print $langs->trans('RemainderToPay');
 				if ($resteapayeraffiche < 0) {
@@ -4006,7 +4006,7 @@ 
 
 				// Remainder to pay Multicurrency
 				if (isModEnabled('multicurrency') && (($object->multicurrency_code && $object->multicurrency_code != $conf->currency) || $object->multicurrency_tx != 1)) {
-					print '<tr><td colspan="'.($nbcols+1).'" class="right">';
+					print '<tr><td colspan="'.($nbcols + 1).'" class="right">';
 					print '<span class="opacitymedium">';
 					print $langs->trans('RemainderToPayMulticurrency');
 					if ($resteapayeraffiche < 0) {
@@ -4022,7 +4022,7 @@ 
 				$cssforamountpaymentcomplete = 'amountpaymentneutral';
 
 				// Total already paid back
-				print '<tr><td colspan="'.($nbcols+1).'" class="right">';
+				print '<tr><td colspan="'.($nbcols + 1).'" class="right">';
 				print $langs->trans('AlreadyPaidBack');
 				print '</td>';
 				//print '<td></td>';
@@ -4030,13 +4030,13 @@ 
 				print '</tr>';
 
 				// Billed
-				print '<tr><td colspan="'.($nbcols+1).'" class="right">'.$langs->trans("Billed").'</td>';
+				print '<tr><td colspan="'.($nbcols + 1).'" class="right">'.$langs->trans("Billed").'</td>';
 				//print '<td></td>';
 				print '<td class="right">'.price($sign * $object->total_ttc).'</td>';
 				print '</tr>';
 
 				// Remainder to pay back
-				print '<tr><td colspan="'.($nbcols+1).'" class="right">';
+				print '<tr><td colspan="'.($nbcols + 1).'" class="right">';
 				print '<span class="opacitymedium">';
 				print $langs->trans('RemainderToPayBack');
 				if ($resteapayeraffiche > 0) {
@@ -4050,7 +4050,7 @@ 
 
 				// Remainder to pay back Multicurrency
 				if (isModEnabled('multicurrency') && (($object->multicurrency_code && $object->multicurrency_code != $conf->currency) || $object->multicurrency_tx != 1)) {
-					print '<tr><td colspan="'.($nbcols+1).'" class="right">';
+					print '<tr><td colspan="'.($nbcols + 1).'" class="right">';
 					print '<span class="opacitymedium">';
 					print $langs->trans('RemainderToPayBackMulticurrency');
 					if ($resteapayeraffiche > 0) {
@@ -4288,7 +4288,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>';
 					}