Completed
Branch develop (82070c)
by
unknown
19:25
created
htdocs/product/inventory/inventory.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 				$line = $db->fetch_object($resql);
165 165
 
166 166
 				$qty_stock = $line->qty_stock;
167
-				$qty_view = $line->qty_view;		// The quantity viewed by inventorier, the qty we target
167
+				$qty_view = $line->qty_view; // The quantity viewed by inventorier, the qty we target
168 168
 
169 169
 
170 170
 				// Load real stock we have now.
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 						}
222 222
 						$sqlupdate .= " WHERE rowid = ".((int) $line->rowid);
223 223
 						$resqlupdate = $db->query($sqlupdate);
224
-						if (! $resqlupdate) {
224
+						if (!$resqlupdate) {
225 225
 							$error++;
226 226
 							setEventMessages($db->lasterror(), null, 'errors');
227 227
 							break;
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 					if (!empty($line->pmp_real) && getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
232 232
 						$sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product SET pmp = '.((float) $line->pmp_real).' WHERE rowid = '.((int) $line->fk_product);
233 233
 						$resqlpmp = $db->query($sqlpmp);
234
-						if (! $resqlpmp) {
234
+						if (!$resqlpmp) {
235 235
 							$error++;
236 236
 							setEventMessages($db->lasterror(), null, 'errors');
237 237
 							break;
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 						if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
240 240
 							$sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product_perentity SET pmp = '.((float) $line->pmp_real).' WHERE fk_product = '.((int) $line->fk_product).' AND entity='.$conf->entity;
241 241
 							$resqlpmp = $db->query($sqlpmp);
242
-							if (! $resqlpmp) {
242
+							if (!$resqlpmp) {
243 243
 								$error++;
244 244
 								setEventMessages($db->lasterror(), null, 'errors');
245 245
 								break;
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 			$error++;
259 259
 		}
260 260
 
261
-		if (! $error) {
261
+		if (!$error) {
262 262
 			$db->commit();
263 263
 		} else {
264 264
 			$db->rollback();
@@ -298,17 +298,17 @@  discard block
 block discarded – undo
298 298
 						setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors');
299 299
 					}
300 300
 					if ($result > 0) {
301
-						$inventoryline->qty_stock = (float) price2num(GETPOST('stock_qty_'.$lineid, 'alpha'), 'MS');	// The new value that was set in as hidden field
302
-						$inventoryline->qty_view = $qtytoupdate;	// The new value we want
301
+						$inventoryline->qty_stock = (float) price2num(GETPOST('stock_qty_'.$lineid, 'alpha'), 'MS'); // The new value that was set in as hidden field
302
+						$inventoryline->qty_view = $qtytoupdate; // The new value we want
303 303
 						$inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
304 304
 						$inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
305 305
 						$resultupdate = $inventoryline->update($user);
306 306
 					}
307
-				} elseif (GETPOSTISSET('id_' . $lineid)) {
307
+				} elseif (GETPOSTISSET('id_'.$lineid)) {
308 308
 					// Delete record
309 309
 					$result = $inventoryline->fetch($lineid);
310 310
 					if ($result > 0) {
311
-						$inventoryline->qty_view = null;			// The new value we want
311
+						$inventoryline->qty_view = null; // The new value we want
312 312
 						$inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
313 313
 						$inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
314 314
 						$resultupdate = $inventoryline->update($user);
@@ -324,12 +324,12 @@  discard block
 block discarded – undo
324 324
 		}
325 325
 
326 326
 		// Update line with id of stock movement (and the start quantity if it has changed this last recording)
327
-		if (! $error) {
327
+		if (!$error) {
328 328
 			$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."inventory";
329 329
 			$sqlupdate .= " SET fk_user_modif = ".((int) $user->id);
330 330
 			$sqlupdate .= " WHERE rowid = ".((int) $object->id);
331 331
 			$resqlupdate = $db->query($sqlupdate);
332
-			if (! $resqlupdate) {
332
+			if (!$resqlupdate) {
333 333
 				$error++;
334 334
 				setEventMessages($db->lasterror(), null, 'errors');
335 335
 			}
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 				}
414 414
 			} else {
415 415
 				// Clear var
416
-				$_POST['batch'] = '';		// TODO Replace this with a var
416
+				$_POST['batch'] = ''; // TODO Replace this with a var
417 417
 				$_POST['qtytoadd'] = '';
418 418
 			}
419 419
 		}
@@ -1017,7 +1017,7 @@  discard block
 block discarded – undo
1017 1017
 	$num = $db->num_rows($resql);
1018 1018
 
1019 1019
 	if (!empty($limit != 0) || $num > $limit || $page) {
1020
-		print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$object->id.$paramwithsearch, ($num >= $limit ? 1 : 0), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '', $limit);
1020
+		print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$object->id.$paramwithsearch, ($num >= $limit ? 1 : 0), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>', '', $limit);
1021 1021
 	}
1022 1022
 
1023 1023
 	$i = 0;
@@ -1169,7 +1169,7 @@  discard block
 block discarded – undo
1169 1169
 				print '</td>';
1170 1170
 
1171 1171
 				print '<td class="right nowraponall">';
1172
-				print $obj->qty_view;	// qty found
1172
+				print $obj->qty_view; // qty found
1173 1173
 				print '</td>';
1174 1174
 
1175 1175
 				//PMP Real
@@ -1191,7 +1191,7 @@  discard block
 block discarded – undo
1191 1191
 				$totalRealValuation += $pmp_valuation_real;
1192 1192
 			} else {
1193 1193
 				print '<td class="right nowraponall">';
1194
-				print $obj->qty_view;	// qty found
1194
+				print $obj->qty_view; // qty found
1195 1195
 				print '</td>';
1196 1196
 			}
1197 1197
 			print '<td>';
Please login to merge, or discard this patch.
htdocs/contrat/ticket.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 /*
62 62
  *	View
63 63
  */
64
-$title = $langs->trans("Contract") . ' - ' . $langs->trans("Tickets");
64
+$title = $langs->trans("Contract").' - '.$langs->trans("Tickets");
65 65
 $help_url = 'EN:Module_Contracts|FR:Module_Contrat|ES:Contratos_de_servicio';
66 66
 
67 67
 llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-contrat page-card_ticket');
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
 dol_get_fiche_head($head, 'ticket', $langs->trans("Contract"), -1, 'contract');
79 79
 
80
-$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid) ? '?socid='.$socid : '').'">';
80
+$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">';
81 81
 $linkback .= $langs->trans("BackToList").'</a>';
82 82
 
83 83
 $morehtmlref = '';
@@ -136,18 +136,18 @@  discard block
 block discarded – undo
136 136
 	1
137 137
 );
138 138
 // Thirdparty
139
-$morehtmlref .= '<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
139
+$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
140 140
 // Project
141
-if (! empty($conf->projet->enabled)) {
141
+if (!empty($conf->projet->enabled)) {
142 142
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
143 143
 
144 144
 	$langs->load("projects");
145
-	$morehtmlref .= '<br>'.$langs->trans('Project') . ' : ';
146
-	if (! empty($object->fk_project)) {
145
+	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
146
+	if (!empty($object->fk_project)) {
147 147
 		$proj = new Project($db);
148 148
 		$proj->fetch($object->fk_project);
149 149
 		$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id=';
150
-		$morehtmlref .= $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
150
+		$morehtmlref .= $object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
151 151
 		$morehtmlref .= $proj->ref;
152 152
 		$morehtmlref .= '</a>';
153 153
 	} else {
Please login to merge, or discard this patch.
htdocs/core/modules/facture/doc/pdf_crabe.modules.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
331 331
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
332 332
 					}
333
-					$pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
333
+					$pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
334 334
 					$tplidx = $pdf->importPage(1);
335 335
 				}
336 336
 
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
 				// $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
445 445
 
446 446
 				// $tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
447
-				$tab_top = 90 + $top_shift;		// top_shift is an addition for linked objects or addons (0 in most cases)
447
+				$tab_top = 90 + $top_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
448 448
 				$tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
449 449
 
450 450
 				// You can add more thing under header here, if you increase $extra_under_address_shift too.
@@ -787,7 +787,7 @@  discard block
 block discarded – undo
787 787
 					if (!isset($this->tva[$vatrate])) {
788 788
 						$this->tva[$vatrate] = 0;
789 789
 					}
790
-					$this->tva[$vatrate] += $tvaligne;	// ->tva is abandoned, we use now ->tva_array that is more complete
790
+					$this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete
791 791
 					$vatcode = $object->lines[$i]->vat_src_code;
792 792
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
793 793
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
@@ -1148,7 +1148,7 @@  discard block
 block discarded – undo
1148 1148
 		}
1149 1149
 
1150 1150
 		$posxval = 52;
1151
-		$posxend = 110;	// End of x for text on left side
1151
+		$posxend = 110; // End of x for text on left side
1152 1152
 		if ($this->page_largeur < 210) { // To work with US executive format
1153 1153
 			$posxend -= 10;
1154 1154
 		}
@@ -1166,7 +1166,7 @@  discard block
 block discarded – undo
1166 1166
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
1167 1167
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
1168 1168
 
1169
-			$posy = $pdf->GetY() + 3;	// We need spaces for 2 lines payment conditions
1169
+			$posy = $pdf->GetY() + 3; // We need spaces for 2 lines payment conditions
1170 1170
 		}
1171 1171
 
1172 1172
 		// Show category of operations
@@ -1178,7 +1178,7 @@  discard block
 block discarded – undo
1178 1178
 
1179 1179
 			$pdf->SetFont('', '', $default_font_size - 2);
1180 1180
 			$pdf->SetXY($posxval, $posy);
1181
-			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
1181
+			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation);
1182 1182
 			$pdf->MultiCell($posxend - $posxval, 4, $categoryOfOperationLabel, 0, 'L');
1183 1183
 
1184 1184
 			$posy = $pdf->GetY() + 3; // for 2 lines
@@ -1725,7 +1725,7 @@  discard block
 block discarded – undo
1725 1725
 		if (empty($hidetop)) {
1726 1726
 			// Show category of operations
1727 1727
 			if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 1 && $this->categoryOfOperation >= 0) {
1728
-				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations") . ' : ' . $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
1728
+				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations").' : '.$outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation);
1729 1729
 				$pdf->SetXY($this->marge_gauche, $tab_top - 4);
1730 1730
 				$pdf->MultiCell(($pdf->GetStringWidth($categoryOfOperations)) + 4, 2, $categoryOfOperations);
1731 1731
 			}
@@ -1895,7 +1895,7 @@  discard block
 block discarded – undo
1895 1895
 		}
1896 1896
 		if ($this->situationinvoice) {
1897 1897
 			$langs->loadLangs(array("other"));
1898
-			$title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -";
1898
+			$title = $outputlangs->transnoentities("PDFInvoiceSituation")." ".$outputlangs->transnoentities("NumberingShort").$object->situation_counter." -";
1899 1899
 		}
1900 1900
 		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
1901 1901
 			$title .= ' - ';
@@ -2121,7 +2121,7 @@  discard block
 block discarded – undo
2121 2121
 
2122 2122
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
2123 2123
 
2124
-			$mode =  'target';
2124
+			$mode = 'target';
2125 2125
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), ($usecontact ? 1 : 0), $mode, $object);
2126 2126
 
2127 2127
 			// Show recipient
Please login to merge, or discard this patch.
htdocs/core/modules/propale/doc/pdf_azur.modules.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
321 321
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
322 322
 					}
323
-					$pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
323
+					$pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
324 324
 					$tplidx = $pdf->importPage(1);
325 325
 				}
326 326
 
@@ -1693,7 +1693,7 @@  discard block
 block discarded – undo
1693 1693
 
1694 1694
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
1695 1695
 
1696
-			$mode =  'target';
1696
+			$mode = 'target';
1697 1697
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), ($usecontact ? 1 : 0), $mode, $object);
1698 1698
 
1699 1699
 			// Show recipient
Please login to merge, or discard this patch.
htdocs/core/modules/commande/doc/pdf_einstein.modules.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
272 272
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
273 273
 					}
274
-					$pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
274
+					$pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
275 275
 					$tplidx = $pdf->importPage(1);
276 276
 				}
277 277
 
@@ -1485,7 +1485,7 @@  discard block
 block discarded – undo
1485 1485
 
1486 1486
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
1487 1487
 
1488
-			$mode =  'target';
1488
+			$mode = 'target';
1489 1489
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), ($usecontact ? 1 : 0), $mode, $object);
1490 1490
 
1491 1491
 			// Show recipient
Please login to merge, or discard this patch.
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1671,7 +1671,7 @@
 block discarded – undo
1671 1671
 				$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
1672 1672
 			}
1673 1673
 
1674
-			$mode =  'target';
1674
+			$mode = 'target';
1675 1675
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), ($usecontact ? 1 : 0), $mode, $object);
1676 1676
 
1677 1677
 			// Show recipient
Please login to merge, or discard this patch.