Completed
Branch develop (c23a95)
by
unknown
18:46
created
htdocs/fourn/paiement/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@
 block discarded – undo
126 126
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
127 127
 
128 128
 	// Amount
129
-	$morehtmlref .= '<br>'.$langs->trans('Amount').' : '. price($object->amount, '', $langs, 0, 0, -1, $conf->currency);
129
+	$morehtmlref .= '<br>'.$langs->trans('Amount').' : '.price($object->amount, '', $langs, 0, 0, -1, $conf->currency);
130 130
 
131 131
 	$allow_delete = 1;
132 132
 	// Bank account
Please login to merge, or discard this patch.
htdocs/supplier_proposal/list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 $search_date_endday = GETPOST('search_date_endday', 'int');
75 75
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
76 76
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
77
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
77
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
78 78
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
79 79
 $search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
80 80
 $search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 $search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
83 83
 $search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
84 84
 $search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
85
-$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
85
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver
86 86
 $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
87 87
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
88 88
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 			if ($searchCategoryProductOperator == 0) {
443 443
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
444 444
 			} else {
445
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
445
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
446 446
 			}
447 447
 		}
448 448
 	}
Please login to merge, or discard this patch.
htdocs/ecm/dir_add_card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
  *	\brief		Main page for ECM section area
24 24
  */
25 25
 
26
-if (! defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
26
+if (!defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
27 27
 
28 28
 // Load Dolibarr environment
29 29
 require '../main.inc.php';
Please login to merge, or discard this patch.
htdocs/admin/workflow.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 		'enabled'=>(isModEnabled('commande') && isModEnabled('facture')),
73 73
 		'picto'=>'bill'
74 74
 	),
75
-	'WORKFLOW_TICKET_CREATE_INTERVENTION' => array (
75
+	'WORKFLOW_TICKET_CREATE_INTERVENTION' => array(
76 76
 		'family'=>'create',
77 77
 		'position'=>25,
78 78
 		'enabled'=>(isModEnabled('ticket') && isModEnabled('ficheinter')),
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 }
193 193
 
194 194
 // remove not available workflows (based on activated modules and global defined keys)
195
-$workflowcodes = array_filter($workflowcodes, function ($var) {
195
+$workflowcodes = array_filter($workflowcodes, function($var) {
196 196
 	return $var['enabled'];
197 197
 });
198 198
 
Please login to merge, or discard this patch.
htdocs/admin/limits.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 
47 47
 $valmainmaxdecimalsunit = GETPOST($mainmaxdecimalsunit, 'int');
48 48
 $valmainmaxdecimalstot = GETPOST($mainmaxdecimalstot, 'int');
49
-$valmainmaxdecimalsshown = GETPOST($mainmaxdecimalsshown, 'alpha');	// Can be 'x.y' but also 'x...'
49
+$valmainmaxdecimalsshown = GETPOST($mainmaxdecimalsshown, 'alpha'); // Can be 'x.y' but also 'x...'
50 50
 $valmainroundingruletot = price2num(GETPOST($mainroundingruletot, 'alphanohtml'), '', 2);
51 51
 
52 52
 if (!$user->admin) {
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 		setEventMessages($langs->trans("ErrorValueCantBeNull", dol_trunc(dol_string_nohtmltag($langs->transnoentitiesnoconv("MAIN_MAX_DECIMALS_SHOWN")), 40)), null, 'errors');
94 94
 		$action = 'edit';
95 95
 	}
96
-	if (! $error && ((float) $valmainmaxdecimalsshown < $valmainmaxdecimalsunit || (float) $valmainmaxdecimalsshown < $valmainmaxdecimalstot)) {
96
+	if (!$error && ((float) $valmainmaxdecimalsshown < $valmainmaxdecimalsunit || (float) $valmainmaxdecimalsshown < $valmainmaxdecimalstot)) {
97 97
 		$langs->load("errors");
98 98
 		$error++;
99 99
 		setEventMessages($langs->trans("ErrorValueForTooLow", dol_trunc(dol_string_nohtmltag($langs->transnoentitiesnoconv("MAIN_MAX_DECIMALS_SHOWN")), 40)), null, 'errors');
@@ -129,11 +129,11 @@  discard block
 block discarded – undo
129 129
 $aCurrencies = array($conf->currency); // Default currency always first position
130 130
 
131 131
 if (isModEnabled('multicompany') && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY)) {
132
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/multicurrency.lib.php';
132
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
133 133
 
134
-	$sql = "SELECT rowid, code FROM " . MAIN_DB_PREFIX . "multicurrency";
135
-	$sql .= " WHERE entity = " . ((int) $conf->entity);
136
-	$sql .= " AND code <> '" . $db->escape($conf->currency) . "'"; // Default currency always first position
134
+	$sql = "SELECT rowid, code FROM ".MAIN_DB_PREFIX."multicurrency";
135
+	$sql .= " WHERE entity = ".((int) $conf->entity);
136
+	$sql .= " AND code <> '".$db->escape($conf->currency)."'"; // Default currency always first position
137 137
 	$resql = $db->query($sql);
138 138
 	if ($resql) {
139 139
 		while ($obj = $db->fetch_object($resql)) {
@@ -152,11 +152,11 @@  discard block
 block discarded – undo
152 152
 print "<br>\n";
153 153
 
154 154
 if ($action == 'edit') {
155
-	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
156
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
155
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
156
+	print '<input type="hidden" name="token" value="'.newToken().'">';
157 157
 	print '<input type="hidden" name="action" value="update">';
158 158
 	if (isModEnabled('multicompany') && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY)) {
159
-		print '<input type="hidden" name="currencycode" value="' . $currencycode . '">';
159
+		print '<input type="hidden" name="currencycode" value="'.$currencycode.'">';
160 160
 	}
161 161
 
162 162
 	clearstatcache();
Please login to merge, or discard this patch.
htdocs/admin/facture.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 $action = GETPOST('action', 'aZ09');
46 46
 $value = GETPOST('value', 'alpha');
47
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
47
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
48 48
 
49 49
 $label = GETPOST('label', 'alpha');
50 50
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 		setEventMessages($langs->trans('Error'), null, 'errors');
247 247
 	} else {
248 248
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
249
-		header("Location: " . $_SERVER["PHP_SELF"]);
249
+		header("Location: ".$_SERVER["PHP_SELF"]);
250 250
 		exit();
251 251
 	}
252 252
 } elseif (preg_match('/del_(.*)/', $action, $reg)) {
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 		setEventMessages($langs->trans('Error'), null, 'errors');
262 262
 	} else {
263 263
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
264
-		header("Location: " . $_SERVER["PHP_SELF"]);
264
+		header("Location: ".$_SERVER["PHP_SELF"]);
265 265
 		exit();
266 266
 	}
267 267
 }
@@ -801,8 +801,8 @@  discard block
 block discarded – undo
801 801
 print '</form>';
802 802
 
803 803
 
804
-print '<tr class="oddeven"><td>'.$langs->trans("InvoiceCheckPosteriorDate"). '&nbsp;' ;
805
-print $form->textwithpicto('', $langs->trans("InvoiceCheckPosteriorDateHelp"), 1, 'help') . '</td>';
804
+print '<tr class="oddeven"><td>'.$langs->trans("InvoiceCheckPosteriorDate").'&nbsp;';
805
+print $form->textwithpicto('', $langs->trans("InvoiceCheckPosteriorDateHelp"), 1, 'help').'</td>';
806 806
 print '<td class="left" colspan="2">';
807 807
 print ajax_constantonoff('INVOICE_CHECK_POSTERIOR_DATE');
808 808
 print '</td></tr>';
Please login to merge, or discard this patch.
htdocs/admin/barcode.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 
40 40
 // Get Parameters
41 41
 $action = GETPOST('action', 'aZ09');
42
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
42
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
43 43
 
44 44
 
45 45
 /*
Please login to merge, or discard this patch.
htdocs/admin/commande.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 $action = GETPOST('action', 'aZ09');
45 45
 $value = GETPOST('value', 'alpha');
46
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
46
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
47 47
 
48 48
 $label = GETPOST('label', 'alpha');
49 49
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 		setEventMessages($langs->trans('Error'), null, 'errors');
212 212
 	} else {
213 213
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
214
-		header("Location: " . $_SERVER["PHP_SELF"]);
214
+		header("Location: ".$_SERVER["PHP_SELF"]);
215 215
 		exit();
216 216
 	}
217 217
 } elseif (preg_match('/del_(.*)/', $action, $reg)) {
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 		setEventMessages($langs->trans('Error'), null, 'errors');
227 227
 	} else {
228 228
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
229
-		header("Location: " . $_SERVER["PHP_SELF"]);
229
+		header("Location: ".$_SERVER["PHP_SELF"]);
230 230
 		exit();
231 231
 	}
232 232
 }
Please login to merge, or discard this patch.
htdocs/admin/tools/dolibarr_import.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@
 block discarded – undo
22 22
  * 		\brief      Page to import database
23 23
  */
24 24
 
25
-if (! defined('CSRFCHECK_WITH_TOKEN')) {
26
-	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
25
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
26
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
27 27
 }
28 28
 
29 29
 // Load Dolibarr environment
Please login to merge, or discard this patch.