Dolibarr / dolibarr

htdocs/core/modules/modStockTransfer.class.php

Spacing +3 added lines, -3 removed lines

@@ -438,21 +438,21 @@
 		// Roles
 		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STDEST' AND element = 'stocktransfer' AND source = 'internal'");
 		$res = $this->db->fetch_object($resql);
-		$nextid=$this->getNextId();
+		$nextid = $this->getNextId();
 		if (empty($res)) {
 			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'internal', 'STRESP', 'Responsible for stock transfers', 1, NULL, 0)");
 		}
 
 		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STFROM' AND element = 'stocktransfer' AND source = 'external'");
 		$res = $this->db->fetch_object($resql);
-		$nextid=$this->getNextId();
+		$nextid = $this->getNextId();
 		if (empty($res)) {
 			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'external', 'STFROM', 'Contact sending the stock transfer', 1, NULL, 0)");
 		}
 
 		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STDEST' AND element = 'stocktransfer' AND source = 'external'");
 		$res = $this->db->fetch_object($resql);
-		$nextid=$this->getNextId();
+		$nextid = $this->getNextId();
 		if (empty($res)) {
 			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'external', 'STDEST', 'Contact receiving the stock transfer', 1, NULL, 0)");
 		}

htdocs/societe/canvas/actions_card_common.class.php

Spacing +2 added lines, -2 removed lines

@@ -298,7 +298,7 @@ 
 			$this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
 			$this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-			$this->tpl['phone_mobile'] 	= dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_MOB');
+			$this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_MOB');
 			$this->tpl['fax'] 		= dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
 			$this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 1);
 			$this->tpl['url'] 		= dol_print_url($this->object->url);
@@ -403,7 +403,7 @@ 
 		$this->object->country_id = GETPOST("country_id") ? GETPOST("country_id") : $mysoc->country_id;
 		$this->object->state_id = GETPOST("state_id");
 		$this->object->phone				= GETPOST("phone");
-		$this->object->phone_mobile			= GETPOST("phone_mobile");
+		$this->object->phone_mobile = GETPOST("phone_mobile");
 		$this->object->fax					= GETPOST("fax");
 		$this->object->email				= GETPOST("email", 'alphawithlgt');
 		$this->object->url					= GETPOST("url");

htdocs/societe/card.php

Spacing +55 added lines, -55 removed lines

@@ -102,7 +102,7 @@ 
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
-$confirm 	= GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 
 $dol_openinpopup = '';
 if (!empty($backtopagejsfields)) {
@@ -155,12 +155,12 @@ 
 }
 
 // Permissions
-$permissiontoread 	= $user->hasRight('societe', 'lire');
-$permissiontoadd 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoread = $user->hasRight('societe', 'lire');
+$permissiontoadd = $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->hasRight('societe', 'supprimer') || ($permissiontoadd && isset($object->status) && $object->status == 0);
-$permissionnote 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php
 $permissiondellink 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_dellink.inc.php
-$upload_dir 		= $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
+$upload_dir = $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
@@ -203,7 +203,7 @@ 
 
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->hasRight('societe', 'creer')) {
 		$soc_origin_id = GETPOST('soc_origin', 'int');
-		$soc_origin = new Societe($db);		// The thirdparty that we will delete
+		$soc_origin = new Societe($db); // The thirdparty that we will delete
 
 		if ($soc_origin_id <= 0) {
 			$langs->load('errors');
@@ -292,12 +292,12 @@ 
 			$error++;
 		}
 
-		if (isModEnabled('mailing') && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOST('contact_no_email', 'int') == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
 
-		if (isModEnabled('mailing') && GETPOST("private", 'int') == 1 && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && GETPOST("private", 'int') == 1 && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOST('contact_no_email', 'int') == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
@@ -316,19 +316,19 @@ 
 				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
 				$object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
 				// Add non official properties
-				$object->name_bis			= GETPOST('name', 'alphanohtml');
-				$object->firstname			= GETPOST('firstname', 'alphanohtml');
+				$object->name_bis = GETPOST('name', 'alphanohtml');
+				$object->firstname = GETPOST('firstname', 'alphanohtml');
 			} else {
-				$object->name				= GETPOST('name', 'alphanohtml');
+				$object->name = GETPOST('name', 'alphanohtml');
 			}
 			$object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
-			$object->name_alias				= GETPOST('name_alias', 'alphanohtml');
+			$object->name_alias = GETPOST('name_alias', 'alphanohtml');
 			$object->parent					= GETPOSTISSET('parent_company_id') ? GETPOST('parent_company_id', 'int') : $object->parent;
 			$object->address				= GETPOST('address', 'alphanohtml');
-			$object->zip					= GETPOST('zipcode', 'alphanohtml');
-			$object->town					= GETPOST('town', 'alphanohtml');
-			$object->country_id				= GETPOST('country_id', 'int');
-			$object->state_id				= GETPOST('state_id', 'int');
+			$object->zip = GETPOST('zipcode', 'alphanohtml');
+			$object->town = GETPOST('town', 'alphanohtml');
+			$object->country_id = GETPOST('country_id', 'int');
+			$object->state_id = GETPOST('state_id', 'int');
 
 			$object->socialnetworks = array();
 			if (isModEnabled('socialnetworks')) {
@@ -340,10 +340,10 @@ 
 			}
 
 			$object->phone					= GETPOST('phone', 'alpha');
-			$object->phone_mobile 			= (string) GETPOST("phone_mobile", 'alpha');
+			$object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
 			$object->fax					= GETPOST('fax', 'alpha');
 			$object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
-			$object->no_email 				= GETPOST("no_email", "int");
+			$object->no_email = GETPOST("no_email", "int");
 			$object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
 			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
 			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
@@ -353,13 +353,13 @@ 
 			$object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
 			$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
 			$object->code_client			= GETPOSTISSET('customer_code') ? GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
-			$object->code_fournisseur		= GETPOSTISSET('supplier_code') ? GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
+			$object->code_fournisseur = GETPOSTISSET('supplier_code') ? GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
 			$object->capital				= GETPOST('capital', 'alphanohtml');
 			$object->barcode				= GETPOST('barcode', 'alphanohtml');
 
 			$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
 			$object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
-			$object->vat_reverse_charge		= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
+			$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 			$object->status = GETPOST('status', 'alpha');
 
 			// Local Taxes
@@ -369,24 +369,24 @@ 
 			$object->localtax1_value		= GETPOST('lt1', 'alpha');
 			$object->localtax2_value		= GETPOST('lt2', 'alpha');
 
-			$object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
+			$object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
 			$object->effectif_id			= GETPOST('effectif_id', 'int');
-			$object->typent_id				= GETPOST('typent_id', 'int');
+			$object->typent_id = GETPOST('typent_id', 'int');
 
 			$object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
 
-			$object->client					= GETPOST('client', 'int');
+			$object->client = GETPOST('client', 'int');
 			$object->fournisseur			= GETPOST('fournisseur', 'int');
 
-			$object->commercial_id			= GETPOST('commercial_id', 'int');
-			$object->default_lang			= GETPOST('default_lang');
+			$object->commercial_id = GETPOST('commercial_id', 'int');
+			$object->default_lang = GETPOST('default_lang');
 
 			// Webservices url/key
 			$object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
 			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
 			if (GETPOSTISSET('accountancy_code_sell')) {
-				$accountancy_code_sell		= GETPOST('accountancy_code_sell', 'alpha');
+				$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 				if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 					$object->accountancy_code_sell = '';
@@ -395,7 +395,7 @@ 
 				}
 			}
 			if (GETPOSTISSET('accountancy_code_buy')) {
-				$accountancy_code_buy		= GETPOST('accountancy_code_buy', 'alpha');
+				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 				if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 					$object->accountancy_code_buy = '';
@@ -993,7 +993,7 @@ 
 		}
 
 		$object->phone				= GETPOST('phone', 'alpha');
-		$object->phone_mobile       = (string) GETPOST("phone_mobile", 'alpha');
+		$object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
 		$object->fax				= GETPOST('fax', 'alpha');
 		$object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
 		$object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
@@ -1010,7 +1010,7 @@ 
 		$object->civility_id		= GETPOST('civility_id', 'alpha');
 
 		$object->tva_assuj = GETPOST('assujtva_value', 'int');
-		$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
+		$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 		$object->status = GETPOST('status', 'int');
 
 		//Local Taxes
@@ -1026,7 +1026,7 @@ 
 		$object->default_lang = GETPOST('default_lang');
 
 		if (GETPOSTISSET('accountancy_code_sell')) {
-			$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+			$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 			if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 				$object->accountancy_code_sell = '';
@@ -1035,7 +1035,7 @@ 
 			}
 		}
 		if (GETPOSTISSET('accountancy_code_buy')) {
-			$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+			$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 			if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 				$object->accountancy_code_buy = '';
@@ -1160,7 +1160,7 @@ 
 
 			print '<script type="text/javascript">';
 			print '$(document).ready(function () {
-					var canHaveCustomerCategoryIfNotCustomerProspectSupplier = ' . (!getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '0' : '1') . ';
+					var canHaveCustomerCategoryIfNotCustomerProspectSupplier = ' . (!getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '0' : '1').';
 
 					init_customer_categ();
 			  		$("#customerprospect").change(function() {
@@ -1232,7 +1232,7 @@ 
 			print '</td><td'.(!getDolGlobalString('SOCIETE_USEPREFIX') ? ' colspan="3"' : '').'>';
 
 			print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
-			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300');	// For some countries that need the company name in 2 languages
+			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300'); // For some countries that need the company name in 2 languages
 			// This implementation of the feature to search already existing company has been disabled. It must be implemented by keeping the "input text" and we must call the search ajax societe/ajax/ajaxcompanies.php
 			// on a keydown of the input. We should show data about a duplicate found if we found less than 5 answers into a div under the input.
 			/*
@@ -1494,7 +1494,7 @@ 
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
 				}
-				print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email') .' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
+				print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email').' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
 				print '<td class="individualline" '.(($conf->browser->layout == 'phone') || !isModEnabled('mailing') ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ? GETPOST("contact_no_email", 'alpha') : (empty($object->no_email) ? 0 : 1)), 1, false, 1).'</td>';
 			}
 			print '</tr>';
@@ -1567,7 +1567,7 @@ 
 			// Vat is used
 			print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
 			print '<td>';
-			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"' : 'checked="checked"') . ' value="1">'; // Assujeti par default en creation
+			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" '.(GETPOSTISSET('assujtva_value') ? 'checked="checked"' : 'checked="checked"').' value="1">'; // Assujeti par default en creation
 			print '</td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
@@ -1608,7 +1608,7 @@ 
 
 			// VAT reverse charge by default
 			if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
-				print '<tr><td>' . $form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0) . '</td><td colspan="3">';
+				print '<tr><td>'.$form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0).'</td><td colspan="3">';
 				print '<input type="checkbox" name="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').'>';
 				print '</td></tr>';
 			}
@@ -1617,21 +1617,21 @@ 
 			//TODO: Place into a function to control showing by country or study better option
 			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
-				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '').' value="1">';
 				print '</td>';
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
 				}
 				print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
-				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 			} elseif ($mysoc->localtax1_assuj == "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
-				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 			} elseif ($mysoc->localtax2_assuj == "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
-				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 			}
 
@@ -1871,10 +1871,10 @@ 
 				}
 
 				$object->phone					= GETPOST('phone', 'alpha');
-				$object->phone_mobile			= (string) GETPOST('phone_mobile', 'alpha');
+				$object->phone_mobile = (string) GETPOST('phone_mobile', 'alpha');
 				$object->fax					= GETPOST('fax', 'alpha');
 				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-				$object->no_email				= GETPOST("no_email", "int");
+				$object->no_email = GETPOST("no_email", "int");
 				$object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
 				$object->capital				= GETPOST('capital', 'alphanohtml');
 				$object->idprof1				= GETPOST('idprof1', 'alphanohtml');
@@ -1890,16 +1890,16 @@ 
 				$object->default_lang = GETPOST('default_lang', 'alpha');
 
 				$object->tva_assuj				= GETPOST('assujtva_value', 'int');
-				$object->vat_reverse_charge		= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
+				$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
-				$object->status =				GETPOST('status', 'int');
+				$object->status = GETPOST('status', 'int');
 
 				// Webservices url/key
 				$object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
 				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
 				if (GETPOSTISSET('accountancy_code_sell')) {
-					$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+					$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 					if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 						$object->accountancy_code_sell = '';
@@ -1908,7 +1908,7 @@ 
 					}
 				}
 				if (GETPOSTISSET('accountancy_code_buy')) {
-					$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+					$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 					if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 						$object->accountancy_code_buy = '';
@@ -1990,7 +1990,7 @@ 
     				}
     			});
 
-				var canHaveCustomerCategoryIfNotCustomerProspect = ' . (getDolGlobalInt('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '1' : '0') . ';
+				var canHaveCustomerCategoryIfNotCustomerProspect = ' . (getDolGlobalInt('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '1' : '0').';
 
 				init_customer_categ();
 	  			$("#customerprospect").change(function() {
@@ -2307,14 +2307,14 @@ 
 
 				// VAT is used
 				print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
-				print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . ($object->tva_assuj ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="assujtva_value" name="assujtva_value" type="checkbox" '.($object->tva_assuj ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 
 				// Local Taxes
 				//TODO: Place into a function to control showing by country or study better option
 				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
-					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . ($object->localtax1_assuj ? 'checked="checked"' : '') . ' value="1">';
+					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.($object->localtax1_assuj ? 'checked="checked"' : '').' value="1">';
 					if (!isOnlyOneLocalTax(1)) {
 						print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
@@ -2323,7 +2323,7 @@ 
 					print '</td>';
 					print '</tr><tr>';
 					print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
-					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . ($object->localtax2_assuj ? 'checked="checked"' : '') . ' value="1"></td></tr>';
+					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.($object->localtax2_assuj ? 'checked="checked"' : '').' value="1"></td></tr>';
 					if (!isOnlyOneLocalTax(2)) {
 						print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
@@ -2332,7 +2332,7 @@ 
 					print '</td></tr>';
 				} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1") {
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
-					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . ($object->localtax1_assuj ? 'checked="checked"' : '') . ' value="1">';
+					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.($object->localtax1_assuj ? 'checked="checked"' : '').' value="1">';
 					if (!isOnlyOneLocalTax(1)) {
 						print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
@@ -2341,7 +2341,7 @@ 
 					print '</td></tr>';
 				} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1") {
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
-					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . ($object->localtax2_assuj ? 'checked="checked"' : '') . ' value="1">';
+					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.($object->localtax2_assuj ? 'checked="checked"' : '').' value="1">';
 					if (!isOnlyOneLocalTax(2)) {
 						print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
@@ -2352,7 +2352,7 @@ 
 
 				// VAT reverse charge by default
 				if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
-					print '<tr><td>' . $form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0) . '</td><td colspan="3">';
+					print '<tr><td>'.$form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0).'</td><td colspan="3">';
 					print '<input type="checkbox" name="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').'>';
 					print '</td></tr>';
 				}
@@ -2529,7 +2529,7 @@ 
 					$maxfilesizearray = getMaxFileSizeArray();
 					$maxmin = $maxfilesizearray['maxmin'];
 					if ($maxmin > 0) {
-						print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+						print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 					}
 					print '<input type="file" class="flat" name="photo" id="photoinput">';
 					print '</td></tr>';
@@ -2750,7 +2750,7 @@ 
 					print '<tr><td>';
 					print $form->textwithpicto($langs->trans('VATReverseChargeByDefault'), $langs->trans('VATReverseChargeByDefaultDesc'));
 					print '</td><td>';
-					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>';
 					print '</tr>';
 				}

test/phpunit/CommonClassTest.class.php

Spacing +17 added lines, -17 removed lines

@@ -25,7 +25,7 @@ 
  *      \remarks    Class that extends all PHPunit tests. To share similare code between each test.
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -74,7 +74,7 @@ 
 		parent::__construct($name, $data, $dataName);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$this->savconf = $conf;
 		$this->savuser = $user;
 		$this->savlangs = $langs;
@@ -93,7 +93,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if ((int) getenv('PHPUNIT_DEBUG') > 0) {
@@ -151,7 +151,7 @@ 
 	 */
 	protected function setUp(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		$conf = $this->savconf;
 		$user = $this->savuser;
@@ -221,7 +221,7 @@ 
 		'accounting' => 'Accounting',
 		'agenda' => 'Agenda',
 		'ai' => 'Ai',
-		'anothermodule' => null,  // Not used in code, used in translations.lang
+		'anothermodule' => null, // Not used in code, used in translations.lang
 		'api' => 'Api',
 		'asset' => 'Asset',
 		'bank' => 'Banque',
@@ -233,9 +233,9 @@ 
 		'cashdesk' => null,
 		'category' => 'Categorie',
 		'clicktodial' => 'ClickToDial',
-		'collab' => 'Collab',  // TODO: fill in proper name
+		'collab' => 'Collab', // TODO: fill in proper name
 		'comptabilite' => 'Comptabilite',
-		'contact' => null,  // TODO: fill in proper class
+		'contact' => null, // TODO: fill in proper class
 		'contract' => 'Contrat',
 		'cron' => 'Cron',
 		'datapolicy' => 'DataPolicy',
@@ -243,22 +243,22 @@ 
 		'debugbar' => 'DebugBar',
 		'delivery_note' => 'Expedition',
 		'deplacement' => 'Deplacement',
-		"documentgeneration" => 'DocumentGeneration',  // TODO: fill in proper name
+		"documentgeneration" => 'DocumentGeneration', // TODO: fill in proper name
 		'don' => 'Don',
 		'dynamicprices' => 'DynamicPrices',
 		'ecm' => 'ECM',
-		'ecotax' => null,  // TODO: External module ?
+		'ecotax' => null, // TODO: External module ?
 		'emailcollector' => 'EmailCollector',
 		'eventorganization' => 'EventOrganization',
 		'expensereport' => 'ExpenseReport',
 		'export' => 'Export',
-		'externalrss' => 'ExternalRss',  // TODO: fill in proper name
+		'externalrss' => 'ExternalRss', // TODO: fill in proper name
 		'externalsite' => 'ExternalSite',
 		'fckeditor' => 'Fckeditor',
 		'fournisseur' => 'Fournisseur',
 		'ftp' => 'FTP',
-		'geoipmaxmind' => 'GeoIPMaxmind',  // TODO: fill in proper name
-		'google' => null,  // External ?
+		'geoipmaxmind' => 'GeoIPMaxmind', // TODO: fill in proper name
+		'google' => null, // External ?
 		'gravatar' => 'Gravatar',
 		'holiday' => 'Holiday',
 		'hrm' => 'HRM',
@@ -272,7 +272,7 @@ 
 		'ldap' => 'Ldap',
 		'loan' => 'Loan',
 		'mailing' => 'Mailing',
-		'mailman' => null,  // Same module as mailmanspip -> MailmanSpip ??
+		'mailman' => null, // Same module as mailmanspip -> MailmanSpip ??
 		'mailmanspip' => 'MailmanSpip',
 		'margin' => 'Margin',
 		'member' => 'Adherent',
@@ -285,7 +285,7 @@ 
 		'notification' => 'Notification',
 		'numberwords' => null, // Not provided by default, no module tests
 		'oauth' => 'Oauth',
-		'openstreetmap' => null,  // External module?
+		'openstreetmap' => null, // External module?
 		'opensurvey' => 'OpenSurvey',
 		'order' => 'Commande',
 		'partnership' => 'Partnership',
@@ -312,8 +312,8 @@ 
 		'stock' => 'Stock',
 		'stocktransfer' => 'StockTransfer',
 		'stripe' => 'Stripe',
-		'supplier_invoice' => null,  // Special case, uses invoice
-		'supplier_order' => null,  // Special case, uses invoice
+		'supplier_invoice' => null, // Special case, uses invoice
+		'supplier_order' => null, // Special case, uses invoice
 		'supplier_proposal' => 'SupplierProposal',
 		'syslog' => 'Syslog',
 		'takepos' => 'TakePos',
@@ -324,7 +324,7 @@ 
 		'webhook' => 'Webhook',
 		'webportal' => 'WebPortal',
 		'webservices' => 'WebServices',
-		'webservicesclient' => 'WebServicesClient',  // TODO: set proper name
+		'webservicesclient' => 'WebServicesClient', // TODO: set proper name
 		'website' => 'Website',
 		'workflow' => 'Workflow',
 		'workstation' => 'Workstation',