Completed
Branch develop (eec0f2)
by
unknown
23:49
created
htdocs/admin/ihm.php 1 patch
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity);
83 83
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
84 84
 
85
-	$logofile = $conf->mycompany->dir_output.'/logos/' . getDolGlobalString('MAIN_LOGIN_BACKGROUND');
85
+	$logofile = $conf->mycompany->dir_output.'/logos/'.getDolGlobalString('MAIN_LOGIN_BACKGROUND');
86 86
 	dol_delete_file($logofile);
87 87
 	dolibarr_del_const($db, "MAIN_LOGIN_BACKGROUND", $conf->entity);
88 88
 	$mysoc->logo = '';
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 		//dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", GETPOST("MAIN_HELP_DISABLELINK", 'aZ09'), 'chaine', 0, '', 0); // Param for all entities
280 280
 
281 281
 		$varforimage = 'imagebackground';
282
-		$dirforimage = $conf->mycompany->dir_output . '/logos/';
282
+		$dirforimage = $conf->mycompany->dir_output.'/logos/';
283 283
 		if ($_FILES[$varforimage]["tmp_name"]) {
284 284
 			$reg = array();
285 285
 			if (preg_match('/([^\\/:]+)$/i', $_FILES[$varforimage]["name"], $reg)) {
@@ -287,11 +287,11 @@  discard block
 block discarded – undo
287 287
 
288 288
 				$isimage = image_format_supported($original_file);
289 289
 				if ($isimage >= 0) {
290
-					dol_syslog("Move file " . $_FILES[$varforimage]["tmp_name"] . " to " . $dirforimage . $original_file);
290
+					dol_syslog("Move file ".$_FILES[$varforimage]["tmp_name"]." to ".$dirforimage.$original_file);
291 291
 					if (!is_dir($dirforimage)) {
292 292
 						dol_mkdir($dirforimage);
293 293
 					}
294
-					$result = dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage . $original_file, 1, 0, $_FILES[$varforimage]['error']);
294
+					$result = dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage.$original_file, 1, 0, $_FILES[$varforimage]['error']);
295 295
 					if ($result > 0) {
296 296
 						dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND", $original_file, 'chaine', 0, '', $conf->entity);
297 297
 					} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) {
@@ -397,17 +397,17 @@  discard block
 block discarded – undo
397 397
 	print '</tr>';
398 398
 
399 399
 	// Multilingual GUI
400
-	print '<tr class="oddeven"><td>' . $langs->trans("EnableMultilangInterface") . '</td><td>';
400
+	print '<tr class="oddeven"><td>'.$langs->trans("EnableMultilangInterface").'</td><td>';
401 401
 	print ajax_constantonoff("MAIN_MULTILANGS", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'language');
402 402
 	print '</td>';
403 403
 	print '</tr>';
404 404
 
405
-	print '</table>' . "\n";
405
+	print '</table>'."\n";
406 406
 	print '</div>';
407 407
 
408 408
 	print '<div class="center">';
409
-	print '<input class="button button-save reposition" type="submit" name="submit" value="' . $langs->trans("Save") . '">';
410
-	print '<input class="button button-cancel reposition" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
409
+	print '<input class="button button-save reposition" type="submit" name="submit" value="'.$langs->trans("Save").'">';
410
+	print '<input class="button button-cancel reposition" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
411 411
 	print '</div>';
412 412
 
413 413
 	print '<br>';
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
 
426 426
 	if (!empty($conf->use_javascript_ajax)) {
427 427
 		// Show Quick Add link
428
-		print '<tr class="oddeven"><td>' . $langs->trans("ShowQuickAddLink") . '</td><td>';
428
+		print '<tr class="oddeven"><td>'.$langs->trans("ShowQuickAddLink").'</td><td>';
429 429
 		print ajax_constantonoff("MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
430 430
 		print '</td>';
431 431
 		print '</tr>';
@@ -433,14 +433,14 @@  discard block
 block discarded – undo
433 433
 
434 434
 	// Hide wiki link on login page
435 435
 	$pictohelp = '<span class="fa fa-question-circle"></span>';
436
-	print '<tr class="oddeven"><td>' . str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')) . '</td><td>';
436
+	print '<tr class="oddeven"><td>'.str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')).'</td><td>';
437 437
 	print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
438 438
 	//print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1);
439 439
 	print '</td>';
440 440
 	print '</tr>';
441 441
 
442 442
 	// Max size of lists
443
-	print '<tr class="oddeven"><td>' . $langs->trans("DefaultMaxSizeList") . '</td><td><input class="flat width50" name="MAIN_SIZE_LISTE_LIMIT" value="';
443
+	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat width50" name="MAIN_SIZE_LISTE_LIMIT" value="';
444 444
 	if (getDolGlobalInt('MAIN_SIZE_LISTE_LIMIT') > 0) {
445 445
 		print getDolGlobalString('MAIN_SIZE_LISTE_LIMIT');
446 446
 	}
@@ -452,49 +452,49 @@  discard block
 block discarded – undo
452 452
 	print '</tr>';
453 453
 
454 454
 	// Max size of short lists on customer card
455
-	print '<tr class="oddeven"><td>' . $langs->trans("DefaultMaxSizeShortList") . '</td><td><input class="flat width50" name="MAIN_SIZE_SHORTLIST_LIMIT" value="' . getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT') . '"></td>';
455
+	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td><input class="flat width50" name="MAIN_SIZE_SHORTLIST_LIMIT" value="'.getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT').'"></td>';
456 456
 	print '</tr>';
457 457
 
458 458
 	// Display checkboxes and fields menu left / right
459
-	print '<tr class="oddeven"><td>' . $langs->trans("MAIN_CHECKBOX_LEFT_COLUMN") . '</td><td>';
459
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_CHECKBOX_LEFT_COLUMN").'</td><td>';
460 460
 	print ajax_constantonoff("MAIN_CHECKBOX_LEFT_COLUMN", array(), $conf->entity, 0, 0, 1, 0, 0, 1, '', 'other');
461 461
 	print '</td>';
462 462
 	print '</tr>';
463 463
 
464 464
 	// First day for weeks
465
-	print '<tr class="oddeven"><td>' . $langs->trans("WeekStartOnDay") . '</td><td>';
465
+	print '<tr class="oddeven"><td>'.$langs->trans("WeekStartOnDay").'</td><td>';
466 466
 	print $formother->select_dayofweek(getDolGlobalString('MAIN_START_WEEK', '1'), 'MAIN_START_WEEK', 0);
467 467
 	print '</td>';
468 468
 	print '</tr>';
469 469
 
470 470
 	// DefaultWorkingDays
471
-	print '<tr class="oddeven"><td>' . $langs->trans("DefaultWorkingDays") . '</td><td>';
472
-	print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="' . getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS', '1-5') . '">';
471
+	print '<tr class="oddeven"><td>'.$langs->trans("DefaultWorkingDays").'</td><td>';
472
+	print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="'.getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS', '1-5').'">';
473 473
 	print '</td>';
474 474
 	print '</tr>';
475 475
 
476 476
 	// DefaultWorkingHours
477
-	print '<tr class="oddeven"><td>' . $langs->trans("DefaultWorkingHours") . '</td><td>';
478
-	print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="' . getDolGlobalString('MAIN_DEFAULT_WORKING_HOURS', '9-18') . '">';
477
+	print '<tr class="oddeven"><td>'.$langs->trans("DefaultWorkingHours").'</td><td>';
478
+	print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="'.getDolGlobalString('MAIN_DEFAULT_WORKING_HOURS', '9-18').'">';
479 479
 	print '</td>';
480 480
 	print '</tr>';
481 481
 
482 482
 	// Firstname/Name
483
-	print '<tr class="oddeven"><td>' . $langs->trans("FirstnameNamePosition") . '</td><td>';
484
-	$array = array(0 => $langs->trans("Firstname") . ' ' . $langs->trans("Lastname"), 1 => $langs->trans("Lastname") . ' ' . $langs->trans("Firstname"));
483
+	print '<tr class="oddeven"><td>'.$langs->trans("FirstnameNamePosition").'</td><td>';
484
+	$array = array(0 => $langs->trans("Firstname").' '.$langs->trans("Lastname"), 1 => $langs->trans("Lastname").' '.$langs->trans("Firstname"));
485 485
 	print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION', $array, getDolGlobalInt('MAIN_FIRSTNAME_NAME_POSITION', 0));
486 486
 	print '</td>';
487 487
 	print '</tr>';
488 488
 
489 489
 	// Hide unauthorized menus
490
-	print '<tr class="oddeven"><td>' . $langs->trans("HideUnauthorizedMenu") . '</td><td>';
490
+	print '<tr class="oddeven"><td>'.$langs->trans("HideUnauthorizedMenu").'</td><td>';
491 491
 	//print $form->selectyesno('MAIN_MENU_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_MENU_HIDE_UNAUTHORIZED : 0, 1);
492 492
 	print ajax_constantonoff("MAIN_MENU_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
493 493
 	print '</td>';
494 494
 	print '</tr>';
495 495
 
496 496
 	// Hide unauthorized button
497
-	print '<tr class="oddeven"><td>' . $langs->trans("ButtonHideUnauthorized") . '</td><td>';
497
+	print '<tr class="oddeven"><td>'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
498 498
 	//print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1);
499 499
 	print ajax_constantonoff("MAIN_BUTTON_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
500 500
 	print '</td>';
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
 
512 512
 
513 513
 	// Show search area in top menu
514
-	print '<tr class="oddeven"><td>' . $langs->trans("ShowSearchAreaInTopMenu") . '</td><td>';
514
+	print '<tr class="oddeven"><td>'.$langs->trans("ShowSearchAreaInTopMenu").'</td><td>';
515 515
 	print ajax_constantonoff("MAIN_USE_TOP_MENU_SEARCH_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
516 516
 	print '</td>';
517 517
 	print '</tr>';
@@ -520,17 +520,17 @@  discard block
 block discarded – undo
520 520
 	print '<tr class="oddeven"><td>';
521 521
 	print $form->textwithpicto($langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")), $langs->trans("ShowBugTrackLinkDesc"));
522 522
 	print '</td><td>';
523
-	print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" value="' . getDolGlobalString('MAIN_BUGTRACK_ENABLELINK') . '">';
523
+	print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" value="'.getDolGlobalString('MAIN_BUGTRACK_ENABLELINK').'">';
524 524
 	print '</td>';
525 525
 	print '</tr>';
526 526
 
527 527
 	// Disable javascript and ajax
528
-	print '<tr class="oddeven"><td>' . $form->textwithpicto($langs->trans("DisableJavascript"), $langs->trans("DisableJavascriptNote")) . '</td><td>';
528
+	print '<tr class="oddeven"><td>'.$form->textwithpicto($langs->trans("DisableJavascript"), $langs->trans("DisableJavascriptNote")).'</td><td>';
529 529
 	print ajax_constantonoff("MAIN_DISABLE_JAVASCRIPT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
530 530
 	print '</td>';
531 531
 	print '</tr>';
532 532
 
533
-	print '</table>' . "\n";
533
+	print '</table>'."\n";
534 534
 	print '</div>';
535 535
 }
536 536
 
@@ -550,9 +550,9 @@  discard block
 block discarded – undo
550 550
 	complete_substitutions_array($substitutionarray, $langs);
551 551
 
552 552
 	print '<tr class="oddeven width25p"><td>';
553
-	$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted") . '<br>';
553
+	$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
554 554
 	foreach ($substitutionarray as $key => $val) {
555
-		$texthelp .= $key . '<br>';
555
+		$texthelp .= $key.'<br>';
556 556
 	}
557 557
 	print $form->textwithpicto($langs->trans("MessageOfDay"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessageofday');
558 558
 
@@ -576,80 +576,80 @@  discard block
 block discarded – undo
576 576
 	print '</td><td class="titlefieldmiddle">';
577 577
 	print '</td></tr>';
578 578
 
579
-	print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableGlobal') . '</td><td>';
579
+	print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableGlobal').'</td><td>';
580 580
 	print ajax_constantonoff("MAIN_DISABLE_GLOBAL_WORKBOARD", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
581 581
 	print '</td>';
582 582
 	print '</tr>';
583 583
 
584 584
 	if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) {
585 585
 		// Block meteo
586
-		print '<tr class="oddeven"><td>' . $langs->trans('MAIN_DISABLE_METEO') . '</td><td>';
586
+		print '<tr class="oddeven"><td>'.$langs->trans('MAIN_DISABLE_METEO').'</td><td>';
587 587
 		print ajax_constantonoff("MAIN_DISABLE_METEO", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
588 588
 		print '</td>';
589 589
 		print '</tr>';
590 590
 
591 591
 		// Block agenda
592
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockAgenda') . '</td><td>';
592
+		print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockAgenda').'</td><td>';
593 593
 		print ajax_constantonoff("MAIN_DISABLE_BLOCK_AGENDA", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
594 594
 		print '</td>';
595 595
 		print '</tr>';
596 596
 
597 597
 		// Block agenda
598
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockProject') . '</td><td>';
598
+		print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockProject').'</td><td>';
599 599
 		print ajax_constantonoff("MAIN_DISABLE_BLOCK_PROJECT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
600 600
 		print '</td>';
601 601
 		print '</tr>';
602 602
 
603 603
 		// Block customer
604
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockCustomer') . '</td><td>';
604
+		print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockCustomer').'</td><td>';
605 605
 		print ajax_constantonoff("MAIN_DISABLE_BLOCK_CUSTOMER", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
606 606
 		print '</td>';
607 607
 		print '</tr>';
608 608
 
609 609
 		// Block supplier
610
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockSupplier') . '</td><td>';
610
+		print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockSupplier').'</td><td>';
611 611
 		print ajax_constantonoff("MAIN_DISABLE_BLOCK_SUPPLIER", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
612 612
 		print '</td>';
613 613
 		print '</tr>';
614 614
 
615 615
 		// Block contract
616
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockContract') . '</td><td>';
616
+		print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockContract').'</td><td>';
617 617
 		print ajax_constantonoff("MAIN_DISABLE_BLOCK_CONTRACT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
618 618
 		print '</td>';
619 619
 		print '</tr>';
620 620
 
621 621
 		// Block ticket
622
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockTicket') . '</td><td>';
622
+		print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockTicket').'</td><td>';
623 623
 		print ajax_constantonoff("MAIN_DISABLE_BLOCK_TICKET", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
624 624
 		print '</td>';
625 625
 		print '</tr>';
626 626
 
627 627
 		// Block bank
628
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockBank') . '</td><td>';
628
+		print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockBank').'</td><td>';
629 629
 		print ajax_constantonoff("MAIN_DISABLE_BLOCK_BANK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
630 630
 		print '</td>';
631 631
 		print '</tr>';
632 632
 
633 633
 		// Block adherent
634
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockAdherent') . '</td><td>';
634
+		print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockAdherent').'</td><td>';
635 635
 		print ajax_constantonoff("MAIN_DISABLE_BLOCK_ADHERENT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
636 636
 		print '</td>';
637 637
 		print '</tr>';
638 638
 
639 639
 		// Block expense report
640
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockExpenseReport') . '</td><td>';
640
+		print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockExpenseReport').'</td><td>';
641 641
 		print ajax_constantonoff("MAIN_DISABLE_BLOCK_EXPENSEREPORT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
642 642
 		print '</td>';
643 643
 		print '</tr>';
644 644
 
645 645
 		// Block holiday
646
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockHoliday') . '</td><td>';
646
+		print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockHoliday').'</td><td>';
647 647
 		print ajax_constantonoff("MAIN_DISABLE_BLOCK_HOLIDAY", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
648 648
 		print '</td>';
649 649
 		print '</tr>';
650 650
 	}
651 651
 
652
-	print '</table>' . "\n";
652
+	print '</table>'."\n";
653 653
 	print '</div>';
654 654
 }
655 655
 
@@ -677,18 +677,18 @@  discard block
 block discarded – undo
677 677
 	$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount', 'user'));
678 678
 	complete_substitutions_array($substitutionarray, $langs);
679 679
 	print '<tr class="oddeven"><td>';
680
-	$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted") . '<br>';
680
+	$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
681 681
 	foreach ($substitutionarray as $key => $val) {
682
-		$texthelp .= $key . '<br>';
682
+		$texthelp .= $key.'<br>';
683 683
 	}
684 684
 	print $form->textwithpicto($langs->trans("MessageLogin"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessagelogin');
685 685
 	print '</td><td>';
686 686
 	$doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME) ? $conf->global->MAIN_HOME : ''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
687 687
 	$doleditor->Create();
688
-	print '</td></tr>' . "\n";
688
+	print '</td></tr>'."\n";
689 689
 
690 690
 	// Background
691
-	print '<tr class="oddeven"><td><label for="imagebackground">' . $langs->trans("BackgroundImageLogin") . ' (png,jpg)</label></td><td>';
691
+	print '<tr class="oddeven"><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td>';
692 692
 	print '<div class="centpercent inline-block">';
693 693
 	$disabled = '';
694 694
 	if (getDolGlobalString('ADD_UNSPLASH_LOGIN_BACKGROUND')) {
@@ -697,25 +697,25 @@  discard block
 block discarded – undo
697 697
 	$maxfilesizearray = getMaxFileSizeArray();
698 698
 	$maxmin = $maxfilesizearray['maxmin'];
699 699
 	if ($maxmin > 0) {
700
-		print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
700
+		print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
701 701
 	}
702
-	print '<input type="file" class="flat maxwidthinputfileonsmartphone" name="imagebackground" id="imagebackground"' . $disabled . '>';
702
+	print '<input type="file" class="flat maxwidthinputfileonsmartphone" name="imagebackground" id="imagebackground"'.$disabled.'>';
703 703
 	if ($disabled) {
704
-		print '(' . $langs->trans("DisabledByOptionADD_UNSPLASH_LOGIN_BACKGROUND") . ') ';
704
+		print '('.$langs->trans("DisabledByOptionADD_UNSPLASH_LOGIN_BACKGROUND").') ';
705 705
 	}
706 706
 	if (getDolGlobalString('MAIN_LOGIN_BACKGROUND')) {
707
-		print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?action=removebackgroundlogin&token='.newToken().'&mode=login">' . img_delete($langs->trans("Delete")) . '</a>';
708
-		if (file_exists($conf->mycompany->dir_output . '/logos/' . getDolGlobalString('MAIN_LOGIN_BACKGROUND'))) {
707
+		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removebackgroundlogin&token='.newToken().'&mode=login">'.img_delete($langs->trans("Delete")).'</a>';
708
+		if (file_exists($conf->mycompany->dir_output.'/logos/'.getDolGlobalString('MAIN_LOGIN_BACKGROUND'))) {
709 709
 			print ' &nbsp; ';
710
-			print '<img class="marginleftonly boxshadow valignmiddle" width="100" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;file=' . urlencode('logos/' . getDolGlobalString('MAIN_LOGIN_BACKGROUND')) . '">';
710
+			print '<img class="marginleftonly boxshadow valignmiddle" width="100" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.getDolGlobalString('MAIN_LOGIN_BACKGROUND')).'">';
711 711
 		}
712 712
 	} else {
713
-		print '<img class="marginleftonly valignmiddle" width="100" src="' . DOL_URL_ROOT . '/public/theme/common/nophoto.png">';
713
+		print '<img class="marginleftonly valignmiddle" width="100" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
714 714
 	}
715 715
 	print '</div>';
716 716
 	print '</td></tr>';
717 717
 
718
-	print '</table>' . "\n";
718
+	print '</table>'."\n";
719 719
 	print '</div>';
720 720
 }
721 721
 
@@ -739,8 +739,8 @@  discard block
 block discarded – undo
739 739
 
740 740
 
741 741
 print '<div class="center">';
742
-print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="' . $langs->trans("Save") . '">';
743
-print '<input class="button button-cancel reposition" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
742
+print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="'.$langs->trans("Save").'">';
743
+print '<input class="button button-cancel reposition" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
744 744
 print '</div>';
745 745
 
746 746
 print '</form>';
Please login to merge, or discard this patch.
htdocs/product/class/productbatch.class.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
79 79
 	 * @var int|string
80 80
 	 * @deprecated
81 81
 	 */
82
-	public $sellby = '';	// dlc
82
+	public $sellby = ''; // dlc
83 83
 	/**
84 84
 	 * @var int|string
85 85
 	 * @deprecated
86 86
 	 */
87
-	public $eatby = '';		// dmd/dluo
87
+	public $eatby = ''; // dmd/dluo
88 88
 
89 89
 
90 90
 	/**
@@ -118,15 +118,15 @@  discard block
 block discarded – undo
118 118
 		// Insert request
119 119
 		$sql = "INSERT INTO ".$this->db->prefix()."product_batch (";
120 120
 		$sql .= "fk_product_stock,";
121
-		$sql .= "sellby,";				// no more used
122
-		$sql .= "eatby,";				// no more used
121
+		$sql .= "sellby,"; // no more used
122
+		$sql .= "eatby,"; // no more used
123 123
 		$sql .= "batch,";
124 124
 		$sql .= "qty,";
125 125
 		$sql .= "import_key";
126 126
 		$sql .= ") VALUES (";
127 127
 		$sql .= " ".(!isset($this->fk_product_stock) ? 'NULL' : $this->fk_product_stock).",";
128
-		$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").",";		// no more used
129
-		$sql .= " ".(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").",";			// no more used
128
+		$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").","; // no more used
129
+		$sql .= " ".(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").","; // no more used
130 130
 		$sql .= " ".(!isset($this->batch) ? 'NULL' : "'".$this->db->escape($this->batch)."'").",";
131 131
 		$sql .= " ".(!isset($this->qty) ? 'NULL' : $this->qty).",";
132 132
 		$sql .= " ".(!isset($this->import_key) ? 'NULL' : "'".$this->db->escape($this->import_key)."'");
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 		$sql .= " pl.eatby,";
178 178
 		$sql .= " pl.sellby";
179 179
 		$sql .= " FROM ".$this->db->prefix()."product_batch as t";
180
-		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock w on t.fk_product_stock = w.rowid";	// llx_product_stock is a parent table so this link does NOT generate duplicate record
180
+		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock w on t.fk_product_stock = w.rowid"; // llx_product_stock is a parent table so this link does NOT generate duplicate record
181 181
 		$sql .= " LEFT JOIN ".$this->db->prefix()."product_lot as pl on pl.fk_product = w.fk_product and pl.batch = t.batch";
182 182
 		$sql .= " WHERE t.rowid = ".((int) $id);
183 183
 
@@ -445,8 +445,8 @@  discard block
 block discarded – undo
445 445
 
446 446
 				$this->tms = $this->db->jdate($obj->tms);
447 447
 				$this->fk_product_stock = $obj->fk_product_stock;
448
-				$this->sellby = $this->db->jdate($obj->sellby);	// deprecated. do no tuse this data.
449
-				$this->eatby = $this->db->jdate($obj->eatby);	// deprecated. do not use this data.
448
+				$this->sellby = $this->db->jdate($obj->sellby); // deprecated. do no tuse this data.
449
+				$this->eatby = $this->db->jdate($obj->eatby); // deprecated. do not use this data.
450 450
 				$this->batch = $obj->batch;
451 451
 				$this->qty = $obj->qty;
452 452
 				$this->import_key = $obj->import_key;
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
 
545 545
 				if ($fk_product > 0) {
546 546
 					// Some properties of the lot
547
-					$tmp->lotid = $obj->lotid;	// ID in table of the details of properties of each lots
547
+					$tmp->lotid = $obj->lotid; // ID in table of the details of properties of each lots
548 548
 					$tmp->sellby = $dbs->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
549 549
 					$tmp->eatby = $dbs->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
550 550
 				}
Please login to merge, or discard this patch.
htdocs/product/class/product.class.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 		'contratdet' => array('name' => 'Contract', 'parent' => 'contrat', 'parentkey' => 'fk_contrat'),
88 88
 		'facture_fourn_det' => array('name' => 'SupplierInvoice', 'parent' => 'facture_fourn', 'parentkey' => 'fk_facture_fourn'),
89 89
 		'commande_fournisseurdet' => array('name' => 'SupplierOrder', 'parent' => 'commande_fournisseur', 'parentkey' => 'fk_commande'),
90
-		'mrp_production' => array('name' => 'Mo', 'parent' => 'mrp_mo', 'parentkey' => 'fk_mo' ),
90
+		'mrp_production' => array('name' => 'Mo', 'parent' => 'mrp_mo', 'parentkey' => 'fk_mo'),
91 91
 		'bom_bom' => array('name' => 'BOM'),
92 92
 		'bom_bomline' => array('name' => 'BOMLine', 'parent' => 'bom_bom', 'parentkey' => 'fk_bom'),
93 93
 	);
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	/**
156 156
 	 * @var string
157 157
 	 */
158
-	public $price_formated;			// used by takepos/ajax/ajax.php
158
+	public $price_formated; // used by takepos/ajax/ajax.php
159 159
 
160 160
 	/**
161 161
 	 * Selling price with tax
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 	/**
168 168
 	 * @var string
169 169
 	 */
170
-	public $price_ttc_formated;		// used by takepos/ajax/ajax.php
170
+	public $price_ttc_formated; // used by takepos/ajax/ajax.php
171 171
 
172 172
 	/**
173 173
 	 * Minimum price net
@@ -519,7 +519,7 @@  discard block
 block discarded – undo
519 519
 	/**
520 520
 	 * @var int|string
521 521
 	 */
522
-	public $weight_units;	// scale -3, 0, 3, 6
522
+	public $weight_units; // scale -3, 0, 3, 6
523 523
 	/**
524 524
 	 * @var float|string
525 525
 	 */
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
 	/**
528 528
 	 * @var int|string
529 529
 	 */
530
-	public $length_units;	// scale -3, 0, 3, 6
530
+	public $length_units; // scale -3, 0, 3, 6
531 531
 	/**
532 532
 	 * @var float|string
533 533
 	 */
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
 	/**
536 536
 	 * @var int|string
537 537
 	 */
538
-	public $width_units;	// scale -3, 0, 3, 6
538
+	public $width_units; // scale -3, 0, 3, 6
539 539
 	/**
540 540
 	 * @var float|string|null
541 541
 	 */
@@ -543,7 +543,7 @@  discard block
 block discarded – undo
543 543
 	/**
544 544
 	 * @var int|string|null
545 545
 	 */
546
-	public $height_units;	// scale -3, 0, 3, 6
546
+	public $height_units; // scale -3, 0, 3, 6
547 547
 	/**
548 548
 	 * @var float|string|null
549 549
 	 */
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
 	/**
552 552
 	 * @var int|string|null
553 553
 	 */
554
-	public $surface_units;	// scale -3, 0, 3, 6
554
+	public $surface_units; // scale -3, 0, 3, 6
555 555
 	/**
556 556
 	 * @var float|string|null
557 557
 	 */
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
 	/**
560 560
 	 * @var int|string|null
561 561
 	 */
562
-	public $volume_units;	// scale -3, 0, 3, 6
562
+	public $volume_units; // scale -3, 0, 3, 6
563 563
 
564 564
 	/**
565 565
 	 * @var float|string|null
@@ -568,7 +568,7 @@  discard block
 block discarded – undo
568 568
 	/**
569 569
 	 * @var ?string
570 570
 	 */
571
-	public $net_measure_units;	// scale -3, 0, 3, 6
571
+	public $net_measure_units; // scale -3, 0, 3, 6
572 572
 
573 573
 	/**
574 574
 	 * @var string
@@ -824,7 +824,7 @@  discard block
 block discarded – undo
824 824
 		'import_key'    => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'position' => 1000),
825 825
 		//'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>'0', 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
826 826
 		//'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>'0', 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
827
-		'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => -1,  'notnull' => 1, 'default' => '0', 'index' => 1,  'position' => 1000),
827
+		'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'default' => '0', 'index' => 1, 'position' => 1000),
828 828
 	);
829 829
 
830 830
 	/**
@@ -1128,9 +1128,9 @@  discard block
 block discarded – undo
1128 1128
 
1129 1129
 							// update accountancy for this entity
1130 1130
 							if (!$error && getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
1131
-								$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " .((int) $this->id) . " AND entity = " . ((int) $conf->entity));
1131
+								$this->db->query("DELETE FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
1132 1132
 
1133
-								$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
1133
+								$sql = "INSERT INTO ".$this->db->prefix()."product_perentity (";
1134 1134
 								$sql .= " fk_product";
1135 1135
 								$sql .= ", entity";
1136 1136
 								$sql .= ", accountancy_code_buy";
@@ -1141,13 +1141,13 @@  discard block
 block discarded – undo
1141 1141
 								$sql .= ", accountancy_code_sell_export";
1142 1142
 								$sql .= ") VALUES (";
1143 1143
 								$sql .= $this->id;
1144
-								$sql .= ", " . ((int) $conf->entity);
1145
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
1146
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
1147
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
1148
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
1149
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
1150
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
1144
+								$sql .= ", ".((int) $conf->entity);
1145
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
1146
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
1147
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy_export)."'";
1148
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
1149
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
1150
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
1151 1151
 								$sql .= ")";
1152 1152
 								$result = $this->db->query($sql);
1153 1153
 								if (!$result) {
@@ -1528,12 +1528,12 @@  discard block
 block discarded – undo
1528 1528
 			$sql .= ", note_public = ".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : 'null');
1529 1529
 			$sql .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";
1530 1530
 			if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
1531
-				$sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";
1532
-				$sql .= ", accountancy_code_buy_intra = '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
1533
-				$sql .= ", accountancy_code_buy_export = '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
1534
-				$sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";
1535
-				$sql .= ", accountancy_code_sell_intra= '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
1536
-				$sql .= ", accountancy_code_sell_export= '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
1531
+				$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
1532
+				$sql .= ", accountancy_code_buy_intra = '".$this->db->escape($this->accountancy_code_buy_intra)."'";
1533
+				$sql .= ", accountancy_code_buy_export = '".$this->db->escape($this->accountancy_code_buy_export)."'";
1534
+				$sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
1535
+				$sql .= ", accountancy_code_sell_intra= '".$this->db->escape($this->accountancy_code_sell_intra)."'";
1536
+				$sql .= ", accountancy_code_sell_export= '".$this->db->escape($this->accountancy_code_sell_export)."'";
1537 1537
 			}
1538 1538
 			$sql .= ", desiredstock = ".((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? (float) $this->desiredstock : "null");
1539 1539
 			$sql .= ", cost_price = ".($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
@@ -1563,9 +1563,9 @@  discard block
 block discarded – undo
1563 1563
 
1564 1564
 				// update accountancy for this entity
1565 1565
 				if (!$error && getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
1566
-					$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " . ((int) $this->id) . " AND entity = " . ((int) $conf->entity));
1566
+					$this->db->query("DELETE FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
1567 1567
 
1568
-					$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
1568
+					$sql = "INSERT INTO ".$this->db->prefix()."product_perentity (";
1569 1569
 					$sql .= " fk_product";
1570 1570
 					$sql .= ", entity";
1571 1571
 					$sql .= ", accountancy_code_buy";
@@ -1576,13 +1576,13 @@  discard block
 block discarded – undo
1576 1576
 					$sql .= ", accountancy_code_sell_export";
1577 1577
 					$sql .= ") VALUES (";
1578 1578
 					$sql .= ((int) $this->id);
1579
-					$sql .= ", " . ((int) $conf->entity);
1580
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
1581
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
1582
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
1583
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
1584
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
1585
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
1579
+					$sql .= ", ".((int) $conf->entity);
1580
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
1581
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
1582
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy_export)."'";
1583
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
1584
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
1585
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
1586 1586
 					$sql .= ")";
1587 1587
 					$result = $this->db->query($sql);
1588 1588
 					if (!$result) {
@@ -1660,7 +1660,7 @@  discard block
 block discarded – undo
1660 1660
 								$error++;
1661 1661
 							} else {
1662 1662
 								// to keep old entries with the new dir
1663
-								require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
1663
+								require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
1664 1664
 								$ecmfiles = new EcmFiles($this->db);
1665 1665
 								$ecmfiles->updateAfterRename("produit/".dol_sanitizeFileName($this->oldcopy->ref), "produit/".dol_sanitizeFileName($this->ref));
1666 1666
 							}
@@ -1958,7 +1958,7 @@  discard block
 block discarded – undo
1958 1958
 				}
1959 1959
 			} elseif (isset($this->multilangs[$key])) {
1960 1960
 				if (empty($this->multilangs[$key]["label"])) {
1961
-					$this->errors[] = $key . ' : ' . $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
1961
+					$this->errors[] = $key.' : '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
1962 1962
 					return -1;
1963 1963
 				}
1964 1964
 
@@ -2155,7 +2155,7 @@  discard block
 block discarded – undo
2155 2155
 	 */
2156 2156
 	private function getArrayForPriceCompare($level = 0)
2157 2157
 	{
2158
-		$testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
2158
+		$testExit = array('multiprices', 'multiprices_ttc', 'multiprices_base_type', 'multiprices_min', 'multiprices_min_ttc', 'multiprices_tva_tx', 'multiprices_recuperableonly');
2159 2159
 
2160 2160
 		foreach ($testExit as $field) {
2161 2161
 			if (!isset($this->$field)) {
@@ -2845,12 +2845,12 @@  discard block
 block discarded – undo
2845 2845
 
2846 2846
 		// For MultiCompany
2847 2847
 		// PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
2848
-		$separatedEntityPMP = false;	// Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
2849
-		$separatedStock = false;		// Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
2848
+		$separatedEntityPMP = false; // Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
2849
+		$separatedStock = false; // Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
2850 2850
 		$visibleWarehousesEntities = $conf->entity;
2851 2851
 		if (getDolGlobalString('MULTICOMPANY_PRODUCT_SHARING_ENABLED')) {
2852 2852
 			if (getDolGlobalString('MULTICOMPANY_PMP_PER_ENTITY_ENABLED')) {
2853
-				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
2853
+				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
2854 2854
 				if ($this->db->num_rows($checkPMPPerEntity) > 0) {
2855 2855
 					$separatedEntityPMP = true;
2856 2856
 				}
@@ -2858,7 +2858,7 @@  discard block
 block discarded – undo
2858 2858
 			global $mc;
2859 2859
 			$separatedStock = true;
2860 2860
 			if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
2861
-				$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
2861
+				$visibleWarehousesEntities .= ",".implode(",", $mc->sharings['stock']);
2862 2862
 			}
2863 2863
 		}
2864 2864
 		if ($separatedEntityPMP) {
@@ -2876,10 +2876,10 @@  discard block
 block discarded – undo
2876 2876
 		}
2877 2877
 		$sql .= " FROM ".$this->db->prefix()."product as p";
2878 2878
 		if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') || $separatedEntityPMP) {
2879
-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
2879
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
2880 2880
 		}
2881 2881
 		if ($separatedStock) {
2882
-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".$this->db->prefix()."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
2882
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".$this->db->prefix()."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
2883 2883
 		}
2884 2884
 
2885 2885
 		if ($id) {
@@ -3041,15 +3041,15 @@  discard block
 block discarded – undo
3041 3041
 						$sql .= " WHERE entity IN (".getEntity('productprice').")";
3042 3042
 						$sql .= " AND price_level=".((int) $i);
3043 3043
 						$sql .= " AND fk_product = ".((int) $this->id);
3044
-						$sql .= " ORDER BY date_price DESC, rowid DESC";	// Get the most recent line
3045
-						$sql .= " LIMIT 1";									// Only the first one
3044
+						$sql .= " ORDER BY date_price DESC, rowid DESC"; // Get the most recent line
3045
+						$sql .= " LIMIT 1"; // Only the first one
3046 3046
 						$resql = $this->db->query($sql);
3047 3047
 						if ($resql) {
3048 3048
 							$result = $this->db->fetch_array($resql);
3049 3049
 
3050 3050
 							$this->multiprices[$i] = $result ? $result["price"] : null;
3051 3051
 							$this->multiprices_ttc[$i] = $result ? $result["price_ttc"] : null;
3052
-							$this->multiprices_min[$i] =  $result ? $result["price_min"] : null;
3052
+							$this->multiprices_min[$i] = $result ? $result["price_min"] : null;
3053 3053
 							$this->multiprices_min_ttc[$i] = $result ? $result["price_min_ttc"] : null;
3054 3054
 							$this->multiprices_base_type[$i] = $result ? $result["price_base_type"] : null;
3055 3055
 							// Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
@@ -3274,7 +3274,7 @@  discard block
 block discarded – undo
3274 3274
 				$obj = $this->db->fetch_object($result);
3275 3275
 				$this->stats_mo['customers_'.$role] = $obj->nb_customers ? $obj->nb_customers : 0;
3276 3276
 				$this->stats_mo['nb_'.$role] = $obj->nb ? $obj->nb : 0;
3277
-				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0;		// qty may be a float due to the SUM()
3277
+				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0; // qty may be a float due to the SUM()
3278 3278
 			} else {
3279 3279
 				$this->error = $this->db->error();
3280 3280
 				$error++;
@@ -4777,7 +4777,7 @@  discard block
 block discarded – undo
4777 4777
 				//Addition of a product with the highest rank +1
4778 4778
 				$sql = "INSERT INTO ".$this->db->prefix()."product_association(fk_product_pere,fk_product_fils,qty,incdec,rang)";
4779 4779
 				$sql .= " VALUES (".((int) $id_pere).", ".((int) $id_fils).", ".price2num($qty, 'MS').", ".((int) $incdec).", ".((int) $rank).")";
4780
-				if (! $this->db->query($sql)) {
4780
+				if (!$this->db->query($sql)) {
4781 4781
 					dol_print_error($this->db);
4782 4782
 					return -1;
4783 4783
 				} else {
@@ -4898,7 +4898,7 @@  discard block
 block discarded – undo
4898 4898
 				$sql = "UPDATE ".$this->db->prefix()."product_association";
4899 4899
 				$sql .= " SET rang = ".((int) $cpt);
4900 4900
 				$sql .= " WHERE rowid = ".((int) $objrank->rowid);
4901
-				if (! $this->db->query($sql)) {
4901
+				if (!$this->db->query($sql)) {
4902 4902
 					dol_print_error($this->db);
4903 4903
 					return -1;
4904 4904
 				}
@@ -5333,7 +5333,7 @@  discard block
 block discarded – undo
5333 5333
 		if (isset($this->sousprods) && is_array($this->sousprods)) {
5334 5334
 			foreach ($this->sousprods as $prod_name => $desc_product) {
5335 5335
 				if (is_array($desc_product)) {
5336
-					$this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id, $ignore_stock_load);	// This set $this->res
5336
+					$this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id, $ignore_stock_load); // This set $this->res
5337 5337
 				}
5338 5338
 			}
5339 5339
 		}
@@ -5489,7 +5489,7 @@  discard block
 block discarded – undo
5489 5489
 		$sql .= " AND pa.fk_product_fils <> ".((int) $id); // This should not happens, it is to avoid infinite loop if it happens
5490 5490
 		$sql .= " ORDER BY pa.rang";
5491 5491
 
5492
-		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level. ' parents='.(is_array($parents) ? implode(',', $parents) : $parents), LOG_DEBUG);
5492
+		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level.' parents='.(is_array($parents) ? implode(',', $parents) : $parents), LOG_DEBUG);
5493 5493
 
5494 5494
 		if ($level == 1) {
5495 5495
 			$alreadyfound = array($id => 1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediately
@@ -5554,7 +5554,7 @@  discard block
 block discarded – undo
5554 5554
 			$parent[$this->label][$keyChild] = $valueChild;
5555 5555
 		}
5556 5556
 		foreach ($parent as $key => $value) {        // key=label, value is array of children
5557
-			$this->sousprods[$key] = $value;  // @phan-suppress-current-line PhanTypeMismatchProperty
5557
+			$this->sousprods[$key] = $value; // @phan-suppress-current-line PhanTypeMismatchProperty
5558 5558
 		}
5559 5559
 	}
5560 5560
 
@@ -5590,7 +5590,7 @@  discard block
 block discarded – undo
5590 5590
 		if (!empty($this->entity) && $permissiontoreadproduct) {
5591 5591
 			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80, 0, 0, 0, 0, '1');
5592 5592
 			if ($this->nbphoto > 0) {
5593
-				$datas['photo'] = '<div class="photointooltip floatright">'."\n" . $tmpphoto . '</div>';
5593
+				$datas['photo'] = '<div class="photointooltip floatright">'."\n".$tmpphoto.'</div>';
5594 5594
 			}
5595 5595
 		}
5596 5596
 
@@ -5600,7 +5600,7 @@  discard block
 block discarded – undo
5600 5600
 			$datas['picto'] = img_picto('', 'service').' <u class="paddingrightonly">'.$langs->trans("Service").'</u>';
5601 5601
 		}
5602 5602
 		if (isset($this->status) && isset($this->status_buy)) {
5603
-			$datas['status'] = ' '.$this->getLibStatut(5, 0) . ' '.$this->getLibStatut(5, 1);
5603
+			$datas['status'] = ' '.$this->getLibStatut(5, 0).' '.$this->getLibStatut(5, 1);
5604 5604
 		}
5605 5605
 
5606 5606
 		if (!empty($this->ref)) {
@@ -5650,7 +5650,7 @@  discard block
 block discarded – undo
5650 5650
 					$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuringUnitString(0, 'volume', $this->volume_units);
5651 5651
 				}
5652 5652
 				if ($labelsurfacevolume) {
5653
-					$datas['surface'] = "<br>" . $labelsurfacevolume;
5653
+					$datas['surface'] = "<br>".$labelsurfacevolume;
5654 5654
 				}
5655 5655
 			}
5656 5656
 			if ($this->isService() && !empty($this->duration_value)) {
@@ -5692,9 +5692,9 @@  discard block
 block discarded – undo
5692 5692
 			}
5693 5693
 			// show categories for this record only in ajax to not overload lists
5694 5694
 			if (isModEnabled('category') && !$nofetch) {
5695
-				require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
5695
+				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
5696 5696
 				$form = new Form($this->db);
5697
-				$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_PRODUCT, 1);
5697
+				$datas['categories'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_PRODUCT, 1);
5698 5698
 			}
5699 5699
 		}
5700 5700
 
@@ -6217,7 +6217,7 @@  discard block
 block discarded – undo
6217 6217
 		if (isModEnabled("supplier_order")) {
6218 6218
 			$filterStatus = getDolGlobalString('SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK', '3,4');
6219 6219
 			if (isset($includedraftpoforvirtual)) {
6220
-				$filterStatus = '0,1,2,'.$filterStatus;	// 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
6220
+				$filterStatus = '0,1,2,'.$filterStatus; // 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
6221 6221
 			}
6222 6222
 			$result = $this->load_stats_commande_fournisseur(0, $filterStatus, 1, $dateofvirtualstock);
6223 6223
 			if ($result < 0) {
@@ -6634,7 +6634,7 @@  discard block
 block discarded – undo
6634 6634
 		if (getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM')) {
6635 6635
 			$dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
6636 6636
 			foreach ($dirsociete as $dirroot) {
6637
-				$res = dol_include_once($dirroot . getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM').'.php');
6637
+				$res = dol_include_once($dirroot.getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM').'.php');
6638 6638
 				if ($res) {
6639 6639
 					break;
6640 6640
 				}
Please login to merge, or discard this patch.
htdocs/product/card.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 $formbarcode = null;
101 101
 
102 102
 // Get parameters
103
-$id  = GETPOSTINT('id');
103
+$id = GETPOSTINT('id');
104 104
 if (getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS')) {
105 105
 	$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'nohtml') : null);
106 106
 } else {
@@ -512,11 +512,11 @@  discard block
 block discarded – undo
512 512
 		if (!$error) {
513 513
 			$units = GETPOSTINT('units');
514 514
 
515
-			$object->entity				= $conf->entity;
516
-			$object->ref				= (string) $ref;
517
-			$object->label				= GETPOST('label', $label_security_check);
518
-			$object->price_base_type	= GETPOST('price_base_type', 'aZ09');
519
-			$object->mandatory_period	= !empty(GETPOST("mandatoryperiod", 'alpha')) ? 1 : 0;
515
+			$object->entity = $conf->entity;
516
+			$object->ref = (string) $ref;
517
+			$object->label = GETPOST('label', $label_security_check);
518
+			$object->price_base_type = GETPOST('price_base_type', 'aZ09');
519
+			$object->mandatory_period = !empty(GETPOST("mandatoryperiod", 'alpha')) ? 1 : 0;
520 520
 			if ($object->price_base_type == 'TTC') {
521 521
 				$object->price_ttc = GETPOSTFLOAT('price');
522 522
 			} else {
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
 			$object->duration_value     	 = $duration_value;
605 605
 			$object->duration_unit      	 = $duration_unit;
606 606
 			$object->fk_default_warehouse	 = GETPOSTINT('fk_default_warehouse');
607
-			$object->fk_default_workstation	 = GETPOSTINT('fk_default_workstation');
607
+			$object->fk_default_workstation = GETPOSTINT('fk_default_workstation');
608 608
 			$object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte') ? GETPOST('seuil_stock_alerte') : 0;
609 609
 			$object->desiredstock          = GETPOST('desiredstock') ? GETPOST('desiredstock') : 0;
610 610
 			$object->canvas             	 = GETPOST('canvas');
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
753 753
 				$object->oldcopy = dol_clone($object, 1);
754 754
 
755 755
 				if (!getDolGlobalString('PRODUCT_GENERATE_REF_AFTER_FORM')) {
756
-					$object->ref                = (string) $ref;
756
+					$object->ref = (string) $ref;
757 757
 				}
758 758
 				$object->label                  = GETPOST('label', $label_security_check);
759 759
 
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
 				$object->status_batch = GETPOSTINT('status_batch');
776 776
 				$object->sell_or_eat_by_mandatory = GETPOSTINT('sell_or_eat_by_mandatory');
777 777
 				$object->batch_mask = GETPOST('batch_mask', 'alpha');
778
-				$object->fk_default_warehouse   = GETPOSTINT('fk_default_warehouse');
778
+				$object->fk_default_warehouse = GETPOSTINT('fk_default_warehouse');
779 779
 				$object->fk_default_workstation   = GETPOSTINT('fk_default_workstation');
780 780
 				// removed from update view so GETPOST always empty
781 781
 				/*
@@ -875,7 +875,7 @@  discard block
 block discarded – undo
875 875
 					$object->accountancy_code_buy_export = $accountancy_code_buy_export;
876 876
 				}
877 877
 				if ($object->isService()) {
878
-					$object->mandatory_period =  (!empty($checkmandatory)) ? 1 : 0 ;
878
+					$object->mandatory_period = (!empty($checkmandatory)) ? 1 : 0;
879 879
 				}
880 880
 
881 881
 
@@ -1010,7 +1010,7 @@  discard block
 block discarded – undo
1010 1010
 							$action = "";
1011 1011
 
1012 1012
 							$mesg = $langs->trans("ErrorProductAlreadyExists", $clone->ref);
1013
-							$mesg .= ' <a href="' . $_SERVER["PHP_SELF"] . '?ref=' . $clone->ref . '">' . $langs->trans("ShowCardHere") . '</a>.';
1013
+							$mesg .= ' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$clone->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
1014 1014
 							setEventMessages($mesg, null, 'errors');
1015 1015
 						} else {
1016 1016
 							setEventMessages(empty($clone->error) ? '' : $langs->trans($clone->error), $clone->errors, 'errors');
@@ -1025,7 +1025,7 @@  discard block
 block discarded – undo
1025 1025
 					} else {
1026 1026
 						$db->commit();
1027 1027
 						$db->close();
1028
-						header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
1028
+						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
1029 1029
 						exit;
1030 1030
 					}
1031 1031
 				} else {
@@ -2765,7 +2765,7 @@  discard block
 block discarded – undo
2765 2765
 					$result = $measuringUnits->fetchAll('', 'scale', 0, 0, ['t.active' => 1, 't.unit_type' => 'time']);
2766 2766
 					if ($result !== -1) {
2767 2767
 						foreach ($measuringUnits->records as $record) {
2768
-							$durations[$record->short_label] = dol_ucfirst($record->label) . $plural;
2768
+							$durations[$record->short_label] = dol_ucfirst($record->label).$plural;
2769 2769
 						}
2770 2770
 					}
2771 2771
 					print '<tr><td class="titlefieldmiddle">'.$langs->trans("Duration").'</td><td>';
Please login to merge, or discard this patch.
htdocs/modulebuilder/template/admin/setup.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 // Parameters
71 71
 $action = GETPOST('action', 'aZ09');
72 72
 $backtopage = GETPOST('backtopage', 'alpha');
73
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
73
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
74 74
 
75 75
 $value = GETPOST('value', 'alpha');
76 76
 $label = GETPOST('label', 'alpha');
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 
105 105
 // Setup conf for selection of an URL
106 106
 $item = $formSetup->newItem('MYMODULE_MYPARAM1');
107
-$item->fieldAttr['placeholder'] = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'];
107
+$item->fieldAttr['placeholder'] = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://').$_SERVER['HTTP_HOST'];
108 108
 $item->cssClass = 'minwidth500';
109 109
 
110 110
 // Setup conf for selection of a simple string input
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
 										print(empty($module->name) ? $name : $module->name);
539 539
 										print "</td><td>\n";
540 540
 										if (method_exists($module, 'info')) {
541
-											print $module->info($langs);  // @phan-suppress-current-line PhanUndeclaredMethod
541
+											print $module->info($langs); // @phan-suppress-current-line PhanUndeclaredMethod
542 542
 										} else {
543 543
 											print $module->description;
544 544
 										}
Please login to merge, or discard this patch.