Completed
Branch develop (68d67a)
by
unknown
16:20
created
htdocs/user/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 	|| (($user->id != $id) && $user->hasRight("user", "user", "passsword")));
61 61
 }
62 62
 
63
-$permissiontoadd = $caneditfield;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
63
+$permissiontoadd = $caneditfield; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
64 64
 $permtoedit = $caneditfield;
65 65
 
66 66
 // Security check
Please login to merge, or discard this patch.
htdocs/core/filemanagerdol/connectors/php/connector.lib.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -374,7 +374,7 @@
 block discarded – undo
374 374
 	echo <<<EOF
375 375
 <script type="text/javascript">
376 376
 (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
377
-EOF;
377
+eof;
378 378
 
379 379
 	if ($errorNumber && $errorNumber != 201) {
380 380
 		$fileUrl = "";
Please login to merge, or discard this patch.
htdocs/core/filemanagerdol/connectors/php/connector.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 
25 25
 ob_start();
26 26
 
27
-require 'config.inc.php';	// This include the main.inc.php
27
+require 'config.inc.php'; // This include the main.inc.php
28 28
 require 'connector.lib.php';
29 29
 
30 30
 if (!$Config['Enabled']) {
Please login to merge, or discard this patch.
htdocs/core/lib/images.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 
183 183
 	$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
184 184
 
185
-	$infoImg = getimagesize($filetoread); 			// Get data about src image
185
+	$infoImg = getimagesize($filetoread); // Get data about src image
186 186
 	$imgWidth = $infoImg[0]; // Largeur de l'image
187 187
 	$imgHeight = $infoImg[1]; // Hauteur de l'image
188 188
 
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 	}
302 302
 
303 303
 	// Set transparent color according to image extension
304
-	$trans_colour = -1;	// By default, undefined
304
+	$trans_colour = -1; // By default, undefined
305 305
 	switch ($newExt) {
306 306
 		case 'gif':	// Gif
307 307
 			$trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // On procede autrement pour le format GIF
Please login to merge, or discard this patch.
htdocs/product/stock/stocktransfer/stocktransfer_note.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,9 @@
 block discarded – undo
51 51
 
52 52
 // Load object
53 53
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
54
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->stocktransfer->multidir_output[$object->entity]."/".$object->id;
54
+if ($id > 0 || !empty($ref)) {
55
+	$upload_dir = $conf->stocktransfer->multidir_output[$object->entity]."/".$object->id;
56
+}
55 57
 
56 58
 $permissionnote = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_setnotes.inc.php
57 59
 $permissiontoadd = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_addupdatedelete.inc.php
Please login to merge, or discard this patch.
htdocs/product/stock/stocktransfer/stocktransfer_contact.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,7 +35,9 @@  discard block
 block discarded – undo
35 35
 $action = GETPOST('action', 'alpha');
36 36
 
37 37
 // Security check
38
-if ($user->socid) $socid = $user->socid;
38
+if ($user->socid) {
39
+	$socid = $user->socid;
40
+}
39 41
 
40 42
 $result = restrictedArea($user, 'stocktransfer', $id, '', 'stocktransfer');
41 43
 
@@ -175,7 +177,9 @@  discard block
 block discarded – undo
175 177
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
176 178
 	foreach ($dirtpls as $reldir) {
177 179
 		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
178
-		if ($res) break;
180
+		if ($res) {
181
+			break;
182
+		}
179 183
 	}
180 184
 }
181 185
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
131 131
 	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
132 132
 	// Thirdparty
133 133
 	if (!empty($object->thirdparty)) {
134
-		$morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer');
134
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
135 135
 	}
136 136
 	// Project
137 137
 	if (isModEnabled('project')) {
Please login to merge, or discard this patch.
htdocs/bom/class/bom.class.php 4 patches
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -671,11 +671,11 @@
 block discarded – undo
671 671
 			$rankToUse = (int) $position;
672 672
 			if ($rankToUse != $line->oldcopy->position) { // check if position have a new value
673 673
 				foreach ($this->lines as $bl) {
674
-					if ($bl->position >= $rankToUse AND $bl->position < ($line->oldcopy->position + 1)) { // move rank up
674
+					if ($bl->position >= $rankToUse and $bl->position < ($line->oldcopy->position + 1)) { // move rank up
675 675
 						$bl->position++;
676 676
 						$bl->update($user);
677 677
 					}
678
-					if ($bl->position <= $rankToUse AND $bl->position > ($line->oldcopy->position)) { // move rank down
678
+					if ($bl->position <= $rankToUse and $bl->position > ($line->oldcopy->position)) { // move rank down
679 679
 						$bl->position--;
680 680
 						$bl->update($user);
681 681
 					}
Please login to merge, or discard this patch.
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -405,7 +405,6 @@
 block discarded – undo
405 405
 	 * Load object lines in memory from the database by type of product
406 406
 	 *
407 407
 	 * 	@param int    $typeproduct   0 type product, 1 type service
408
-
409 408
 	 * @return int         <0 if KO, 0 if not found, >0 if OK
410 409
 	 */
411 410
 	public function fetchLinesbytypeproduct($typeproduct = 0)
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 		$sql .= " FROM ".$this->db->prefix().$objectline->table_element." as l";
452 452
 		$sql .= " LEFT JOIN ".$this->db->prefix()."product as p ON p.rowid = l.fk_product";
453 453
 		$sql .= " WHERE l.fk_".$this->db->escape($this->element)." = ".((int) $this->id);
454
-		$sql .= " AND p.fk_product_type = ". ((int) $typeproduct);
454
+		$sql .= " AND p.fk_product_type = ".((int) $typeproduct);
455 455
 		if (isset($objectline->fields['position'])) {
456 456
 			$sql .= $this->db->order('position', 'ASC');
457 457
 		}
@@ -1182,7 +1182,7 @@  discard block
 block discarded – undo
1182 1182
 				$label = $langs->trans("ShowBillOfMaterials");
1183 1183
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
1184 1184
 			}
1185
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
1185
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
1186 1186
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
1187 1187
 		} else {
1188 1188
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1401,7 +1401,7 @@  discard block
 block discarded – undo
1401 1401
 		$this->unit_cost = 0;
1402 1402
 		$this->total_cost = 0;
1403 1403
 
1404
-		$parameters=array();
1404
+		$parameters = array();
1405 1405
 		$reshook = $hookmanager->executeHooks('calculateCostsBom', $parameters, $this); // Note that $action and $object may have been modified by hook
1406 1406
 
1407 1407
 		if ($reshook > 0) {
@@ -1416,7 +1416,7 @@  discard block
 block discarded – undo
1416 1416
 			foreach ($this->lines as &$line) {
1417 1417
 				$tmpproduct->cost_price = 0;
1418 1418
 				$tmpproduct->pmp = 0;
1419
-				$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1);	// We discard selling price and language loading
1419
+				$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading
1420 1420
 
1421 1421
 				if ($tmpproduct->type == $tmpproduct::TYPE_PRODUCT) {
1422 1422
 					if (empty($line->fk_bom_child)) {
@@ -1525,12 +1525,12 @@  discard block
 block discarded – undo
1525 1525
 		if (!empty($this->lines)) {
1526 1526
 			foreach ($this->lines as $line) {
1527 1527
 				if (!empty($line->childBom)) {
1528
-					foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
1528
+					foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty * $qty);
1529 1529
 				} else {
1530 1530
 					if (empty($TNetNeeds[$line->fk_product])) {
1531 1531
 						$TNetNeeds[$line->fk_product] = 0;
1532 1532
 					}
1533
-					$TNetNeeds[$line->fk_product] += $line->qty*$qty;
1533
+					$TNetNeeds[$line->fk_product] += $line->qty * $qty;
1534 1534
 				}
1535 1535
 			}
1536 1536
 		}
@@ -1552,9 +1552,9 @@  discard block
 block discarded – undo
1552 1552
 					foreach ($line->childBom as $childBom) {
1553 1553
 						$TNetNeeds[$childBom->id]['bom'] = $childBom;
1554 1554
 						$TNetNeeds[$childBom->id]['parentid'] = $this->id;
1555
-						$TNetNeeds[$childBom->id]['qty'] = $line->qty*$qty;
1555
+						$TNetNeeds[$childBom->id]['qty'] = $line->qty * $qty;
1556 1556
 						$TNetNeeds[$childBom->id]['level'] = $level;
1557
-						$childBom->getNetNeedsTree($TNetNeeds, $line->qty*$qty, $level+1);
1557
+						$childBom->getNetNeedsTree($TNetNeeds, $line->qty * $qty, $level + 1);
1558 1558
 					}
1559 1559
 				} else {
1560 1560
 					$TNetNeeds[$this->id]['product'][$line->fk_product]['qty'] += $line->qty * $qty;
@@ -1580,7 +1580,7 @@  discard block
 block discarded – undo
1580 1580
 			return;
1581 1581
 		}
1582 1582
 
1583
-		if (empty($bom_id)) $bom_id=$this->id;
1583
+		if (empty($bom_id)) $bom_id = $this->id;
1584 1584
 
1585 1585
 		$sql = 'SELECT l.fk_bom, b.label
1586 1586
 				FROM '.MAIN_DB_PREFIX.'bom_bomline l
@@ -1591,7 +1591,7 @@  discard block
 block discarded – undo
1591 1591
 		if (!empty($resql)) {
1592 1592
 			while ($res = $this->db->fetch_object($resql)) {
1593 1593
 				$TParentBom[$res->fk_bom] = $res->fk_bom;
1594
-				$this->getParentBomTreeRecursive($TParentBom, $res->fk_bom, $level+1);
1594
+				$this->getParentBomTreeRecursive($TParentBom, $res->fk_bom, $level + 1);
1595 1595
 			}
1596 1596
 		}
1597 1597
 	}
@@ -1605,7 +1605,7 @@  discard block
 block discarded – undo
1605 1605
 	 */
1606 1606
 	public function getKanbanView($option = '', $arraydata = null)
1607 1607
 	{
1608
-		global $db,$langs;
1608
+		global $db, $langs;
1609 1609
 
1610 1610
 		$selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
1611 1611
 
Please login to merge, or discard this patch.
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1460,8 +1460,9 @@  discard block
 block discarded – undo
1460 1460
 						$workstation = new Workstation($this->db);
1461 1461
 						$res = $workstation->fetch($tmpproduct->fk_default_workstation);
1462 1462
 
1463
-						if ($res > 0) $line->total_cost = price2num($qtyhourforline * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
1464
-						else {
1463
+						if ($res > 0) {
1464
+							$line->total_cost = price2num($qtyhourforline * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
1465
+						} else {
1465 1466
 							$this->error = $workstation->error;
1466 1467
 								return -3;
1467 1468
 						}
@@ -1525,7 +1526,9 @@  discard block
 block discarded – undo
1525 1526
 		if (!empty($this->lines)) {
1526 1527
 			foreach ($this->lines as $line) {
1527 1528
 				if (!empty($line->childBom)) {
1528
-					foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
1529
+					foreach ($line->childBom as $childBom) {
1530
+						$childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
1531
+					}
1529 1532
 				} else {
1530 1533
 					if (empty($TNetNeeds[$line->fk_product])) {
1531 1534
 						$TNetNeeds[$line->fk_product] = 0;
@@ -1580,7 +1583,9 @@  discard block
 block discarded – undo
1580 1583
 			return;
1581 1584
 		}
1582 1585
 
1583
-		if (empty($bom_id)) $bom_id=$this->id;
1586
+		if (empty($bom_id)) {
1587
+			$bom_id=$this->id;
1588
+		}
1584 1589
 
1585 1590
 		$sql = 'SELECT l.fk_bom, b.label
1586 1591
 				FROM '.MAIN_DB_PREFIX.'bom_bomline l
Please login to merge, or discard this patch.
htdocs/cron/card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -550,7 +550,7 @@
 block discarded – undo
550 550
 		$langs->load($reg[1]);
551 551
 	}
552 552
 
553
-	$labeltoshow =  preg_replace('/:.*$/', '', $object->label);
553
+	$labeltoshow = preg_replace('/:.*$/', '', $object->label);
554 554
 
555 555
 	$morehtmlref = '<div class="refidno">';
556 556
 	$morehtmlref .= $langs->trans($labeltoshow);
Please login to merge, or discard this patch.
htdocs/accountancy/admin/defaultaccounts.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 print '<tr class="oddeven value">';
279 279
 // Param
280 280
 print '<td>';
281
-print img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT');
281
+print img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT');
282 282
 print '</td>';
283 283
 // Value
284 284
 print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
@@ -288,13 +288,13 @@  discard block
 block discarded – undo
288 288
 
289 289
 if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') != '-1') {
290 290
 	print '<tr class="oddeven">';
291
-	print '<td>' . img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnCustomerDeposit") . '</td>';
291
+	print '<td>'.img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("UseAuxiliaryAccountOnCustomerDeposit").'</td>';
292 292
 	if (getDolGlobalInt('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) {
293
-		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">';
293
+		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">';
294 294
 		print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning');
295 295
 		print '</a></td>';
296 296
 	} else {
297
-		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">';
297
+		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">';
298 298
 		print img_picto($langs->trans("Disabled"), 'switch_off');
299 299
 		print '</a></td>';
300 300
 	}
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 print '<tr class="oddeven value">';
306 306
 // Param
307 307
 print '<td>';
308
-print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT');
308
+print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT');
309 309
 print '</td>';
310 310
 // Value
311 311
 print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
@@ -315,13 +315,13 @@  discard block
 block discarded – undo
315 315
 
316 316
 if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') != '-1') {
317 317
 	print '<tr class="oddeven">';
318
-	print '<td>' . img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnSupplierDeposit") . '</td>';
318
+	print '<td>'.img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans("UseAuxiliaryAccountOnSupplierDeposit").'</td>';
319 319
 	if (getDolGlobalInt('ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT')) {
320
-		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">';
320
+		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">';
321 321
 		print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning');
322 322
 		print '</a></td>';
323 323
 	} else {
324
-		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">';
324
+		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">';
325 325
 		print img_picto($langs->trans("Disabled"), 'switch_off');
326 326
 		print '</a></td>';
327 327
 	}
Please login to merge, or discard this patch.