Completed
Branch develop (edaab5)
by
unknown
17:45
created
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/expensereport/ajax/ajaxik.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -66,26 +66,26 @@
 block discarded – undo
66 66
 $rep = new stdClass();
67 67
 $rep->response_status = 0;
68 68
 $rep->data = null;
69
-$rep->error = '';//@todo deprecated use error_message instead
69
+$rep->error = ''; //@todo deprecated use error_message instead
70 70
 $rep->errorMessage = '';
71 71
 
72 72
 
73 73
 if (empty($fk_expense) || $fk_expense < 0) {
74
-	$rep->errorMessage =   $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense');
74
+	$rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense');
75 75
 } elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) {
76
-	$rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat');
76
+	$rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat');
77 77
 
78 78
 	$rep->response_status = 'error';
79 79
 } else {
80 80
 	// @see ndfp.class.php:3576 (method: compute_total_km)
81 81
 	$expense = new ExpenseReport($db);
82 82
 	if ($expense->fetch($fk_expense) <= 0) {
83
-		$rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorRecordNotFound');
83
+		$rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound');
84 84
 		$rep->response_status = 'error';
85 85
 	} else {
86 86
 		$userauthor = new User($db);
87 87
 		if ($userauthor->fetch($expense->fk_user_author) <= 0) {
88
-			$rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorRecordNotFound');
88
+			$rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound');
89 89
 			$rep->response_status = 'error';
90 90
 		} else {
91 91
 			$expense = new ExpenseReport($db);
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.
htdocs/core/class/notify.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -615,7 +615,7 @@
 block discarded – undo
615 615
 
616 616
 						$ref = dol_sanitizeFileName($newref);
617 617
 						$pdf_path = $dir_output."/".$ref.".pdf";
618
-						if (!dol_is_file($pdf_path)||(is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0 && !$arraydefaultmessage->joinfiles)) {
618
+						if (!dol_is_file($pdf_path) || (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0 && !$arraydefaultmessage->joinfiles)) {
619 619
 							// We can't add PDF as it is not generated yet.
620 620
 							$filepdf = '';
621 621
 						} else {
Please login to merge, or discard this patch.
htdocs/compta/bank/annuel.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -214,8 +214,8 @@
 block discarded – undo
214 214
 // Total debit-credit
215 215
 print '<tr class="liste_total"><td><b>'.$langs->trans("Total")."</b></td>";
216 216
 for ($annee = $year_start; $annee <= $year_end; $annee++) {
217
-	print '<td class="right nowraponall"><b>'. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .'</b></td>';
218
-	print '<td class="right nowraponall"><b>'. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .'</b></td>';
217
+	print '<td class="right nowraponall"><b>'.(isset($totsorties[$annee]) ? price($totsorties[$annee]) : '').'</b></td>';
218
+	print '<td class="right nowraponall"><b>'.(isset($totentrees[$annee]) ? price($totentrees[$annee]) : '').'</b></td>';
219 219
 }
220 220
 print "</tr>\n";
221 221
 
Please login to merge, or discard this patch.
htdocs/core/class/commonorder.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,13 +76,13 @@
 block discarded – undo
76 76
 	 * Boolean that indicates whether the product is available for sale '1' or not '0'
77 77
 	 * @var int
78 78
 	 */
79
-	public $product_tosell=0;
79
+	public $product_tosell = 0;
80 80
 
81 81
 	/**
82 82
 	 * Boolean that indicates whether the product is available for purchase '1' or not '0'
83 83
 	 * @var int
84 84
 	 */
85
-	public $product_tobuy=0;
85
+	public $product_tobuy = 0;
86 86
 
87 87
 	/**
88 88
 	 * Product description
Please login to merge, or discard this patch.
htdocs/accountancy/expensereport/list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 $search_date_endday = GETPOST('search_date_endday', 'int');
66 66
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
67 67
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
68
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
68
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
69 69
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
70 70
 
71 71
 // Load variable for pagination
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 	$permissiontoread = $user->hasRight('accounting', 'read');
154 154
 	$permissiontodelete = $user->hasRight('accounting', 'delete');
155 155
 	$uploaddir = $conf->expensereport->dir_output;
156
-	include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
156
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
157 157
 }
158 158
 
159 159
 
Please login to merge, or discard this patch.