Completed
Branch develop (806e3a)
by
unknown
17:40
created
htdocs/comm/propal/stats/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -335,7 +335,7 @@
 block discarded – undo
335 335
 	print '<tr class="oddeven" height="24">';
336 336
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
337 337
 	print '<td class="right">'.$val['nb'].'</td>';
338
-	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']): "0").'%</td>';
338
+	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']) : "0").'%</td>';
339 339
 	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
340 340
 	print '<td class="right opacitylow" style="'.((!isset($val['total_diff']) || $val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['total_diff']) ? round($val['total_diff']) : "0").'%</td>';
341 341
 	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
Please login to merge, or discard this patch.
htdocs/product/stock/stocktransfer/stocktransfer_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -494,7 +494,7 @@
 block discarded – undo
494 494
 				if ($key === 'date_prevue_depart' && $object->lead_time_for_warning > 0 && $object->$key > 0) {
495 495
 					$date_prevue_depart = $object->$key;
496 496
 					$date_prevue_depart_plus_delai = $date_prevue_depart;
497
-					if ($object->lead_time_for_warning > 0) $date_prevue_depart_plus_delai = strtotime(date('Y-m-d', $date_prevue_depart) . ' + '.$object->lead_time_for_warning.' day');
497
+					if ($object->lead_time_for_warning > 0) $date_prevue_depart_plus_delai = strtotime(date('Y-m-d', $date_prevue_depart).' + '.$object->lead_time_for_warning.' day');
498 498
 					if ($date_prevue_depart_plus_delai < strtotime(date('Y-m-d'))) print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
499 499
 				}
500 500
 			}
Please login to merge, or discard this patch.
htdocs/core/modules/modStockTransfer.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -455,17 +455,17 @@
 block discarded – undo
455 455
 		// Rôles
456 456
 		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STDEST" AND element = "StockTransfer" AND source = "internal"');
457 457
 		$res = $this->db->fetch_object($resql);
458
-		$nextid=$this->getNextId();
458
+		$nextid = $this->getNextId();
459 459
 		if (empty($res)) $this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "internal", "STRESP", "Responsable du transfert de stocks", 1, NULL, 0)');
460 460
 
461 461
 		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STFROM" AND element = "StockTransfer" AND source = "external"');
462 462
 		$res = $this->db->fetch_object($resql);
463
-		$nextid=$this->getNextId();
463
+		$nextid = $this->getNextId();
464 464
 		if (empty($res)) $this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STFROM", "Contact expéditeur transfert de stocks", 1, NULL, 0)');
465 465
 
466 466
 		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STDEST" AND element = "StockTransfer" AND source = "external"');
467 467
 		$res = $this->db->fetch_object($resql);
468
-		$nextid=$this->getNextId();
468
+		$nextid = $this->getNextId();
469 469
 		if (empty($res)) $this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STDEST", "Contact destinataire transfert de stocks", 1, NULL, 0)');
470 470
 
471 471
 		return $this->_init($sql, $options);
Please login to merge, or discard this patch.
htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.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
  *  \ingroup    stocktransfer
24 24
  *  \brief      File of class to manage StockTransfer numbering rules standard
25 25
  */
26
-require_once DOL_DOCUMENT_ROOT . '/core/modules/stocktransfer/modules_stocktransfer.php';
26
+require_once DOL_DOCUMENT_ROOT.'/core/modules/stocktransfer/modules_stocktransfer.php';
27 27
 
28 28
 
29 29
 /**
Please login to merge, or discard this patch.
htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
  * \brief      File containing class for advanced numbering model of StockTransfer
28 28
  */
29 29
 
30
-require_once DOL_DOCUMENT_ROOT . '/core/modules/stocktransfer/modules_stocktransfer.php';
30
+require_once DOL_DOCUMENT_ROOT.'/core/modules/stocktransfer/modules_stocktransfer.php';
31 31
 
32 32
 
33 33
 /**
Please login to merge, or discard this patch.
htdocs/compta/facture/prelevement.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -434,7 +434,7 @@
 block discarded – undo
434 434
 			$invoicecredits[] = $facavoir->getNomUrl(1);
435 435
 		}
436 436
 		print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir");
437
-		print ' '. (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
437
+		print ' '.(count($invoicecredits) ? ' ' : '').implode(',', $invoicecredits);
438 438
 		print '</span>';
439 439
 	}
440 440
 	/*
Please login to merge, or discard this patch.
htdocs/compta/stats/casoc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 	$month_current = dol_print_date(dol_now(), '%m');
100 100
 	$year_start = $year;
101 101
 }
102
-$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
103
-$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
102
+$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
103
+$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
104 104
 // Quarter
105 105
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
106 106
 	$q = GETPOST("q", "int") ?GETPOST("q", "int") : 0;
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 $headerparams = array_merge($commonparams, $headerparams);
180 180
 $tableparams = array_merge($commonparams, $tableparams);
181 181
 
182
-$paramslink="";
182
+$paramslink = "";
183 183
 foreach ($allparams as $key => $value) {
184 184
 	$paramslink .= '&'.$key.'='.$value;
185 185
 }
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
 	$modecompta = "RECETTES-DEPENSES";
204 204
 }
205 205
 
206
-$exportlink="";
207
-$namelink="";
206
+$exportlink = "";
207
+$namelink = "";
208 208
 
209 209
 // Show report header
210 210
 if ($modecompta == "CREANCES-DETTES") {
Please login to merge, or discard this patch.
htdocs/commande/stats/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -394,7 +394,7 @@
 block discarded – undo
394 394
 	print '<tr class="oddeven" height="24">';
395 395
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
396 396
 	print '<td class="right">'.$val['nb'].'</td>';
397
-	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']): "0").'%</td>';
397
+	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']) : "0").'%</td>';
398 398
 	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
399 399
 	print '<td class="right opacitylow" style="'.((!isset($val['total_diff']) || $val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['total_diff']) ? round($val['total_diff']) : "0").'%</td>';
400 400
 	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
Please login to merge, or discard this patch.
htdocs/ticket/contact.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -88,21 +88,21 @@  discard block
 block discarded – undo
88 88
 		$error = 0;
89 89
 
90 90
 		$codecontact = dol_getIdFromCode($db, $typeid, 'c_type_contact', 'rowid', 'code');
91
-		if ($codecontact=='SUPPORTTEC') {
91
+		if ($codecontact == 'SUPPORTTEC') {
92 92
 			$internal_contacts = $object->listeContact(-1, 'internal', 0, 'SUPPORTTEC');
93 93
 			foreach ($internal_contacts as $key => $contact) {
94 94
 				if ($contact['id'] !== $contactid) {
95 95
 					//print "user à effacer : ".$useroriginassign;
96 96
 					$result = $object->delete_contact($contact['rowid']);
97
-					if ($result<0) {
98
-						$error ++;
97
+					if ($result < 0) {
98
+						$error++;
99 99
 						setEventMessages($object->error, $object->errors, 'errors');
100 100
 					}
101 101
 				}
102 102
 			}
103 103
 			$ret = $object->assignUser($user, $contactid);
104 104
 			if ($ret < 0) {
105
-				$error ++;
105
+				$error++;
106 106
 				setEventMessages($object->error, $object->errors, 'errors');
107 107
 			}
108 108
 		}
@@ -139,10 +139,10 @@  discard block
 block discarded – undo
139 139
 	if ($object->fetch($id, '', $track_id)) {
140 140
 		$internal_contacts = $object->listeContact(-1, 'internal', 0, 'SUPPORTTEC');
141 141
 		foreach ($internal_contacts as $key => $contact) {
142
-			if ($contact['rowid'] == $lineid && $object->fk_user_assign==$contact['id']) {
142
+			if ($contact['rowid'] == $lineid && $object->fk_user_assign == $contact['id']) {
143 143
 				$ret = $object->assignUser($user, null);
144 144
 				if ($ret < 0) {
145
-					$error ++;
145
+					$error++;
146 146
 					setEventMessages($object->error, $object->errors, 'errors');
147 147
 				}
148 148
 			}
Please login to merge, or discard this patch.