Completed
Branch develop (c23a95)
by
unknown
18:46
created
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.
htdocs/compta/stats/byratecountry.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 	$month_current = dol_print_date(dol_now(), '%m');
54 54
 	$year_start = $year;
55 55
 }
56
-$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
57
-$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
56
+$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
57
+$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
58 58
 
59 59
 // Quarter
60 60
 $q = '';
@@ -158,8 +158,8 @@  discard block
 block discarded – undo
158 158
 
159 159
 llxHeader('', $langs->trans("TurnoverReport"), '', '', 0, 0, '', '', $morequerystring);
160 160
 
161
-$exportlink="";
162
-$namelink="";
161
+$exportlink = "";
162
+$namelink = "";
163 163
 //print load_fiche_titre($langs->trans("VAT"),"");
164 164
 
165 165
 //$fsearch.='<br>';
Please login to merge, or discard this patch.
htdocs/compta/stats/cabyuser.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 	$month_current = dol_print_date(dol_now(), '%m');
80 80
 	$year_start = $year;
81 81
 }
82
-$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
83
-$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
82
+$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
83
+$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
84 84
 // Quarter
85 85
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
86 86
 	$q = GETPOST("q") ?GETPOST("q") : 0;
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 $headerparams = array_merge($commonparams, $headerparams);
166 166
 $tableparams = array_merge($commonparams, $tableparams);
167 167
 
168
-$paramslink="";
168
+$paramslink = "";
169 169
 foreach ($allparams as $key => $value) {
170 170
 	$paramslink .= '&'.$key.'='.$value;
171 171
 }
@@ -186,8 +186,8 @@  discard block
 block discarded – undo
186 186
 	$modecompta = "RECETTES-DEPENSES";
187 187
 }
188 188
 
189
-$exportlink="";
190
-$namelink="";
189
+$exportlink = "";
190
+$namelink = "";
191 191
 
192 192
 // Show report header
193 193
 if ($modecompta == "CREANCES-DETTES") {
Please login to merge, or discard this patch.
htdocs/contact/card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1277,7 +1277,7 @@
 block discarded – undo
1277 1277
 			$maxfilesizearray = getMaxFileSizeArray();
1278 1278
 			$maxmin = $maxfilesizearray['maxmin'];
1279 1279
 			if ($maxmin > 0) {
1280
-				print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
1280
+				print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
1281 1281
 			}
1282 1282
 			print '<input type="file" class="flat" name="photo" id="photoinput">';
1283 1283
 			print '</td></tr>';
Please login to merge, or discard this patch.
htdocs/fourn/ajax/getSupplierPrices.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 		if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
99 99
 			// get pmp for subproducts if any
100 100
 			$producttmp->get_sousproduits_arbo();
101
-			$prods_arbo=$producttmp->get_arbo_each_prod();
101
+			$prods_arbo = $producttmp->get_arbo_each_prod();
102 102
 			if (!empty($prods_arbo)) {
103 103
 				$price = 0;
104 104
 				foreach ($prods_arbo as $child) {
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 			}
110 110
 		}
111 111
 
112
-		$prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency));  // For price field, we must use price2num(), for label or title, price()
112
+		$prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency)); // For price field, we must use price2num(), for label or title, price()
113 113
 	}
114 114
 
115 115
 	// Add price for costprice (at end)
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 	if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
118 118
 		// get costprice for subproducts if any
119 119
 		$producttmp->get_sousproduits_arbo();
120
-		$prods_arbo=$producttmp->get_arbo_each_prod();
120
+		$prods_arbo = $producttmp->get_arbo_each_prod();
121 121
 		if (!empty($prods_arbo)) {
122 122
 			$price = 0;
123 123
 			foreach ($prods_arbo as $child) {
Please login to merge, or discard this patch.
htdocs/multicurrency/multicurrency_rate.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 $id_rate_selected = GETPOST('id_rate', 'int');
48 48
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
49 49
 $search_date_sync = dol_mktime(0, 0, 0, GETPOST('search_date_syncmonth', 'int'), GETPOST('search_date_syncday', 'int'), GETPOST('search_date_syncyear', 'int'));
50
-$search_date_sync_end	= dol_mktime(0, 0, 0, GETPOST('search_date_sync_endmonth', 'int'), GETPOST('search_date_sync_endday', 'int'), GETPOST('search_date_sync_endyear', 'int'));
50
+$search_date_sync_end = dol_mktime(0, 0, 0, GETPOST('search_date_sync_endmonth', 'int'), GETPOST('search_date_sync_endday', 'int'), GETPOST('search_date_sync_endyear', 'int'));
51 51
 $search_rate		= GETPOST('search_rate', 'alpha');
52 52
 $search_code		= GETPOST('search_code', 'alpha');
53 53
 $multicurrency_code = GETPOST('multicurrency_code', 'alpha');
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
223 223
 		$sall = "";
224 224
 		$search_date_sync = "";
225
-		$search_date_sync_end="";
225
+		$search_date_sync_end = "";
226 226
 		$search_rate = "";
227 227
 		$search_code = "";
228 228
 		$search_array_options = array();
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 $sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
301 301
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
302 302
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
303
-if ($search_date_sync && $search_date_sync_end ) {
303
+if ($search_date_sync && $search_date_sync_end) {
304 304
 	$sql .= " AND (cr.date_sync BETWEEN '".$db->idate($search_date_sync)."' AND '".$db->idate($search_date_sync_end)."')";
305 305
 } elseif ($search_date_sync && !$search_date_sync_end) {
306 306
 	$sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
@@ -357,9 +357,9 @@  discard block
 block discarded – undo
357 357
 	}
358 358
 
359 359
 	if ($search_date_sync) $param = "&search_date_sync=".$search_date_sync;
360
-	if ($search_date_sync_end) $param="&search_date_sync_end=".$search_date_sync_end;
360
+	if ($search_date_sync_end) $param = "&search_date_sync_end=".$search_date_sync_end;
361 361
 	if ($search_rate) $param = "&search_rate=".urlencode($search_rate);
362
-	if ($search_code != '') $param.="&search_code=".urlencode($search_code);
362
+	if ($search_code != '') $param .= "&search_code=".urlencode($search_code);
363 363
 
364 364
 	// Add $param from extra fields
365 365
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -486,9 +486,9 @@  discard block
 block discarded – undo
486 486
 		// USER REQUEST UPDATE FOR THIS LINE
487 487
 		if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
488 488
 			//  var_dump($obj);
489
-			print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
490
-			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
491
-			print ' <td><input type="text" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
489
+			print ' <td><input class="minwidth200" name="dateinput" value="'.date('Y-m-d', dol_stringtotime($obj->date_sync)).'" type="date"></td>';
490
+			print '<td>'.$form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true).'</td>';
491
+			print ' <td><input type="text" min ="0" step="any" class="minwidth200" name="rateinput" value="'.dol_escape_htmltag($obj->rate).'"></td>';
492 492
 
493 493
 			print '<td class="center nowrap ">';
494 494
 			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 				print ' - <span class="opacitymedium">'.$obj->name.'</span>';
513 513
 				print "</td>\n";
514 514
 
515
-				if (! $i) $totalarray['nbfield']++;
515
+				if (!$i) $totalarray['nbfield']++;
516 516
 			}
517 517
 
518 518
 			// rate
@@ -520,13 +520,13 @@  discard block
 block discarded – undo
520 520
 				print '<td class="tdoverflowmax200">';
521 521
 				print $obj->rate;
522 522
 				print "</td>\n";
523
-				if (! $i) $totalarray['nbfield']++;
523
+				if (!$i) $totalarray['nbfield']++;
524 524
 			}
525 525
 
526 526
 
527 527
 			// Fields from hook
528 528
 			$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);
529
-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
529
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
530 530
 			print $hookmanager->resPrint;
531 531
 
532 532
 			// Action
Please login to merge, or discard this patch.
htdocs/admin/emailcollector_card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -493,7 +493,7 @@
 block discarded – undo
493 493
 
494 494
 					dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread);
495 495
 
496
-					$result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect);	// timeout seems ignored with ssl connect
496
+					$result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect); // timeout seems ignored with ssl connect
497 497
 					$result2 = imap_timeout(IMAP_READTIMEOUT, $timeoutread);
498 498
 					$result3 = imap_timeout(IMAP_WRITETIMEOUT, 5);
499 499
 					$result4 = imap_timeout(IMAP_CLOSETIMEOUT, 5);
Please login to merge, or discard this patch.
htdocs/core/actions_dellink.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 if ($action == 'addlinkbyref' && !empty($permissiondellink) && !$cancellink && $id > 0 && !empty($addlinkref) && !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
44 44
 	$element_prop = getElementProperties($addlink);
45 45
 	if (is_array($element_prop)) {
46
-		dol_include_once('/' . $element_prop['classpath'] . '/' . $element_prop['classfile'] . '.class.php');
46
+		dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');
47 47
 
48 48
 		$objecttmp = new $element_prop['classname']($db);
49 49
 		$ret = $objecttmp->fetch(0, $addlinkref);
Please login to merge, or discard this patch.
htdocs/core/modules/modSociete.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 		$this->rights[$r][0] = 130;
203 203
 		$this->rights[$r][1] = 'Modify thirdparty information payment';
204 204
 		$this->rights[$r][3] = 0;
205
-		$this->rights[$r][4] = 'thirdparty_paymentinformation_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
205
+		$this->rights[$r][4] = 'thirdparty_paymentinformation_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
206 206
 		$this->rights[$r][5] = 'write';
207 207
 
208 208
 		// 262 : Restrict access to sales representative
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
 		}
705 705
 		// Add profids as criteria to search duplicates
706 706
 		$langs->load("companies");
707
-		$i=1;
707
+		$i = 1;
708 708
 		while ($i <= 6) {
709 709
 			if ($i == 1) {
710 710
 				$this->import_updatekeys_array[$r]['s.siren'] = 'ProfId1'.(empty($mysoc->country_code) ? '' : $mysoc->country_code);
Please login to merge, or discard this patch.