Completed
Branch develop (b66a18)
by
unknown
14:24
created
htdocs/categories/traduction.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
 
57 57
 $type = $object->type;
58 58
 if (is_numeric($type)) {
59
-	$type = Categorie::$MAP_ID_TO_CODE[$type];   // For backward compatibility
59
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
60 60
 }
61 61
 
62 62
 
Please login to merge, or discard this patch.
htdocs/societe/price.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 
48 48
 // Get parameters
49 49
 $action 		= GETPOST('action', 'aZ09');
50
-$search_prod 	= GETPOST('search_prod', 'alpha');
50
+$search_prod = GETPOST('search_prod', 'alpha');
51 51
 $cancel 		= GETPOST('cancel', 'alpha');
52 52
 $search_label 	= GETPOST('search_label', 'alpha');
53 53
 $search_price 	= GETPOST('search_price');
Please login to merge, or discard this patch.
htdocs/societe/contact.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 $action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
68 68
 $cancel 	= GETPOST('cancel', 'alpha');
69 69
 $backtopage = GETPOST('backtopage', 'alpha');
70
-$confirm 	= GETPOST('confirm');
70
+$confirm = GETPOST('confirm');
71 71
 $socid 		= GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
72 72
 
73 73
 if ($user->socid) {
Please login to merge, or discard this patch.
htdocs/societe/consumption.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,10 +52,10 @@
 block discarded – undo
52 52
 }
53 53
 
54 54
 // Sort & Order fields
55
-$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
55
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
56 56
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
57 57
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
58
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
58
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
59 59
 $optioncss 	= GETPOST('optioncss', 'alpha');
60 60
 
61 61
 if (empty($page) || $page == -1) {
Please login to merge, or discard this patch.
htdocs/societe/website.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,11 +43,11 @@
 block discarded – undo
43 43
 
44 44
 
45 45
 // Get parameters
46
-$action 	 = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';               // The action 'add', 'create', 'edit', 'update', 'view', ...
46
+$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
47 47
 $show_files  = GETPOST('show_files', 'int');
48
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'websitelist';  // To manage different context of search
49
-$backtopage  = GETPOST('backtopage', 'alpha');                                              // Go back to a dedicated page
50
-$optioncss   = GETPOST('optioncss', 'aZ');                                                  // Option for the css output (always '' except when 'print')
48
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'websitelist'; // To manage different context of search
49
+$backtopage  = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
50
+$optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
51 51
 
52 52
 // Security check
53 53
 $id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
Please login to merge, or discard this patch.
htdocs/societe/document.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -39,21 +39,21 @@
 block discarded – undo
39 39
 
40 40
 
41 41
 // Get parameters
42
-$action 	= GETPOST('action', 'aZ09');
43
-$confirm 	= GETPOST('confirm');
44
-$id 		= (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
45
-$ref 		= GETPOST('ref', 'alpha');
42
+$action = GETPOST('action', 'aZ09');
43
+$confirm = GETPOST('confirm');
44
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
45
+$ref = GETPOST('ref', 'alpha');
46 46
 
47
-$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
47
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
48 48
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
49 49
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
50
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
50
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
51 51
 
52 52
 if (empty($page) || $page == -1) {
53 53
 	$page = 0;
54 54
 }     // If $page is not defined, or '' or -1
55 55
 
56
-$offset 	= $limit * $page;
56
+$offset = $limit * $page;
57 57
 $pageprev 	= $page - 1;
58 58
 $pagenext 	= $page + 1;
59 59
 
Please login to merge, or discard this patch.
htdocs/workstation/workstation_card.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -41,12 +41,12 @@  discard block
 block discarded – undo
41 41
 $action      = GETPOST('action', 'aZ09');
42 42
 $confirm     = GETPOST('confirm', 'alpha');
43 43
 $cancel      = GETPOST('cancel', 'aZ09');
44
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'workstationcard';   // To manage different context of search
44
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'workstationcard'; // To manage different context of search
45 45
 $backtopage  = GETPOST('backtopage', 'alpha');
46 46
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
47 47
 
48
-$groups	    = GETPOST('groups', 'array:int');
49
-$resources	= GETPOST('resources', 'array:int');
48
+$groups = GETPOST('groups', 'array:int');
49
+$resources = GETPOST('resources', 'array:int');
50 50
 //$lineid   = GETPOST('lineid', 'int');
51 51
 
52 52
 // Initialize technical objects
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
79 79
 
80 80
 // Permissions
81
-$permissiontoread   =  $user->rights->workstation->workstation->read;
82
-$permissiontoadd    =  $user->rights->workstation->workstation->write;      // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
83
-$permissiontodelete =  $user->rights->workstation->workstation->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
84
-$permissionnote     =  $user->rights->workstation->workstation->write;      // Used by the include of actions_setnotes.inc.php
85
-$permissiondellink  =  $user->rights->workstation->workstation->write;      // Used by the include of actions_dellink.inc.php
81
+$permissiontoread   = $user->rights->workstation->workstation->read;
82
+$permissiontoadd    = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
83
+$permissiontodelete = $user->rights->workstation->workstation->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
84
+$permissionnote     = $user->rights->workstation->workstation->write; // Used by the include of actions_setnotes.inc.php
85
+$permissiondellink  = $user->rights->workstation->workstation->write; // Used by the include of actions_dellink.inc.php
86 86
 
87 87
 $upload_dir = $conf->workstation->multidir_output[isset($object->entity) ? $object->entity : 1];
88 88
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
  */
97 97
 
98 98
 $parameters = array();
99
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);   // Note that $action and $object may have been modified by some hooks
99
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
100 100
 if ($reshook < 0) {
101 101
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
102 102
 }
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 		}
117 117
 	}
118 118
 
119
-	$triggermodname = 'WORKSTATION_WORKSTATION_MODIFY';    // Name of trigger action code to execute when we modify record
119
+	$triggermodname = 'WORKSTATION_WORKSTATION_MODIFY'; // Name of trigger action code to execute when we modify record
120 120
 
121 121
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
122 122
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
@@ -397,11 +397,11 @@  discard block
 block discarded – undo
397 397
 		$g = new UserGroup($db);
398 398
 		foreach ($object->usergroups as $id_group) {
399 399
 			$g->fetch($id_group);
400
-			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $g->getNomUrl(1, '', 0, 'categtextwhite') . '</li>';
400
+			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$g->getNomUrl(1, '', 0, 'categtextwhite').'</li>';
401 401
 		}
402 402
 
403
-		print '<tr><td>' . $langs->trans('Groups') . '</td><td>';
404
-		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
403
+		print '<tr><td>'.$langs->trans('Groups').'</td><td>';
404
+		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
405 405
 		print '</td></tr>';
406 406
 	}
407 407
 
@@ -411,11 +411,11 @@  discard block
 block discarded – undo
411 411
 		$r = new Dolresource($db);
412 412
 		foreach ($object->resources as $id_resource) {
413 413
 			$r->fetch($id_resource);
414
-			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $r->getNomUrl(1, '', '', 0, 'categtextwhite') . '</li>';
414
+			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$r->getNomUrl(1, '', '', 0, 'categtextwhite').'</li>';
415 415
 		}
416 416
 
417
-		print '<tr><td>' . $langs->trans('Machines') . '</td><td>';
418
-		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
417
+		print '<tr><td>'.$langs->trans('Machines').'</td><td>';
418
+		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
419 419
 		print '</td></tr>';
420 420
 	}
421 421
 
Please login to merge, or discard this patch.
htdocs/resource/agenda.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
  */
96 96
 
97 97
 $parameters = array('id'=>$id);
98
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
98
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
99 99
 if ($reshook < 0) {
100 100
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
101 101
 }
Please login to merge, or discard this patch.
htdocs/compta/stats/cabyprodserv.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 	$month_current = dol_print_date(dol_now(), '%m');
99 99
 	$year_start = $year;
100 100
 }
101
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver');	// We use timezone of server so report is same from everywhere
102
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
101
+$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
102
+$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
103 103
 // Quarter
104 104
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
105 105
 	$q = GETPOST("q", "int");
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 $headerparams = array_merge($commonparams, $headerparams);
209 209
 $tableparams = array_merge($commonparams, $tableparams);
210 210
 
211
-$paramslink="";
211
+$paramslink = "";
212 212
 foreach ($allparams as $key => $value) {
213 213
 	$paramslink .= '&'.$key.'='.$value;
214 214
 }
@@ -231,8 +231,8 @@  discard block
 block discarded – undo
231 231
 	$modecompta = "RECETTES-DEPENSES";
232 232
 }
233 233
 
234
-$exportlink="";
235
-$namelink="";
234
+$exportlink = "";
235
+$namelink = "";
236 236
 
237 237
 // Show report header
238 238
 if ($modecompta == "CREANCES-DETTES") {
Please login to merge, or discard this patch.