Completed
Branch develop (da8758)
by
unknown
24:48
created
htdocs/user/param_ihm.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 	print '<td>';
414 414
 	$s = picto_from_langcode(getDolGlobalString('MAIN_LANG_DEFAULT'));
415 415
 	print $s ? $s.' ' : '';
416
-	print (getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT')));
416
+	print (getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_".getDolGlobalString('MAIN_LANG_DEFAULT')));
417 417
 	print '</td>';
418 418
 	print '<td class="nowrap"><input class="oddeven" name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(getDolGlobalString('MAIN_LANG_DEFAULT') ? " checked" : "");
419 419
 	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
 
467 467
 	// Max size of short lists
468 468
 	print '<tr class="oddeven"><td>'.$langs->trans("MaxSizeShortList").'</td>';
469
-	print '<td>' . getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT').'</td>';
469
+	print '<td>'.getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT').'</td>';
470 470
 	print '<td class="nowrap" width="20%"><input class="oddeven" name="check_MAIN_SIZE_SHORTLIST_LIMIT" id="check_MAIN_SIZE_SHORTLIST_LIMIT" type="checkbox" '.(!empty($object->conf->MAIN_SIZE_SHORTLIST_LIMIT) ? " checked" : "");
471 471
 	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
472 472
 	print '> <label for="check_MAIN_SIZE_SHORTLIST_LIMIT">'.$langs->trans("UsePersonalValue").'</label></td>';
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
 	print '<td>';
538 538
 	$s = picto_from_langcode(getDolGlobalString('MAIN_LANG_DEFAULT'));
539 539
 	print ($s ? $s.' ' : '');
540
-	print (getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT')));
540
+	print (getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_".getDolGlobalString('MAIN_LANG_DEFAULT')));
541 541
 	print '</td>';
542 542
 	print '<td class="nowrap"><input class="oddeven" type="checkbox" disabled '.(!empty($object->conf->MAIN_LANG_DEFAULT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
543 543
 	print '<td>';
Please login to merge, or discard this patch.
htdocs/theme/md/style.css.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 $path = ''; // This value may be used in future for external module to overwrite theme
187 187
 $theme = 'md'; // Value of theme
188 188
 if (getDolGlobalString('MAIN_OVERWRITE_THEME_RES')) {
189
-	$path = '/' . getDolGlobalString('MAIN_OVERWRITE_THEME_RES');
189
+	$path = '/'.getDolGlobalString('MAIN_OVERWRITE_THEME_RES');
190 190
 	$theme = getDolGlobalString('MAIN_OVERWRITE_THEME_RES');
191 191
 }
192 192
 
@@ -275,12 +275,12 @@  discard block
 block discarded – undo
275 275
 $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? getDolGlobalString('THEME_ELDY_TEXTTITLELINK', $colortexttitlelink) : getDolUserString('THEME_ELDY_TEXTTITLELINK', $colortexttitlelink);
276 276
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? getDolGlobalString('THEME_ELDY_TEXT', $colortext) : getDolUserString('THEME_ELDY_TEXT', $colortext);
277 277
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? getDolGlobalString('THEME_ELDY_TEXTLINK', $colortext) : getDolUserString('THEME_ELDY_TEXTLINK', $colortextlink);
278
-$colortextlinkHsla    = colorHexToHsl($colortextlink, false, true);
278
+$colortextlinkHsla = colorHexToHsl($colortextlink, false, true);
279 279
 $butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? getDolGlobalString('THEME_ELDY_BTNACTION', $butactionbg) : getDolUserString('THEME_ELDY_BTNACTION', $butactionbg);
280
-$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? getDolGlobalString('THEME_ELDY_TEXTBTNACTION', $textbutaction) : getDolUserString('THEME_ELDY_TEXTBTNACTION', $textbutaction);
280
+$textbutaction = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? getDolGlobalString('THEME_ELDY_TEXTBTNACTION', $textbutaction) : getDolUserString('THEME_ELDY_TEXTBTNACTION', $textbutaction);
281 281
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? getDolGlobalString('THEME_ELDY_FONT_SIZE1', $fontsize) : getDolUserString('THEME_ELDY_FONT_SIZE1', $fontsize);
282 282
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? getDolGlobalString('THEME_ELDY_FONT_SIZE2', $fontsize) : getDolUserString('THEME_ELDY_FONT_SIZE2', $fontsize);
283
-$heightrow			 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '300%' : '155%') : (getDolUserString('THEME_ELDY_USECOMOACTROW') ? '300%' : '155%');
283
+$heightrow = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '300%' : '155%') : (getDolUserString('THEME_ELDY_USECOMOACTROW') ? '300%' : '155%');
284 284
 
285 285
 // Hover color
286 286
 $colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || getDolGlobalString('THEME_ELDY_USE_HOVER') === '255,255,255') ? '' : (getDolGlobalString('THEME_ELDY_USE_HOVER') === '1' ? 'edf4fb' : getDolGlobalString('THEME_ELDY_USE_HOVER')));
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
 if (getDolGlobalString('THEME_DARKMODEENABLED')) {
471 471
 	print "/* For dark mode */\n";
472 472
 	if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) {
473
-		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
473
+		print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
474 474
 	} else {
475 475
 		print "@media not print {";
476 476
 	}
@@ -3370,7 +3370,7 @@  discard block
 block discarded – undo
3370 3370
 												if (preg_match('/^fa\-/', $iconformodule)) {
3371 3371
 													// This is a fa icon
3372 3372
 												} else {
3373
-													$url = 	dol_buildpath('/'.$val.'/img/'.$iconformodule.'.png', 1);
3373
+													$url = dol_buildpath('/'.$val.'/img/'.$iconformodule.'.png', 1);
3374 3374
 												}
3375 3375
 												$found = 1;
3376 3376
 											} else {
Please login to merge, or discard this patch.
htdocs/societe/card.php 1 patch
Spacing   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 $backtopage = GETPOST('backtopage', 'alpha');
119 119
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
120 120
 $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
121
-$confirm 	= GETPOST('confirm', 'alpha');
121
+$confirm = GETPOST('confirm', 'alpha');
122 122
 
123 123
 $dol_openinpopup = '';
124 124
 if (!empty($backtopagejsfields)) {
@@ -165,10 +165,10 @@  discard block
 block discarded – undo
165 165
 }
166 166
 
167 167
 // Permissions
168
-$permissiontoread 	= $user->hasRight('societe', 'lire');
169
-$permissiontoadd 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
168
+$permissiontoread = $user->hasRight('societe', 'lire');
169
+$permissiontoadd = $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
170 170
 $permissiontodelete = $user->hasRight('societe', 'supprimer') || ($permissiontoadd && isset($object->status) && $object->status == 0);
171
-$permissionnote 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php
171
+$permissionnote = $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php
172 172
 $permissiondellink 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_dellink.inc.php
173 173
 $permissiontoeditextra = $permissiontoadd;
174 174
 if (GETPOST('attribute', 'aZ09') && isset($extrafields->attributes[$object->table_element]['perms'][GETPOST('attribute', 'aZ09')])) {
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	$permissiontoeditextra = dol_eval($extrafields->attributes[$object->table_element]['perms'][GETPOST('attribute', 'aZ09')]);
177 177
 }
178 178
 
179
-$upload_dir 		= $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
179
+$upload_dir = $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
180 180
 
181 181
 // Security check
182 182
 $result = restrictedArea($user, 'societe', $object->id, '&societe', '', 'fk_soc', 'rowid', 0);
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 
224 224
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $permissiontoadd) {
225 225
 		$soc_origin_id = GETPOSTINT('soc_origin');
226
-		$soc_origin = new Societe($db);		// The thirdparty that we will delete
226
+		$soc_origin = new Societe($db); // The thirdparty that we will delete
227 227
 
228 228
 		if ($soc_origin_id <= 0) {
229 229
 			$langs->load('errors');
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 	if ($action == 'update_extras' && $permissiontoeditextra) {
272 272
 		$object->fetch($socid);
273 273
 
274
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
274
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
275 275
 
276 276
 		$attribute_name = GETPOST('attribute', 'aZ09');
277 277
 
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 		if (!$error) {
328 328
 			if ($action == 'update') {	// Test on permission not required here
329 329
 				$ret = $object->fetch($socid);
330
-				$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
330
+				$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
331 331
 			} else {
332 332
 				$object->canvas = $canvas;
333 333
 			}
@@ -338,19 +338,19 @@  discard block
 block discarded – undo
338 338
 				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
339 339
 				$object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
340 340
 				// Add non official properties
341
-				$object->name_bis			= GETPOST('name', 'alphanohtml');
342
-				$object->firstname			= GETPOST('firstname', 'alphanohtml');
341
+				$object->name_bis = GETPOST('name', 'alphanohtml');
342
+				$object->firstname = GETPOST('firstname', 'alphanohtml');
343 343
 			} else {
344
-				$object->name				= GETPOST('name', 'alphanohtml');
344
+				$object->name = GETPOST('name', 'alphanohtml');
345 345
 			}
346 346
 			$object->entity					= ((GETPOSTISSET('entity') && GETPOST('entity') != '') ? GETPOSTINT('entity') : $conf->entity);
347
-			$object->name_alias				= GETPOST('name_alias', 'alphanohtml');
347
+			$object->name_alias = GETPOST('name_alias', 'alphanohtml');
348 348
 			$object->parent					= GETPOSTISSET('parent_company_id') ? GETPOSTINT('parent_company_id') : $object->parent;
349 349
 			$object->address				= GETPOST('address', 'alphanohtml');
350
-			$object->zip					= GETPOST('zipcode', 'alphanohtml');
351
-			$object->town					= GETPOST('town', 'alphanohtml');
352
-			$object->country_id				= GETPOSTINT('country_id');
353
-			$object->state_id				= GETPOSTINT('state_id');
350
+			$object->zip = GETPOST('zipcode', 'alphanohtml');
351
+			$object->town = GETPOST('town', 'alphanohtml');
352
+			$object->country_id = GETPOSTINT('country_id');
353
+			$object->state_id = GETPOSTINT('state_id');
354 354
 
355 355
 			$object->socialnetworks = array();
356 356
 			if (isModEnabled('socialnetworks')) {
@@ -362,10 +362,10 @@  discard block
 block discarded – undo
362 362
 			}
363 363
 
364 364
 			$object->phone					= GETPOST('phone', 'alpha');
365
-			$object->phone_mobile 			= (string) GETPOST("phone_mobile", 'alpha');
365
+			$object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
366 366
 			$object->fax					= GETPOST('fax', 'alpha');
367 367
 			$object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
368
-			$object->no_email 				= GETPOSTINT("no_email");
368
+			$object->no_email = GETPOSTINT("no_email");
369 369
 			$object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
370 370
 			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
371 371
 			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
@@ -375,13 +375,13 @@  discard block
 block discarded – undo
375 375
 			$object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
376 376
 			$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
377 377
 			$object->code_client			= GETPOSTISSET('customer_code') ? GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
378
-			$object->code_fournisseur		= GETPOSTISSET('supplier_code') ? GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
378
+			$object->code_fournisseur = GETPOSTISSET('supplier_code') ? GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
379 379
 			$object->capital				= GETPOSTFLOAT('capital');
380 380
 			$object->barcode				= GETPOST('barcode', 'alphanohtml');
381 381
 
382 382
 			$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
383 383
 			$object->tva_assuj				= GETPOSTINT('assujtva_value');
384
-			$object->vat_reverse_charge		= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
384
+			$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
385 385
 			$object->status = GETPOSTINT('status');
386 386
 
387 387
 			// Local Taxes
@@ -391,9 +391,9 @@  discard block
 block discarded – undo
391 391
 			$object->localtax1_value		= GETPOST('lt1', 'alpha');
392 392
 			$object->localtax2_value		= GETPOST('lt2', 'alpha');
393 393
 
394
-			$object->forme_juridique_code	= GETPOSTINT('forme_juridique_code');
394
+			$object->forme_juridique_code = GETPOSTINT('forme_juridique_code');
395 395
 			$object->effectif_id			= GETPOSTINT('effectif_id');
396
-			$object->typent_id				= GETPOSTINT('typent_id');
396
+			$object->typent_id = GETPOSTINT('typent_id');
397 397
 
398 398
 			$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
399 399
 
@@ -402,8 +402,8 @@  discard block
 block discarded – undo
402 402
 			$prospect = (GETPOSTINT('prospect') > 0 ? 2 : 0);
403 403
 			$prospectcustomer = $customer + $prospect;
404 404
 
405
-			$object->client					= $prospectcustomer;
406
-			$object->fournisseur			= (GETPOSTINT('supplier') > 0 ? 1 : 0);
405
+			$object->client = $prospectcustomer;
406
+			$object->fournisseur = (GETPOSTINT('supplier') > 0 ? 1 : 0);
407 407
 
408 408
 			if ($action == 'add') {
409 409
 				// for prospect, customer or supplier
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 					}
424 424
 
425 425
 					if ($object->fournisseur > 0) {
426
-						$object->cond_reglement_supplier_id	= $paymentTermId;
426
+						$object->cond_reglement_supplier_id = $paymentTermId;
427 427
 
428 428
 						$filterPaymentTypeIdArr = array(1, 2, 3); // allow payment type for supplier (filter is "DBIT" in "Form::select_types_paiements()" method)
429 429
 						if (!empty($form->cache_types_paiements[$paymentTypeId]) && isset($form->cache_types_paiements[$paymentTypeId]['type']) && in_array($form->cache_types_paiements[$paymentTypeId]['type'], $filterPaymentTypeIdArr)) {
@@ -433,15 +433,15 @@  discard block
 block discarded – undo
433 433
 				}
434 434
 			}
435 435
 
436
-			$object->commercial_id			= GETPOSTINT('commercial_id');
437
-			$object->default_lang			= GETPOST('default_lang');
436
+			$object->commercial_id = GETPOSTINT('commercial_id');
437
+			$object->default_lang = GETPOST('default_lang');
438 438
 
439 439
 			// Webservices url/key
440 440
 			$object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
441 441
 			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
442 442
 
443 443
 			if (GETPOSTISSET('accountancy_code_sell')) {
444
-				$accountancy_code_sell		= GETPOST('accountancy_code_sell', 'alpha');
444
+				$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
445 445
 
446 446
 				if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
447 447
 					$object->accountancy_code_sell = '';
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 				}
451 451
 			}
452 452
 			if (GETPOSTISSET('accountancy_code_buy')) {
453
-				$accountancy_code_buy		= GETPOST('accountancy_code_buy', 'alpha');
453
+				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
454 454
 
455 455
 				if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
456 456
 					$object->accountancy_code_buy = '';
@@ -843,7 +843,7 @@  discard block
 block discarded – undo
843 843
 	// Delete third party
844 844
 	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('societe', 'supprimer')) {
845 845
 		$object->fetch($socid);
846
-		$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
846
+		$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
847 847
 		$result = $object->delete($socid, $user);
848 848
 
849 849
 		if ($result > 0) {
@@ -921,7 +921,7 @@  discard block
 block discarded – undo
921 921
 				} else {
922 922
 					$db->commit();
923 923
 					$db->close();
924
-					header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
924
+					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
925 925
 					exit;
926 926
 				}
927 927
 			} else {
@@ -1102,21 +1102,21 @@  discard block
 block discarded – undo
1102 1102
 		}
1103 1103
 
1104 1104
 		$object->phone				= GETPOST('phone', 'alpha');
1105
-		$object->phone_mobile       = (string) GETPOST("phone_mobile", 'alpha');
1105
+		$object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
1106 1106
 		$object->fax				= GETPOST('fax', 'alpha');
1107 1107
 		$object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
1108 1108
 		$object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
1109
-		$object->capital			= GETPOSTFLOAT('capital');
1109
+		$object->capital = GETPOSTFLOAT('capital');
1110 1110
 		$paymentTermId = GETPOSTINT('cond_reglement_id'); // can be set by default values on create page and not already in get or post variables
1111 1111
 		if (empty($paymentTermId) && !GETPOSTISSET('cond_reglement_id')) {
1112 1112
 			$paymentTermId = getDolGlobalString('MAIN_DEFAULT_PAYMENT_TERM_ID');
1113 1113
 		}
1114
-		$object->cond_reglement_id	= $paymentTermId;
1114
+		$object->cond_reglement_id = $paymentTermId;
1115 1115
 		$paymentTypeId = GETPOSTINT('mode_reglement_id'); // can be set by default values on create page and not already in get or post variables
1116 1116
 		if (empty($paymentTypeId) && !GETPOSTISSET('mode_reglement_id')) {
1117 1117
 			$paymentTypeId = getDolGlobalString('MAIN_DEFAULT_PAYMENT_TYPE_ID');
1118 1118
 		}
1119
-		$object->mode_reglement_id 	= $paymentTypeId;
1119
+		$object->mode_reglement_id = $paymentTypeId;
1120 1120
 		$object->barcode			= GETPOST('barcode', 'alphanohtml');
1121 1121
 		$object->idprof1			= GETPOST('idprof1', 'alphanohtml');
1122 1122
 		$object->idprof2			= GETPOST('idprof2', 'alphanohtml');
@@ -1129,7 +1129,7 @@  discard block
 block discarded – undo
1129 1129
 		$object->civility_id		= GETPOST('civility_id', 'alpha');
1130 1130
 
1131 1131
 		$object->tva_assuj = GETPOSTINT('assujtva_value');
1132
-		$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
1132
+		$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
1133 1133
 		$object->status = GETPOSTINT('status');
1134 1134
 
1135 1135
 		//Local Taxes
@@ -1145,7 +1145,7 @@  discard block
 block discarded – undo
1145 1145
 		$object->default_lang = GETPOST('default_lang');
1146 1146
 
1147 1147
 		if (GETPOSTISSET('accountancy_code_sell')) {
1148
-			$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
1148
+			$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
1149 1149
 
1150 1150
 			if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
1151 1151
 				$object->accountancy_code_sell = '';
@@ -1154,7 +1154,7 @@  discard block
 block discarded – undo
1154 1154
 			}
1155 1155
 		}
1156 1156
 		if (GETPOSTISSET('accountancy_code_buy')) {
1157
-			$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
1157
+			$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
1158 1158
 
1159 1159
 			if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
1160 1160
 				$object->accountancy_code_buy = '';
@@ -1279,7 +1279,7 @@  discard block
 block discarded – undo
1279 1279
 
1280 1280
 			print '<script type="text/javascript">';
1281 1281
 			print '$(document).ready(function () {
1282
-					var canHaveCustomerCategoryIfNotCustomerProspectSupplier = ' . (!getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '0' : '1') . ';
1282
+					var canHaveCustomerCategoryIfNotCustomerProspectSupplier = ' . (!getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '0' : '1').';
1283 1283
 
1284 1284
 					init_customer_categ();
1285 1285
 			  		$("#customerprospect").change(function() {
@@ -1352,7 +1352,7 @@  discard block
 block discarded – undo
1352 1352
 			print '</td><td'.(getDolGlobalString('SOCIETE_USEPREFIX') ? '' : ' colspan="3"').'>';
1353 1353
 
1354 1354
 			print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
1355
-			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300');	// For some countries that need the company name in 2 languages
1355
+			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300'); // For some countries that need the company name in 2 languages
1356 1356
 			// 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
1357 1357
 			// 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.
1358 1358
 			/*
@@ -1725,7 +1725,7 @@  discard block
 block discarded – undo
1725 1725
 					print '<td></td>';
1726 1726
 					print '<td></td>';
1727 1727
 				}
1728
-				print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email') .' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
1728
+				print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email').' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
1729 1729
 				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>';
1730 1730
 				print '</tr>';
1731 1731
 			}
@@ -1773,7 +1773,7 @@  discard block
 block discarded – undo
1773 1773
 			// Vat is used
1774 1774
 			print '<tr><td><label for="assujtva_value">'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</label></td>';
1775 1775
 			print '<td>';
1776
-			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? (GETPOST('assujtva_value', 'alpha') != '' ? ' checked="checked"' : '') : 'checked="checked"') . ' value="1">'; // Assujeti par default en creation
1776
+			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" '.(GETPOSTISSET('assujtva_value') ? (GETPOST('assujtva_value', 'alpha') != '' ? ' checked="checked"' : '') : 'checked="checked"').' value="1">'; // Assujeti par default en creation
1777 1777
 			print '</td>';
1778 1778
 			if ($conf->browser->layout == 'phone') {
1779 1779
 				print '</tr><tr>';
@@ -1814,7 +1814,7 @@  discard block
 block discarded – undo
1814 1814
 
1815 1815
 			// VAT reverse charge by default
1816 1816
 			if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
1817
-				print '<tr><td><label for="vat_reverse_charge">' . $form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0) . '</label></td><td colspan="3">';
1817
+				print '<tr><td><label for="vat_reverse_charge">'.$form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0).'</label></td><td colspan="3">';
1818 1818
 				print '<input type="checkbox" name="vat_reverse_charge" id="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').'>';
1819 1819
 				print '</td></tr>';
1820 1820
 			}
@@ -1823,21 +1823,21 @@  discard block
 block discarded – undo
1823 1823
 			//TODO: Place into a function to control showing by country or study better option
1824 1824
 			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
1825 1825
 				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
1826
-				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '') . ' value="1">';
1826
+				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '').' value="1">';
1827 1827
 				print '</td>';
1828 1828
 				if ($conf->browser->layout == 'phone') {
1829 1829
 					print '</tr><tr>';
1830 1830
 				}
1831 1831
 				print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
1832
-				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '') . ' value="1">';
1832
+				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '').' value="1">';
1833 1833
 				print '</td></tr>';
1834 1834
 			} elseif ($mysoc->localtax1_assuj == "1") {
1835 1835
 				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
1836
-				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '') . ' value="1">';
1836
+				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '').' value="1">';
1837 1837
 				print '</td></tr>';
1838 1838
 			} elseif ($mysoc->localtax2_assuj == "1") {
1839 1839
 				print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
1840
-				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '') . ' value="1">';
1840
+				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '').' value="1">';
1841 1841
 				print '</td></tr>';
1842 1842
 			}
1843 1843
 
@@ -2077,7 +2077,7 @@  discard block
 block discarded – undo
2077 2077
 				$prefixSupplierIsUsed = false;
2078 2078
 			}
2079 2079
 
2080
-			$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
2080
+			$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
2081 2081
 
2082 2082
 			if (GETPOSTISSET('name')) {
2083 2083
 				// We overwrite with values if posted
@@ -2105,10 +2105,10 @@  discard block
 block discarded – undo
2105 2105
 				}
2106 2106
 
2107 2107
 				$object->phone					= GETPOST('phone', 'alpha');
2108
-				$object->phone_mobile			= (string) GETPOST('phone_mobile', 'alpha');
2108
+				$object->phone_mobile = (string) GETPOST('phone_mobile', 'alpha');
2109 2109
 				$object->fax					= GETPOST('fax', 'alpha');
2110 2110
 				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
2111
-				$object->no_email				= GETPOSTINT("no_email");
2111
+				$object->no_email = GETPOSTINT("no_email");
2112 2112
 				$object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
2113 2113
 				$object->capital				= GETPOSTFLOAT('capital');
2114 2114
 				$object->idprof1				= GETPOST('idprof1', 'alphanohtml');
@@ -2124,16 +2124,16 @@  discard block
 block discarded – undo
2124 2124
 				$object->default_lang = GETPOST('default_lang', 'alpha');
2125 2125
 
2126 2126
 				$object->tva_assuj				= GETPOSTINT('assujtva_value');
2127
-				$object->vat_reverse_charge		= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
2127
+				$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
2128 2128
 				$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
2129
-				$object->status =				GETPOSTINT('status');
2129
+				$object->status = GETPOSTINT('status');
2130 2130
 
2131 2131
 				// Webservices url/key
2132 2132
 				$object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
2133 2133
 				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
2134 2134
 
2135 2135
 				if (GETPOSTISSET('accountancy_code_sell')) {
2136
-					$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
2136
+					$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
2137 2137
 
2138 2138
 					if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
2139 2139
 						$object->accountancy_code_sell = '';
@@ -2142,7 +2142,7 @@  discard block
 block discarded – undo
2142 2142
 					}
2143 2143
 				}
2144 2144
 				if (GETPOSTISSET('accountancy_code_buy')) {
2145
-					$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
2145
+					$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
2146 2146
 
2147 2147
 					if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
2148 2148
 						$object->accountancy_code_buy = '';
@@ -2224,7 +2224,7 @@  discard block
 block discarded – undo
2224 2224
     				}
2225 2225
     			});
2226 2226
 
2227
-				var canHaveCustomerCategoryIfNotCustomerProspect = ' . (getDolGlobalInt('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '1' : '0') . ';
2227
+				var canHaveCustomerCategoryIfNotCustomerProspect = ' . (getDolGlobalInt('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '1' : '0').';
2228 2228
 
2229 2229
 				init_customer_categ();
2230 2230
 	  			$("#customerprospect").change(function() {
@@ -2410,7 +2410,7 @@  discard block
 block discarded – undo
2410 2410
 					$colspan = 3;
2411 2411
 				}
2412 2412
 
2413
-				print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"': '').'>';
2413
+				print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
2414 2414
 				print '<table class="nobordernopadding"><tr><td>';
2415 2415
 				$tmpcode = $object->code_client ?? '';
2416 2416
 				if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
@@ -2427,7 +2427,7 @@  discard block
 block discarded – undo
2427 2427
 					print '</tr><tr>';
2428 2428
 				}
2429 2429
 
2430
-				print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"': '').'>';
2430
+				print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
2431 2431
 
2432 2432
 				if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
2433 2433
 					print '<table class="nobordernopadding"><tr><td>';
@@ -2608,14 +2608,14 @@  discard block
 block discarded – undo
2608 2608
 
2609 2609
 				// VAT is used
2610 2610
 				print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
2611
-				print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . ($object->tva_assuj ? 'checked="checked"' : '') . ' value="1">';
2611
+				print '<input id="assujtva_value" name="assujtva_value" type="checkbox" '.($object->tva_assuj ? 'checked="checked"' : '').' value="1">';
2612 2612
 				print '</td></tr>';
2613 2613
 
2614 2614
 				// Local Taxes
2615 2615
 				//TODO: Place into a function to control showing by country or study better option
2616 2616
 				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
2617 2617
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
2618
-					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . ($object->localtax1_assuj ? 'checked="checked"' : '') . ' value="1">';
2618
+					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.($object->localtax1_assuj ? 'checked="checked"' : '').' value="1">';
2619 2619
 					if (!isOnlyOneLocalTax(1)) {
2620 2620
 						print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
2621 2621
 						$formcompany->select_localtax(1, (float) $object->localtax1_value, "lt1");
@@ -2624,7 +2624,7 @@  discard block
 block discarded – undo
2624 2624
 					print '</td>';
2625 2625
 					print '</tr><tr>';
2626 2626
 					print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
2627
-					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . ($object->localtax2_assuj ? 'checked="checked"' : '') . ' value="1"></td></tr>';
2627
+					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.($object->localtax2_assuj ? 'checked="checked"' : '').' value="1"></td></tr>';
2628 2628
 					if (!isOnlyOneLocalTax(2)) {
2629 2629
 						print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
2630 2630
 						$formcompany->select_localtax(2, (float) $object->localtax2_value, "lt2");
@@ -2633,7 +2633,7 @@  discard block
 block discarded – undo
2633 2633
 					print '</td></tr>';
2634 2634
 				} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1") {
2635 2635
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
2636
-					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . ($object->localtax1_assuj ? 'checked="checked"' : '') . ' value="1">';
2636
+					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.($object->localtax1_assuj ? 'checked="checked"' : '').' value="1">';
2637 2637
 					if (!isOnlyOneLocalTax(1)) {
2638 2638
 						print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
2639 2639
 						$formcompany->select_localtax(1, (float) $object->localtax1_value, "lt1");
@@ -2642,7 +2642,7 @@  discard block
 block discarded – undo
2642 2642
 					print '</td></tr>';
2643 2643
 				} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1") {
2644 2644
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
2645
-					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . ($object->localtax2_assuj ? 'checked="checked"' : '') . ' value="1">';
2645
+					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.($object->localtax2_assuj ? 'checked="checked"' : '').' value="1">';
2646 2646
 					if (!isOnlyOneLocalTax(2)) {
2647 2647
 						print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
2648 2648
 						$formcompany->select_localtax(2, (float) $object->localtax2_value, "lt2");
@@ -2653,7 +2653,7 @@  discard block
 block discarded – undo
2653 2653
 
2654 2654
 				// VAT reverse charge by default
2655 2655
 				if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
2656
-					print '<tr><td>' . $form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0) . '</td><td colspan="3">';
2656
+					print '<tr><td>'.$form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0).'</td><td colspan="3">';
2657 2657
 					print '<input type="checkbox" name="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').'>';
2658 2658
 					print '</td></tr>';
2659 2659
 				}
@@ -2848,7 +2848,7 @@  discard block
 block discarded – undo
2848 2848
 					$maxfilesizearray = getMaxFileSizeArray();
2849 2849
 					$maxmin = $maxfilesizearray['maxmin'];
2850 2850
 					if ($maxmin > 0) {
2851
-						print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
2851
+						print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
2852 2852
 					}
2853 2853
 					print '<input type="file" class="flat" name="photo" id="photoinput">';
2854 2854
 					print '</td></tr>';
@@ -3084,7 +3084,7 @@  discard block
 block discarded – undo
3084 3084
 					print '<tr><td>';
3085 3085
 					print $form->textwithpicto($langs->trans('VATReverseChargeByDefault'), $langs->trans('VATReverseChargeByDefaultDesc'));
3086 3086
 					print '</td><td>';
3087
-					print '<input type="checkbox" name="vat_reverse_charge" ' . ($object->vat_reverse_charge == '1' ? ' checked' : '') . ' disabled>';
3087
+					print '<input type="checkbox" name="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').' disabled>';
3088 3088
 					print '</td>';
3089 3089
 					print '</tr>';
3090 3090
 				}
Please login to merge, or discard this patch.