Dolibarr / dolibarr

htdocs/asset/agenda.php

Spacing +10 added lines, -10 removed lines

@@ -143,7 +143,7 @@ 
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	$morehtmlref .= '</div>';
@@ -167,16 +167,16 @@ 
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin=' . urlencode((string) ($object->element . '@' . $object->module)) . '&originid=' . urlencode((string) ($object->id));
-	$urlbacktopage = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
-	$out .= '&backtopage=' . urlencode($urlbacktopage);
+	$out = '&origin='.urlencode((string) ($object->element.'@'.$object->module)).'&originid='.urlencode((string) ($object->id));
+	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid=' . urlencode((string) ($objthirdparty->id));
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
-		$out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : '');
+		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
 		//$out.="</a>";
@@ -187,18 +187,18 @@ 
 
 	if (isModEnabled('agenda')) {
 		if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
-			print '<a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create' . $out . '">' . $langs->trans("AddAction") . '</a>';
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
-			print '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("AddAction") . '</a>';
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
 		}
 	}
 
 	print '</div>';
 
 	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
-		$param = '&id=' . $object->id . '&socid=' . $socid;
+		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-			$param .= '&contextpage=' . urlencode($contextpage);
+			$param .= '&contextpage='.urlencode($contextpage);
 		}
 		if ($limit > 0 && $limit != $conf->liste_limit) {
 			$param .= '&limit='.((int) $limit);

htdocs/asset/model/agenda.php

Spacing +15 added lines, -15 removed lines

@@ -24,11 +24,11 @@ 
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/assetmodel.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("assets", "other"));
@@ -71,15 +71,15 @@ 
 // Initialize technical objects
 $object = new AssetModel($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('assetmodelagenda', 'globalcard')); // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id > 0 || !empty($ref)) {
-	$upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1] . "/model/" . $object->id;
+	$upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1]."/model/".$object->id;
 }
 
 $permissiontoread = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')));
@@ -115,7 +115,7 @@ 
 if (empty($reshook)) {
 	// Cancel
 	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
-		header("Location: " . $backtopage);
+		header("Location: ".$backtopage);
 		exit;
 	}
 
@@ -149,7 +149,7 @@ 
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/model/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/model/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	$morehtmlref .= '</div>';
@@ -173,16 +173,16 @@ 
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin=' . urlencode((string) ($object->element . '@' . $object->module)) . '&originid=' . urlencode((string) ($object->id));
-	$urlbacktopage = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
-	$out .= '&backtopage=' . urlencode($urlbacktopage);
+	$out = '&origin='.urlencode((string) ($object->element.'@'.$object->module)).'&originid='.urlencode((string) ($object->id));
+	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid=' . urlencode((string) ($objthirdparty->id));
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
-		$out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : '');
+		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
 		//$out.="</a>";

htdocs/blockedlog/admin/blockedlog_list.php

Spacing +1 added lines, -1 removed lines

@@ -584,7 +584,7 @@
 
 			// Link to source object
 			print '<td class="tdoverflowmax150"'.(preg_match('/<a/', $object_link) ? '' : 'title="'.dol_escape_htmltag(dol_string_nohtmltag($object_link.' - '.$object_link_title)).'"').'>';
-			print '<!-- object_link -->';	// $object_link can be a '<a href' link or a text
+			print '<!-- object_link -->'; // $object_link can be a '<a href' link or a text
 			print $object_link;
 			print '</td>';
 

htdocs/contact/class/contact.class.php

Spacing +37 added lines, -37 removed lines

@@ -213,8 +213,8 @@ 
 	/**
 	 * @var int Thirdparty ID
 	 */
-	public $socid;		// both socid and fk_soc are used
-	public $fk_soc;		// both socid and fk_soc are used
+	public $socid; // both socid and fk_soc are used
+	public $fk_soc; // both socid and fk_soc are used
 
 	/**
 	 * @var string Thirdparty name
@@ -769,11 +769,11 @@ 
 		global $conf;
 		$dn = '';
 		if ($mode == 0) {
-			$dn = getDolGlobalString('LDAP_KEY_CONTACTS') . "=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')]."," . getDolGlobalString('LDAP_CONTACT_DN');
+			$dn = getDolGlobalString('LDAP_KEY_CONTACTS')."=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')].",".getDolGlobalString('LDAP_CONTACT_DN');
 		} elseif ($mode == 1) {
 			$dn = getDolGlobalString('LDAP_CONTACT_DN');
 		} elseif ($mode == 2) {
-			$dn = getDolGlobalString('LDAP_KEY_CONTACTS') . "=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')];
+			$dn = getDolGlobalString('LDAP_KEY_CONTACTS')."=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')];
 		}
 		return $dn;
 	}
@@ -926,12 +926,12 @@ 
 			// Update birthday alert
 			if (!empty($this->birthday_alert)) {
 				//check existing
-				$sql_check = "SELECT rowid FROM " . MAIN_DB_PREFIX . "user_alert WHERE type = 1 AND fk_contact = " . ((int) $id) . " AND fk_user = " . ((int) $user->id);
+				$sql_check = "SELECT rowid FROM ".MAIN_DB_PREFIX."user_alert WHERE type = 1 AND fk_contact = ".((int) $id)." AND fk_user = ".((int) $user->id);
 				$result_check = $this->db->query($sql_check);
 				if (!$result_check || ($this->db->num_rows($result_check) < 1)) {
 					//insert
-					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_alert(type, fk_contact, fk_user) ";
-					$sql .= "VALUES (1," . ((int) $id) . "," . ((int) $user->id) . ")";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_alert(type, fk_contact, fk_user) ";
+					$sql .= "VALUES (1,".((int) $id).",".((int) $user->id).")";
 					$result = $this->db->query($sql);
 					if (!$result) {
 						$error++;
@@ -941,8 +941,8 @@ 
 					$result = true;
 				}
 			} else {
-				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_alert ";
-				$sql .= "WHERE type=1 AND fk_contact=" . ((int) $id) . " AND fk_user=" . ((int) $user->id);
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
+				$sql .= "WHERE type=1 AND fk_contact=".((int) $id)." AND fk_user=".((int) $user->id);
 				$result = $this->db->query($sql);
 				if (!$result) {
 					$error++;
@@ -1039,37 +1039,37 @@ 
 			} elseif ($num) {   // $num = 1
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id		= $obj->rowid;
-				$this->entity	= $obj->entity;
-				$this->ref		= $obj->rowid;
-				$this->ref_ext	= $obj->ref_ext;
+				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
+				$this->ref = $obj->rowid;
+				$this->ref_ext = $obj->ref_ext;
 
 				$this->civility_code    = $obj->civility_code;
 				$this->civility	        = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != "Civility".$obj->civility_code ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
 
-				$this->name_alias	= $obj->name_alias;
+				$this->name_alias = $obj->name_alias;
 				$this->lastname		= $obj->lastname;
 				$this->firstname	= $obj->firstname;
-				$this->address		= $obj->address;
-				$this->zip			= $obj->zip;
-				$this->town			= $obj->town;
+				$this->address = $obj->address;
+				$this->zip = $obj->zip;
+				$this->town = $obj->town;
 
 				$this->date_creation     = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
 
-				$this->state_id		= $obj->state_id;
+				$this->state_id = $obj->state_id;
 				$this->state_code	= $obj->state_code;
-				$this->state		= $obj->state;
+				$this->state = $obj->state;
 
 				$this->country_id	= $obj->country_id;
-				$this->country_code	= $obj->country_id ? $obj->country_code : '';
-				$this->country		= $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
+				$this->country_code = $obj->country_id ? $obj->country_code : '';
+				$this->country = $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
 
-				$this->fk_soc		= $obj->fk_soc;		// Both fk_soc and socid are used
-				$this->socid		= $obj->fk_soc;		// Both fk_soc and socid are used
-				$this->socname		= $obj->socname;
+				$this->fk_soc = $obj->fk_soc; // Both fk_soc and socid are used
+				$this->socid		= $obj->fk_soc; // Both fk_soc and socid are used
+				$this->socname = $obj->socname;
 				$this->poste		= $obj->poste;
-				$this->statut		= $obj->statut;
+				$this->statut = $obj->statut;
 
 				$this->fk_prospectlevel = $obj->fk_prospectlevel;
 
@@ -1079,25 +1079,25 @@ 
 				$this->statut_commercial = $libelle; // libelle statut commercial
 				$this->stcomm_picto = $obj->stcomm_picto; // Picto statut commercial
 
-				$this->phone_pro	= trim($obj->phone);
-				$this->fax			= trim($obj->fax);
-				$this->phone_perso	= trim($obj->phone_perso);
-				$this->phone_mobile	= trim($obj->phone_mobile);
+				$this->phone_pro = trim($obj->phone);
+				$this->fax = trim($obj->fax);
+				$this->phone_perso = trim($obj->phone_perso);
+				$this->phone_mobile = trim($obj->phone_mobile);
 
 				$this->email			= $obj->email;
-				$this->socialnetworks	= ($obj->socialnetworks ? (array) json_decode($obj->socialnetworks, true) : array());
+				$this->socialnetworks = ($obj->socialnetworks ? (array) json_decode($obj->socialnetworks, true) : array());
 				$this->photo			= $obj->photo;
 				$this->priv				= $obj->priv;
 				$this->mail				= $obj->email;
 
-				$this->birthday		= $this->db->jdate($obj->birthday);
-				$this->note			= $obj->note_private; // deprecated
+				$this->birthday = $this->db->jdate($obj->birthday);
+				$this->note = $obj->note_private; // deprecated
 				$this->note_private	= $obj->note_private;
-				$this->note_public	= $obj->note_public;
+				$this->note_public = $obj->note_public;
 				$this->default_lang	= $obj->default_lang;
-				$this->user_id		= $obj->user_id;
+				$this->user_id = $obj->user_id;
 				$this->user_login	= $obj->user_login;
-				$this->canvas		= $obj->canvas;
+				$this->canvas = $obj->canvas;
 
 				$this->import_key = $obj->import_key;
 
@@ -1420,7 +1420,7 @@ 
 			$datas['photo'] = $photo;
 		}
 
-		$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Contact").'</u> ' . $this->getLibStatut(4);
+		$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Contact").'</u> '.$this->getLibStatut(4);
 		$datas['name'] = '<br><b>'.$langs->trans("Name").':</b> '.$this->getFullName($langs);
 		// if ($this->civility_id) $datas['civility'] = '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate civilty_id code
 		if (!empty($this->poste)) {
@@ -1874,7 +1874,7 @@ 
 		$error = 0;
 
 		if (!isset($this->roles)) {
-			return 0;	// Avoid to loose roles when property not set
+			return 0; // Avoid to loose roles when property not set
 		}
 
 		$this->db->begin();

htdocs/compta/bank/list.php

Spacing +4 added lines, -4 removed lines

@@ -157,7 +157,7 @@ 
 }
 
 if (empty($reshook)) {
-	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
@@ -172,7 +172,7 @@ 
 	$objectclass = 'Account';
 	$objectlabel = 'FinancialAccount';
 	$uploaddir = $conf->banque->dir_output;
-	include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 /*
@@ -238,7 +238,7 @@ 
 			if ($searchCategoryBankOperator == 0) {
 				$searchCategoryBankSqlList[] = " EXISTS (SELECT ck.fk_account FROM ".MAIN_DB_PREFIX."categorie_account as ck WHERE b.rowid = ck.fk_account AND ck.fk_categorie = ".((int) $searchCategoryBank).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryBank);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryBank);
 			}
 		}
 	}
@@ -356,7 +356,7 @@ 
 if (isModEnabled('category') && $user->hasRight('banque', 'modifier')) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);

htdocs/compta/bank/various_payment/list.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 $object = new PaymentVarious($db);
 $extrafields = new ExtraFields($db);
 //$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);

htdocs/accountancy/bookkeeping/export.php

Spacing +34 added lines, -34 removed lines

@@ -53,45 +53,45 @@ 
 $search_mvt_num = GETPOSTINT('search_mvt_num');
 $search_doc_type = GETPOST("search_doc_type", 'alpha');
 $search_doc_ref = GETPOST("search_doc_ref", 'alpha');
-$search_date_startyear =  GETPOSTINT('search_date_startyear');
-$search_date_startmonth =  GETPOSTINT('search_date_startmonth');
-$search_date_startday =  GETPOSTINT('search_date_startday');
-$search_date_endyear =  GETPOSTINT('search_date_endyear');
-$search_date_endmonth =  GETPOSTINT('search_date_endmonth');
-$search_date_endday =  GETPOSTINT('search_date_endday');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
-$search_date_creation_startyear =  GETPOSTINT('search_date_creation_startyear');
-$search_date_creation_startmonth =  GETPOSTINT('search_date_creation_startmonth');
-$search_date_creation_startday =  GETPOSTINT('search_date_creation_startday');
-$search_date_creation_endyear =  GETPOSTINT('search_date_creation_endyear');
-$search_date_creation_endmonth =  GETPOSTINT('search_date_creation_endmonth');
-$search_date_creation_endday =  GETPOSTINT('search_date_creation_endday');
+$search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear');
+$search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth');
+$search_date_creation_startday = GETPOSTINT('search_date_creation_startday');
+$search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear');
+$search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth');
+$search_date_creation_endday = GETPOSTINT('search_date_creation_endday');
 $search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);
 $search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);
-$search_date_modification_startyear =  GETPOSTINT('search_date_modification_startyear');
-$search_date_modification_startmonth =  GETPOSTINT('search_date_modification_startmonth');
-$search_date_modification_startday =  GETPOSTINT('search_date_modification_startday');
-$search_date_modification_endyear =  GETPOSTINT('search_date_modification_endyear');
-$search_date_modification_endmonth =  GETPOSTINT('search_date_modification_endmonth');
-$search_date_modification_endday =  GETPOSTINT('search_date_modification_endday');
+$search_date_modification_startyear = GETPOSTINT('search_date_modification_startyear');
+$search_date_modification_startmonth = GETPOSTINT('search_date_modification_startmonth');
+$search_date_modification_startday = GETPOSTINT('search_date_modification_startday');
+$search_date_modification_endyear = GETPOSTINT('search_date_modification_endyear');
+$search_date_modification_endmonth = GETPOSTINT('search_date_modification_endmonth');
+$search_date_modification_endday = GETPOSTINT('search_date_modification_endday');
 $search_date_modification_start = dol_mktime(0, 0, 0, $search_date_modification_startmonth, $search_date_modification_startday, $search_date_modification_startyear);
 $search_date_modification_end = dol_mktime(23, 59, 59, $search_date_modification_endmonth, $search_date_modification_endday, $search_date_modification_endyear);
-$search_date_export_startyear =  GETPOSTINT('search_date_export_startyear');
-$search_date_export_startmonth =  GETPOSTINT('search_date_export_startmonth');
-$search_date_export_startday =  GETPOSTINT('search_date_export_startday');
-$search_date_export_endyear =  GETPOSTINT('search_date_export_endyear');
-$search_date_export_endmonth =  GETPOSTINT('search_date_export_endmonth');
-$search_date_export_endday =  GETPOSTINT('search_date_export_endday');
+$search_date_export_startyear = GETPOSTINT('search_date_export_startyear');
+$search_date_export_startmonth = GETPOSTINT('search_date_export_startmonth');
+$search_date_export_startday = GETPOSTINT('search_date_export_startday');
+$search_date_export_endyear = GETPOSTINT('search_date_export_endyear');
+$search_date_export_endmonth = GETPOSTINT('search_date_export_endmonth');
+$search_date_export_endday = GETPOSTINT('search_date_export_endday');
 $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
 $search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
-$search_date_validation_startyear =  GETPOSTINT('search_date_validation_startyear');
-$search_date_validation_startmonth =  GETPOSTINT('search_date_validation_startmonth');
-$search_date_validation_startday =  GETPOSTINT('search_date_validation_startday');
-$search_date_validation_endyear =  GETPOSTINT('search_date_validation_endyear');
-$search_date_validation_endmonth =  GETPOSTINT('search_date_validation_endmonth');
-$search_date_validation_endday =  GETPOSTINT('search_date_validation_endday');
+$search_date_validation_startyear = GETPOSTINT('search_date_validation_startyear');
+$search_date_validation_startmonth = GETPOSTINT('search_date_validation_startmonth');
+$search_date_validation_startday = GETPOSTINT('search_date_validation_startday');
+$search_date_validation_endyear = GETPOSTINT('search_date_validation_endyear');
+$search_date_validation_endmonth = GETPOSTINT('search_date_validation_endmonth');
+$search_date_validation_endday = GETPOSTINT('search_date_validation_endday');
 $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
 $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 $search_import_key = GETPOST("search_import_key", 'alpha');
@@ -717,7 +717,7 @@ 
 		// Ajout directives pour resoudre bug IE
 		header('Cache-Control: Public, must-revalidate');
 		header('Pragma: public');
-		header('Content-Length: ' . dol_filesize($downloadFilePath));
+		header('Content-Length: '.dol_filesize($downloadFilePath));
 
 		readfileLowMemory($downloadFilePath);
 	} else {
@@ -790,7 +790,7 @@ 
 	$form_question['formatexport'] = array(
 		'name' => 'formatexport',
 		'type' => 'select',
-		'label' => $langs->trans('Modelcsv'),		// TODO  Use Selectmodelcsv and show a select combo
+		'label' => $langs->trans('Modelcsv'), // TODO  Use Selectmodelcsv and show a select combo
 		'values' => $listofformat,
 		'default' => $formatexportset,
 		'morecss' => 'minwidth200 maxwidth200'
@@ -1311,8 +1311,8 @@ 
 			$labeltoshow .= $objectstatic->getNomUrl(1);
 			$labeltoshowalt .= $objectstatic->ref;
 			$bank_ref = strstr($line->doc_ref, '-');
-			$labeltoshow .= " " . $bank_ref;
-			$labeltoshowalt .= " " . $bank_ref;
+			$labeltoshow .= " ".$bank_ref;
+			$labeltoshowalt .= " ".$bank_ref;
 		} else {
 			$labeltoshow .= $line->doc_ref;
 			$labeltoshowalt .= $line->doc_ref;

htdocs/accountancy/bookkeeping/listbyaccount.php

Spacing +45 added lines, -45 removed lines

@@ -52,29 +52,29 @@ 
 	$context_default = 'bookkeepingbyaccountlist';
 }
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : $context_default;
-$search_date_startyear =  GETPOSTINT('search_date_startyear');
-$search_date_startmonth =  GETPOSTINT('search_date_startmonth');
-$search_date_startday =  GETPOSTINT('search_date_startday');
-$search_date_endyear =  GETPOSTINT('search_date_endyear');
-$search_date_endmonth =  GETPOSTINT('search_date_endmonth');
-$search_date_endday =  GETPOSTINT('search_date_endday');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
-$search_date_export_startyear =  GETPOSTINT('search_date_export_startyear');
-$search_date_export_startmonth =  GETPOSTINT('search_date_export_startmonth');
-$search_date_export_startday =  GETPOSTINT('search_date_export_startday');
-$search_date_export_endyear =  GETPOSTINT('search_date_export_endyear');
-$search_date_export_endmonth =  GETPOSTINT('search_date_export_endmonth');
-$search_date_export_endday =  GETPOSTINT('search_date_export_endday');
+$search_date_export_startyear = GETPOSTINT('search_date_export_startyear');
+$search_date_export_startmonth = GETPOSTINT('search_date_export_startmonth');
+$search_date_export_startday = GETPOSTINT('search_date_export_startday');
+$search_date_export_endyear = GETPOSTINT('search_date_export_endyear');
+$search_date_export_endmonth = GETPOSTINT('search_date_export_endmonth');
+$search_date_export_endday = GETPOSTINT('search_date_export_endday');
 $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
 $search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
-$search_date_validation_startyear =  GETPOSTINT('search_date_validation_startyear');
-$search_date_validation_startmonth =  GETPOSTINT('search_date_validation_startmonth');
-$search_date_validation_startday =  GETPOSTINT('search_date_validation_startday');
-$search_date_validation_endyear =  GETPOSTINT('search_date_validation_endyear');
-$search_date_validation_endmonth =  GETPOSTINT('search_date_validation_endmonth');
-$search_date_validation_endday =  GETPOSTINT('search_date_validation_endday');
+$search_date_validation_startyear = GETPOSTINT('search_date_validation_startyear');
+$search_date_validation_startmonth = GETPOSTINT('search_date_validation_startmonth');
+$search_date_validation_startday = GETPOSTINT('search_date_validation_startday');
+$search_date_validation_endyear = GETPOSTINT('search_date_validation_endyear');
+$search_date_validation_endmonth = GETPOSTINT('search_date_validation_endmonth');
+$search_date_validation_endday = GETPOSTINT('search_date_validation_endday');
 $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
 $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 $search_import_key = GETPOST("search_import_key", 'alpha');
@@ -304,7 +304,7 @@ 
 		} else {
 			$filter['t.numero_compte>='] = $search_accountancy_code_start;
 		}
-		$param .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
+		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
 	}
 	if (!empty($search_accountancy_code_end)) {
 		if ($type == 'sub') {
@@ -312,7 +312,7 @@ 
 		} else {
 			$filter['t.numero_compte<='] = $search_accountancy_code_end;
 		}
-		$param .= '&search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
+		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
 	}
 	if (!empty($search_label_account)) {
 		$filter['t.label_compte'] = $search_label_account;
@@ -494,7 +494,7 @@ 
 			}
 
 			if (!$error) {
-				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				header('Location: '.$_SERVER['PHP_SELF'].'?noreset=1'.$param);
 				exit();
 			}
 		} elseif ($massaction == 'letteringmanual') {
@@ -504,7 +504,7 @@ 
 				setEventMessages('', $lettering->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans('AccountancyOneLetteringModifiedSuccessfully'), array(), 'mesgs');
-				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				header('Location: '.$_SERVER['PHP_SELF'].'?noreset=1'.$param);
 				exit();
 			}
 		} elseif ($action == 'unletteringauto' && $confirm == "yes") {
@@ -525,7 +525,7 @@ 
 			}
 
 			if (!$error) {
-				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				header('Location: '.$_SERVER['PHP_SELF'].'?noreset=1'.$param);
 				exit();
 			}
 		} elseif ($action == 'unletteringmanual' && $confirm == "yes") {
@@ -535,7 +535,7 @@ 
 				setEventMessages('', $lettering->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans('AccountancyOneUnletteringModifiedSuccessfully'), array(), 'mesgs');
-				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				header('Location: '.$_SERVER['PHP_SELF'].'?noreset=1'.$param);
 				exit();
 			}
 		}
@@ -642,10 +642,10 @@ 
 // List of mass actions available
 $arrayofmassactions = array();
 if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->hasRight('accounting', 'mouvements', 'creer')) {
-	$arrayofmassactions['letteringauto'] = img_picto('', 'check', 'class="pictofixedwidth"') . $langs->trans('LetteringAuto');
-	$arrayofmassactions['preunletteringauto'] = img_picto('', 'uncheck', 'class="pictofixedwidth"') . $langs->trans('UnletteringAuto');
-	$arrayofmassactions['letteringmanual'] = img_picto('', 'check', 'class="pictofixedwidth"') . $langs->trans('LetteringManual');
-	$arrayofmassactions['preunletteringmanual'] = img_picto('', 'uncheck', 'class="pictofixedwidth"') . $langs->trans('UnletteringManual');
+	$arrayofmassactions['letteringauto'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans('LetteringAuto');
+	$arrayofmassactions['preunletteringauto'] = img_picto('', 'uncheck', 'class="pictofixedwidth"').$langs->trans('UnletteringAuto');
+	$arrayofmassactions['letteringmanual'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans('LetteringManual');
+	$arrayofmassactions['preunletteringmanual'] = img_picto('', 'uncheck', 'class="pictofixedwidth"').$langs->trans('UnletteringManual');
 }
 if ($user->hasRight('accounting', 'mouvements', 'supprimer')) {
 	$arrayofmassactions['predeletebookkeepingwriting'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -678,11 +678,11 @@ 
 if (empty($reshook)) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
 	if ($type == 'sub') {
-		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
-		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$url_param, '', 1, array('morecss' => 'marginleftonly'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?type=sub&'.$url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 	} else {
-		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
-		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?type=sub&'.$url_param, '', 1, array('morecss' => 'marginleftonly'));
 	}
 	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
@@ -760,8 +760,8 @@ 
 } else {
 	$stringforfirstkey .= ' CTL +';
 }
-$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="previous_account" accesskey="p" title="' . $stringforfirstkey . ' p" class="classfortooltip" href="#"><i class="fa fa-chevron-left"></i></a>';
-$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="next_account" accesskey="n" title="' . $stringforfirstkey . ' n" class="classfortooltip" href="#"><i class="fa fa-chevron-right"></i></a>';
+$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="previous_account" accesskey="p" title="'.$stringforfirstkey.' p" class="classfortooltip" href="#"><i class="fa fa-chevron-left"></i></a>';
+$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="next_account" accesskey="n" title="'.$stringforfirstkey.' n" class="classfortooltip" href="#"><i class="fa fa-chevron-right"></i></a>';
 $moreforfilter .= <<<SCRIPT
 <script type="text/javascript">
 	jQuery(document).ready(function() {
@@ -988,8 +988,8 @@ 
 	}
 	//if (empty($accountg)) $accountg = '-';
 
-	$colspan = 0;			// colspan before field 'label of operation'
-	$colspanend = 0;		// colspan after debit/credit
+	$colspan = 0; // colspan before field 'label of operation'
+	$colspanend = 0; // colspan after debit/credit
 	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		$colspan++;
 	}
@@ -1038,9 +1038,9 @@ 
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
 			if ($type == 'sub') {
-				print '<td class="right" colspan="' . $colspan . '">' . $langs->trans("TotalForAccount") . ' ' . length_accounta($displayed_account_number) . ':</td>';
+				print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.length_accounta($displayed_account_number).':</td>';
 			} else {
-				print '<td class="right" colspan="' . $colspan . '">' . $langs->trans("TotalForAccount") . ' ' . length_accountg($displayed_account_number) . ':</td>';
+				print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.length_accountg($displayed_account_number).':</td>';
 			}
 			print '<td class="nowrap right">'.price(price2num($sous_total_debit, 'MT')).'</td>';
 			print '<td class="nowrap right">'.price(price2num($sous_total_credit, 'MT')).'</td>';
@@ -1079,9 +1079,9 @@ 
 				print length_accounta($line->subledger_account);
 			} else {
 				// Should not happen: subledger account must be null or a non empty value
-				print '<span class="error">' . $langs->trans("Unknown");
+				print '<span class="error">'.$langs->trans("Unknown");
 				if ($line->subledger_label) {
-					print ' (' . $line->subledger_label . ')';
+					print ' ('.$line->subledger_label.')';
 					$htmltext = 'EmptyStringForSubledgerAccountButSubledgerLabelDefined';
 				} else {
 					$htmltext = 'EmptyStringForSubledgerAccountAndSubledgerLabel';
@@ -1091,9 +1091,9 @@ 
 			}
 		} else {
 			if ($line->numero_compte != "" && $line->numero_compte != '-1') {
-				print length_accountg($line->numero_compte) . ' : ' . $object->get_compte_desc($line->numero_compte);
+				print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
 			} else {
-				print '<span class="error">' . $langs->trans("Unknown") . '</span>';
+				print '<span class="error">'.$langs->trans("Unknown").'</span>';
 			}
 		}
 		print '</td>';
@@ -1116,7 +1116,7 @@ 
 			if (in_array($line->id, $arrayofselected)) {
 				$selected = 1;
 			}
-			print '<input id="cb' . $line->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $line->id . '"' . ($selected ? ' checked="checked"' : '') . ' />';
+			print '<input id="cb'.$line->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$line->id.'"'.($selected ? ' checked="checked"' : '').' />';
 		}
 		print '</td>';
 		if (!$i) {
@@ -1209,7 +1209,7 @@ 
 		} elseif ($line->doc_type == 'bank') {
 			print $objectstatic->getNomUrl(1);
 			$bank_ref = strstr($line->doc_ref, '-');
-			print " " . $bank_ref;
+			print " ".$bank_ref;
 		} else {
 			print $line->doc_ref;
 		}
@@ -1314,7 +1314,7 @@ 
 			if (in_array($line->id, $arrayofselected)) {
 				$selected = 1;
 			}
-			print '<input id="cb' . $line->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $line->id . '"' . ($selected ? ' checked="checked"' : '') . ' />';
+			print '<input id="cb'.$line->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$line->id.'"'.($selected ? ' checked="checked"' : '').' />';
 		}
 		print '</td>';
 		if (!$i) {

htdocs/accountancy/class/accountingaccount.class.php

Spacing +58 added lines, -58 removed lines

@@ -279,7 +279,7 @@ 
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_account(";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_account(";
 		$sql .= "datec";
 		$sql .= ", entity";
 		$sql .= ", fk_pcg_version";
@@ -313,11 +313,11 @@ 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_account");
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_account");
 
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action to call a trigger.
@@ -333,8 +333,8 @@ 
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
-				dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -359,18 +359,18 @@ 
 
 		$this->db->begin();
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
-		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
-		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
-		$sql .= " , account_number = '" . $this->db->escape($this->account_number) . "'";
-		$sql .= " , account_parent = " . (int) $this->account_parent;
-		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "''");
-		$sql .= " , labelshort = " . ($this->labelshort ? "'" . $this->db->escape($this->labelshort) . "'" : "''");
-		$sql .= " , fk_accounting_category = " . (empty($this->account_category) ? 0 : (int) $this->account_category);
-		$sql .= " , fk_user_modif = " . ((int) $user->id);
-		$sql .= " , active = " . (int) $this->active;
-		$sql .= " , reconcilable = " . (int) $this->reconcilable;
-		$sql .= " WHERE rowid = " . ((int) $this->id);
+		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account ";
+		$sql .= " SET fk_pcg_version = ".($this->fk_pcg_version ? "'".$this->db->escape($this->fk_pcg_version)."'" : "null");
+		$sql .= " , pcg_type = ".($this->pcg_type ? "'".$this->db->escape($this->pcg_type)."'" : "null");
+		$sql .= " , account_number = '".$this->db->escape($this->account_number)."'";
+		$sql .= " , account_parent = ".(int) $this->account_parent;
+		$sql .= " , label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "''");
+		$sql .= " , labelshort = ".($this->labelshort ? "'".$this->db->escape($this->labelshort)."'" : "''");
+		$sql .= " , fk_accounting_category = ".(empty($this->account_category) ? 0 : (int) $this->account_category);
+		$sql .= " , fk_user_modif = ".((int) $user->id);
+		$sql .= " , active = ".(int) $this->active;
+		$sql .= " , reconcilable = ".(int) $this->reconcilable;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -440,22 +440,22 @@ 
 			$this->db->begin();
 
 			if (!$error) {
-				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_account";
-				$sql .= " WHERE rowid=" . ((int) $this->id);
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."accounting_account";
+				$sql .= " WHERE rowid=".((int) $this->id);
 
-				dol_syslog(get_class($this) . "::delete sql=" . $sql);
+				dol_syslog(get_class($this)."::delete sql=".$sql);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
-					$this->errors[] = "Error " . $this->db->lasterror();
+					$this->errors[] = "Error ".$this->db->lasterror();
 				}
 			}
 
 			// Commit or rollback
 			if ($error) {
 				foreach ($this->errors as $errmsg) {
-					dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-					$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+					dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
 				$this->db->rollback();
 				return -1 * $error;
@@ -484,7 +484,7 @@ 
 	public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0, $option = '')
 	{
 		global $langs, $conf, $hookmanager;
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -495,13 +495,13 @@ 
 		$url = '';
 		$labelurl = '';
 		if (empty($option) || $option == 'ledger') {
-			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start=' . urlencode((isset($this->account_number) ? $this->account_number : '')) . '&search_accountancy_code_end=' . urlencode((isset($this->account_number) ? $this->account_number : ''));
+			$url = DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start='.urlencode((isset($this->account_number) ? $this->account_number : '')).'&search_accountancy_code_end='.urlencode((isset($this->account_number) ? $this->account_number : ''));
 			$labelurl = $langs->trans("ShowAccountingAccountInLedger");
 		} elseif ($option == 'journals') {
-			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?search_accountancy_code_start=' . urlencode($this->account_number) . '&search_accountancy_code_end=' . urlencode($this->account_number);
+			$url = DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?search_accountancy_code_start='.urlencode($this->account_number).'&search_accountancy_code_end='.urlencode($this->account_number);
 			$labelurl = $langs->trans("ShowAccountingAccountInJournals");
 		} elseif ($option == 'accountcard') {
-			$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . urlencode((string) ($this->id));
+			$url = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.urlencode((string) ($this->id));
 			$labelurl = $langs->trans("ShowAccountingAccount");
 		}
 
@@ -523,29 +523,29 @@ 
 			$labeltoshow = $this->labelshort;
 		}
 
-		$label = '<u>' . $labelurl . '</u>';
+		$label = '<u>'.$labelurl.'</u>';
 		if (!empty($this->account_number)) {
-			$label .= '<br><b>' . $langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
+			$label .= '<br><b>'.$langs->trans('AccountAccounting').':</b> '.length_accountg($this->account_number);
 		}
 		if (!empty($labeltoshow)) {
-			$label .= '<br><b>' . $langs->trans('Label') . ':</b> ' . $labeltoshow;
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
 		}
 		if ($moretitle) {
-			$label .= ' - ' . $moretitle;
+			$label .= ' - '.$moretitle;
 		}
 
 		$linkclose = '';
 		if (empty($notooltip)) {
 			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $labelurl;
-				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip"';
 		}
 
-		$linkstart = '<a href="' . $url . '"';
-		$linkstart .= $linkclose . '>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		if ($nourl) {
@@ -556,20 +556,20 @@ 
 
 		$label_link = length_accountg($this->account_number);
 		if ($withlabel) {
-			$label_link .= ' - ' . ($nourl ? '<span class="opacitymedium">' : '') . $labeltoshow . ($nourl ? '</span>' : '');
+			$label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$labeltoshow.($nourl ? '</span>' : '');
 		}
 
 		if ($withpicto) {
-			$result .= ($linkstart . img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1) . $linkend);
+			$result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
 		}
 		if ($withpicto && $withpicto != 2) {
 			$result .= ' ';
 		}
 		if ($withpicto != 2) {
-			$result .= $linkstart . $label_link . $linkend;
+			$result .= $linkstart.$label_link.$linkend;
 		}
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -589,10 +589,10 @@ 
 	public function info($id)
 	{
 		$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms as date_modification';
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'accounting_account as a';
-		$sql .= ' WHERE a.rowid = ' . ((int) $id);
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'accounting_account as a';
+		$sql .= ' WHERE a.rowid = '.((int) $id);
 
-		dol_syslog(get_class($this) . '::info sql=' . $sql);
+		dol_syslog(get_class($this).'::info sql='.$sql);
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
@@ -745,7 +745,7 @@ 
 		$hookmanager->initHooks(array('accountancyBindingCalculation'));
 
 		// Execute hook accountancyBindingCalculation
-		$parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet ,'accountingAccount' => $accountingAccount, $type);
+		$parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet, 'accountingAccount' => $accountingAccount, $type);
 		$reshook = $hookmanager->executeHooks('accountancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks
 
 		if (empty($reshook)) {
@@ -756,51 +756,51 @@ 
 				$const_name = "BUY";
 			}
 
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 			$isBuyerInEEC = isInEEC($buyer);
 			$isSellerInEEC = isInEEC($seller);
-			$code_l = '';	// Default value for generic product/service
-			$code_p = '';	// Value for the product/service in parameter ($product)
-			$code_t = '';	// Default value of product account for the thirdparty
+			$code_l = ''; // Default value for generic product/service
+			$code_p = ''; // Value for the product/service in parameter ($product)
+			$code_t = ''; // Default value of product account for the thirdparty
 			$suggestedid = '';
 
 			// Level 1 (define $code_l): Search suggested default account for product/service
 			$suggestedaccountingaccountbydefaultfor = '';
 			if ($factureDet->product_type == 1) {
 				if ($buyer->country_code == $seller->country_code || empty($buyer->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-					$code_l = getDolGlobalString('ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT');
+					$code_l = getDolGlobalString('ACCOUNTING_SERVICE_'.$const_name.'_ACCOUNT');
 					$suggestedaccountingaccountbydefaultfor = '';
 				} else {
 					if ($isSellerInEEC && $isBuyerInEEC && $factureDet->tva_tx != 0) {    // European intravat sale, but with a VAT
-						$code_l = getDolGlobalString('ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT');
+						$code_l = getDolGlobalString('ACCOUNTING_SERVICE_'.$const_name.'_ACCOUNT');
 						$suggestedaccountingaccountbydefaultfor = 'eecwithvat';
 					} elseif ($isSellerInEEC && $isBuyerInEEC && empty($buyer->tva_intra)) {    // European intravat sale, without VAT intra community number
-						$code_l = getDolGlobalString('ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT');
+						$code_l = getDolGlobalString('ACCOUNTING_SERVICE_'.$const_name.'_ACCOUNT');
 						$suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
 					} elseif ($isSellerInEEC && $isBuyerInEEC) {    // European intravat sale
-						$code_l = getDolGlobalString('ACCOUNTING_SERVICE_' . $const_name . '_INTRA_ACCOUNT');
+						$code_l = getDolGlobalString('ACCOUNTING_SERVICE_'.$const_name.'_INTRA_ACCOUNT');
 						$suggestedaccountingaccountbydefaultfor = 'eec';
 					} else {                                        // Foreign sale
-						$code_l = getDolGlobalString('ACCOUNTING_SERVICE_' . $const_name . '_EXPORT_ACCOUNT');
+						$code_l = getDolGlobalString('ACCOUNTING_SERVICE_'.$const_name.'_EXPORT_ACCOUNT');
 						$suggestedaccountingaccountbydefaultfor = 'export';
 					}
 				}
 			} elseif ($factureDet->product_type == 0) {
 				if ($buyer->country_code == $seller->country_code || empty($buyer->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-					$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT');
+					$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_'.$const_name.'_ACCOUNT');
 					$suggestedaccountingaccountbydefaultfor = '';
 				} else {
 					if ($isSellerInEEC && $isBuyerInEEC && $factureDet->tva_tx != 0) {    // European intravat sale, but with a VAT
-						$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT');
+						$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_'.$const_name.'_ACCOUNT');
 						$suggestedaccountingaccountbydefaultfor = 'eecwithvat';
 					} elseif ($isSellerInEEC && $isBuyerInEEC && empty($buyer->tva_intra)) {    // European intravat sale, without VAT intra community number
-						$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT');
+						$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_'.$const_name.'_ACCOUNT');
 						$suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
 					} elseif ($isSellerInEEC && $isBuyerInEEC) {    // European intravat sale
-						$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_' . $const_name . '_INTRA_ACCOUNT');
+						$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_'.$const_name.'_INTRA_ACCOUNT');
 						$suggestedaccountingaccountbydefaultfor = 'eec';
 					} else {
-						$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_' . $const_name . '_EXPORT_ACCOUNT');
+						$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_'.$const_name.'_EXPORT_ACCOUNT');
 						$suggestedaccountingaccountbydefaultfor = 'export';
 					}
 				}
@@ -874,7 +874,7 @@ 
 			}
 
 			// Manage Deposit
-			if (getDolGlobalString('ACCOUNTING_ACCOUNT_' . strtoupper($type) . '_DEPOSIT')) {
+			if (getDolGlobalString('ACCOUNTING_ACCOUNT_'.strtoupper($type).'_DEPOSIT')) {
 				if ($factureDet->desc == "(DEPOSIT)" || $facture->type == $facture::TYPE_DEPOSIT) {
 					$accountdeposittoventilated = new self($this->db);
 					if ($type == 'customer') {