Completed
Branch develop (f5af02)
by
unknown
17:35
created
htdocs/comm/propal/agenda.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -238,7 +238,7 @@
 block discarded – undo
238 238
 		$cachekey = 'count_events_propal_'.$object->id;
239 239
 		$nbEvent = dol_getcache($cachekey);
240 240
 
241
-		print_barre_liste($langs->trans("ActionsOnPropal").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
241
+		print_barre_liste($langs->trans("ActionsOnPropal").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
242 242
 		//print_barre_liste($langs->trans("ActionsOnPropal"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
243 243
 
244 244
 		// List of all actions
Please login to merge, or discard this patch.
htdocs/comm/action/class/actioncomm.class.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -377,9 +377,9 @@  discard block
 block discarded – undo
377 377
 	/**
378 378
 	 * Properties to manage the recurring events
379 379
 	 */
380
-	public $recurid;		/* A string YYYYMMDDHHMMSS shared by allevent of same serie */
381
-	public $recurrule;		/* Rule of recurring */
382
-	public $recurdateend;	/* Repeat until this date */
380
+	public $recurid; /* A string YYYYMMDDHHMMSS shared by allevent of same serie */
381
+	public $recurrule; /* Rule of recurring */
382
+	public $recurdateend; /* Repeat until this date */
383 383
 
384 384
 	public $calling_duration;
385 385
 
@@ -559,8 +559,8 @@  discard block
 block discarded – undo
559 559
 		$sql .= "ip";
560 560
 		$sql .= ") VALUES (";
561 561
 		$sql .= "'(PROV)', ";
562
-		$sql .= "'".$this->db->idate($now)."', ";	// date creation
563
-		$sql .= "'".$this->db->idate($this->datep)."', ";	// date start event
562
+		$sql .= "'".$this->db->idate($now)."', "; // date creation
563
+		$sql .= "'".$this->db->idate($this->datep)."', "; // date start event
564 564
 		$sql .= (strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : "null").", ";
565 565
 		$sql .= ((isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '') ? "'".$this->db->escape($this->durationp)."'" : "null").", "; // deprecated
566 566
 		$sql .= (isset($this->type_id) ? $this->type_id : "null").",";
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
 						$resql = $this->db->query($sql);
634 634
 						if (!$resql) {
635 635
 							$error++;
636
-							dol_syslog('Error to process userassigned: ' . $this->db->lasterror(), LOG_ERR);
636
+							dol_syslog('Error to process userassigned: '.$this->db->lasterror(), LOG_ERR);
637 637
 							$this->errors[] = $this->db->lasterror();
638 638
 						} else {
639 639
 							$already_inserted[$val['id']] = true;
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
 						$resql = $this->db->query($sql);
659 659
 						if (!$resql) {
660 660
 							$error++;
661
-							dol_syslog('Error to process socpeopleassigned: ' . $this->db->lasterror(), LOG_ERR);
661
+							dol_syslog('Error to process socpeopleassigned: '.$this->db->lasterror(), LOG_ERR);
662 662
 							$this->errors[] = $this->db->lasterror();
663 663
 						} else {
664 664
 							$already_inserted[$id] = true;
@@ -893,14 +893,14 @@  discard block
 block discarded – undo
893 893
 				$this->status = $obj->status;
894 894
 
895 895
 				//email information
896
-				$this->email_msgid=$obj->email_msgid;
897
-				$this->email_from=$obj->email_from;
898
-				$this->email_sender=$obj->email_sender;
899
-				$this->email_to=$obj->email_to;
900
-				$this->email_tocc=$obj->email_tocc;
901
-				$this->email_tobcc=$obj->email_tobcc;
902
-				$this->email_subject=$obj->email_subject;
903
-				$this->errors_to=$obj->errors_to;
896
+				$this->email_msgid = $obj->email_msgid;
897
+				$this->email_from = $obj->email_from;
898
+				$this->email_sender = $obj->email_sender;
899
+				$this->email_to = $obj->email_to;
900
+				$this->email_tocc = $obj->email_tocc;
901
+				$this->email_tobcc = $obj->email_tobcc;
902
+				$this->email_subject = $obj->email_subject;
903
+				$this->errors_to = $obj->errors_to;
904 904
 
905 905
 				$this->fetch_optionals();
906 906
 
@@ -1182,7 +1182,7 @@  discard block
 block discarded – undo
1182 1182
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm";
1183 1183
 		$sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
1184 1184
 		$sql .= ", fk_action = ".(int) $this->type_id;
1185
-		$sql .= ", code = " . ($code ? "'".$this->db->escape($code)."'" : "null");
1185
+		$sql .= ", code = ".($code ? "'".$this->db->escape($code)."'" : "null");
1186 1186
 		$sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null");
1187 1187
 		$sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null');
1188 1188
 		$sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
@@ -1335,8 +1335,8 @@  discard block
 block discarded – undo
1335 1335
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
1336 1336
 		// Fields from hook
1337 1337
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
1338
-		$reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters);    // Note that $action and $object may have been modified by hook
1339
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
1338
+		$reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters); // Note that $action and $object may have been modified by hook
1339
+		if (!empty($hookmanager->resPrint)) $sql .= $hookmanager->resPrint;
1340 1340
 		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
1341 1341
 		if (!empty($socid)) {
1342 1342
 			$sql .= " AND a.fk_soc = ".((int) $socid);
@@ -1357,8 +1357,8 @@  discard block
 block discarded – undo
1357 1357
 		}
1358 1358
 		// Fields where hook
1359 1359
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
1360
-		$reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters);    // Note that $action and $object may have been modified by hook
1361
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
1360
+		$reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters); // Note that $action and $object may have been modified by hook
1361
+		if (!empty($hookmanager->resPrint)) $sql .= $hookmanager->resPrint;
1362 1362
 		if ($sortorder && $sortfield) {
1363 1363
 			$sql .= $this->db->order($sortfield, $sortorder);
1364 1364
 		}
@@ -1635,9 +1635,9 @@  discard block
 block discarded – undo
1635 1635
 		}
1636 1636
 		// show categories for this record only in ajax to not overload lists
1637 1637
 		if (isModEnabled('categorie') && !$nofetch) {
1638
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
1638
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
1639 1639
 			$form = new Form($this->db);
1640
-			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_ACTIONCOMM, 1);
1640
+			$datas['categories'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_ACTIONCOMM, 1);
1641 1641
 		}
1642 1642
 
1643 1643
 		return $datas;
@@ -1729,8 +1729,8 @@  discard block
 block discarded – undo
1729 1729
 		}
1730 1730
 		if (!empty($this->note_private)) {
1731 1731
 			$tooltip .= '<br><br><b>'.$langs->trans('Description').':</b><br>';
1732
-			$texttoshow = dolGetFirstLineOfText($this->note_private, 8);	// Try to limit length of content
1733
-			$tooltip .= '<div class="tenlinesmax">';						// Restrict height of content into the tooltip
1732
+			$texttoshow = dolGetFirstLineOfText($this->note_private, 8); // Try to limit length of content
1733
+			$tooltip .= '<div class="tenlinesmax">'; // Restrict height of content into the tooltip
1734 1734
 			$tooltip .= (dol_textishtml($texttoshow) ? str_replace(array("\r", "\n"), "", $texttoshow) : str_replace(array("\r", "\n"), '<br>', $texttoshow));
1735 1735
 			$tooltip .= '</div>';
1736 1736
 		}
@@ -1755,7 +1755,7 @@  discard block
 block discarded – undo
1755 1755
 				$label = $langs->trans("ShowAction");
1756 1756
 				$linkclose .= ' alt="'.dol_escape_htmltag($tooltip, 1).'"';
1757 1757
 			}
1758
-			$linkclose .= ($tooltip ? ' title="'.dol_escape_htmltag($tooltip, 1).'"' :  ' title="tocomplete"');
1758
+			$linkclose .= ($tooltip ? ' title="'.dol_escape_htmltag($tooltip, 1).'"' : ' title="tocomplete"');
1759 1759
 			$linkclose .= $dataparams.' class="'.$classname.' '.$classfortooltip.'"';
1760 1760
 		} else {
1761 1761
 			$linkclose .= ' class="'.$classname.'"';
@@ -2372,7 +2372,7 @@  discard block
 block discarded – undo
2372 2372
 	 */
2373 2373
 	public static function replaceProduct(DoliDB $dbs, $origin_id, $dest_id)
2374 2374
 	{
2375
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'actioncomm SET fk_element = ' . ((int) $dest_id) . ' WHERE elementtype="product" AND fk_element = '.((int) $origin_id);
2375
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'actioncomm SET fk_element = '.((int) $dest_id).' WHERE elementtype="product" AND fk_element = '.((int) $origin_id);
2376 2376
 		// using $dbs, not $this->db because function is static
2377 2377
 		if (!$dbs->query($sql)) {
2378 2378
 			//$this->errors = $dbs->lasterror();
Please login to merge, or discard this patch.
htdocs/debugbar/class/DebugBar.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -75,10 +75,10 @@
 block discarded – undo
75 75
 	public function getRenderer()
76 76
 	{
77 77
 		$renderer = parent::getJavascriptRenderer(DOL_URL_ROOT.'/includes/maximebf/debugbar/src/DebugBar/Resources');
78
-		$renderer->disableVendor('jquery');			// We already have jquery loaded globally by the main.inc.php
79
-		$renderer->disableVendor('fontawesome');	// We already have fontawesome loaded globally by the main.inc.php
80
-		$renderer->disableVendor('highlightjs');	// We don't need this
81
-		$renderer->setEnableJqueryNoConflict(false);	// We don't need no conflict
78
+		$renderer->disableVendor('jquery'); // We already have jquery loaded globally by the main.inc.php
79
+		$renderer->disableVendor('fontawesome'); // We already have fontawesome loaded globally by the main.inc.php
80
+		$renderer->disableVendor('highlightjs'); // We don't need this
81
+		$renderer->setEnableJqueryNoConflict(false); // We don't need no conflict
82 82
 
83 83
 		return $renderer;
84 84
 	}
Please login to merge, or discard this patch.
htdocs/contact/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
 }
95 95
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
96 96
 
97
-$permissiontoadd = $user->hasRight('societe', 'contact', 'creer');	// Used by the include of actions_dellink.inc.php
97
+$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php
98 98
 
99 99
 
100 100
 /*
Please login to merge, or discard this patch.
htdocs/contact/perso.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
197 197
 		$maxfilesizearray = getMaxFileSizeArray();
198 198
 		$maxmin = $maxfilesizearray['maxmin'];
199 199
 		if ($maxmin > 0) {
200
-			print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
200
+			print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
201 201
 		}
202 202
 		print '<input type="file" class="flat" name="photo" id="photoinput">';
203 203
 		print '</td></tr>';
Please login to merge, or discard this patch.
htdocs/product/composition/card.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -101,9 +101,9 @@  discard block
 block discarded – undo
101 101
 		$maxprod = GETPOST("max_prod", 'int');
102 102
 
103 103
 		for ($i = 0; $i < $maxprod; $i++) {
104
-			$qty = price2num(GETPOST("prod_qty_" . $i, 'alpha'), 'MS');
104
+			$qty = price2num(GETPOST("prod_qty_".$i, 'alpha'), 'MS');
105 105
 			if ($qty > 0) {
106
-				if ($object->add_sousproduit($id, GETPOST("prod_id_" . $i, 'int'), $qty, GETPOST("prod_incdec_" . $i, 'int')) > 0) {
106
+				if ($object->add_sousproduit($id, GETPOST("prod_id_".$i, 'int'), $qty, GETPOST("prod_incdec_".$i, 'int')) > 0) {
107 107
 					//var_dump($i.' '.GETPOST("prod_id_".$i, 'int'), $qty, GETPOST("prod_incdec_".$i, 'int'));
108 108
 					$action = 'edit';
109 109
 				} else {
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 					}
117 117
 				}
118 118
 			} else {
119
-				if ($object->del_sousproduit($id, GETPOST("prod_id_" . $i, 'int')) > 0) {
119
+				if ($object->del_sousproduit($id, GETPOST("prod_id_".$i, 'int')) > 0) {
120 120
 					$action = 'edit';
121 121
 				} else {
122 122
 					$error++;
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 		}
128 128
 
129 129
 		if (!$error) {
130
-			header("Location: " . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
130
+			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
131 131
 			exit;
132 132
 		}
133 133
 	} elseif ($action === 'save_composed_product') {
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 			setEventMessages('RecordSaved', null);
144 144
 		}
145 145
 		$action = '';
146
-		header("Location: " . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
146
+		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
147 147
 		exit;
148 148
 	}
149 149
 }
@@ -313,9 +313,9 @@  discard block
 block discarded – undo
313 313
 		$tmpid = $id;
314 314
 		if (!empty($conf->use_javascript_ajax)) {
315 315
 			$nboflines = $prods_arbo;
316
-			$table_element_line='product_association';
316
+			$table_element_line = 'product_association';
317 317
 
318
-			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
318
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
319 319
 		}
320 320
 		$id = $tmpid;
321 321
 
@@ -399,8 +399,8 @@  discard block
 block discarded – undo
399 399
 
400 400
 		$totalsell = 0;
401 401
 		$total = 0;
402
-		if (count($prods_arbo))	{
403
-			foreach ($prods_arbo as $value)	{
402
+		if (count($prods_arbo)) {
403
+			foreach ($prods_arbo as $value) {
404 404
 				$productstatic->fetch($value['id']);
405 405
 
406 406
 				if ($value['level'] <= 1) {
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 
438 438
 					$unitline = price2num(($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MU');
439 439
 					$totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MT');
440
-					$total +=  $totalline;
440
+					$total += $totalline;
441 441
 
442 442
 					print '<td class="right nowraponall">';
443 443
 					print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : '').'<span class="amount">'.price($unitline, '', '', 0, 0, -1, $conf->currency)).'</span>';
Please login to merge, or discard this patch.
htdocs/product/inventory/class/inventory.class.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -61,10 +61,10 @@  discard block
 block discarded – undo
61 61
 	 */
62 62
 	public $picto = 'inventory';
63 63
 
64
-	const STATUS_DRAFT     = 0;		// Draft
65
-	const STATUS_VALIDATED = 1;		// Inventory is in process
66
-	const STATUS_RECORDED  = 2;		// Inventory is finisged. Stock movement has been recorded.
67
-	const STATUS_CANCELED  = 9;		// Canceled
64
+	const STATUS_DRAFT     = 0; // Draft
65
+	const STATUS_VALIDATED = 1; // Inventory is in process
66
+	const STATUS_RECORDED  = 2; // Inventory is finisged. Stock movement has been recorded.
67
+	const STATUS_CANCELED  = 9; // Canceled
68 68
 
69 69
 	/**
70 70
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 		'fk_warehouse'       => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'InventoryForASpecificWarehouse', 'picto'=>'stock', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax150'),
105 105
 		'fk_product'         => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'InventoryForASpecificProduct', 'picto'=>'product', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax150'),
106 106
 		'categories_product' => array('type'=>'chkbxlst:categorie:label:rowid::type=0:0:', 'label'=>'OrProductsWithCategories', 'visible'=>3, 'enabled'=>1, 'position'=>33, 'help'=>'', 'picto'=>'category', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx'),
107
-		'date_inventory'     => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35, 'csslist'=>'nowraponall'),	// This date is not used so disabled by default.
107
+		'date_inventory'     => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35, 'csslist'=>'nowraponall'), // This date is not used so disabled by default.
108 108
 		'date_creation'      => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500, 'csslist'=>'nowraponall'),
109 109
 		'tms'                => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501, 'csslist'=>'nowraponall'),
110 110
 		'date_validation'    => array('type'=>'datetime', 'label'=>'DateValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>502, 'csslist'=>'nowraponall'),
@@ -763,10 +763,10 @@  discard block
 block discarded – undo
763 763
 	public function getChildWarehouse($id, &$TChildWarehouse)
764 764
 	{
765 765
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'entrepot';
766
-		$sql.= ' WHERE fk_parent='.(int) $id;
767
-		$sql.= ' ORDER BY rowid';
766
+		$sql .= ' WHERE fk_parent='.(int) $id;
767
+		$sql .= ' ORDER BY rowid';
768 768
 		$resql = $this->db->query($sql);
769
-		if ($resql && $this->db->num_rows($resql)>0) {
769
+		if ($resql && $this->db->num_rows($resql) > 0) {
770 770
 			while ($obj = $this->db->fetch_object($resql)) {
771 771
 				$TChildWarehouse[] = $obj->rowid;
772 772
 				$this->getChildWarehouse($obj->rowid, $TChildWarehouse);
Please login to merge, or discard this patch.
htdocs/product/inventory/list.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 // Default sort order (if not yet defined by previous GETPOST)
75 75
 if (!$sortfield) {
76
-	reset($object->fields);					// Reset is required to avoid key() to return null.
76
+	reset($object->fields); // Reset is required to avoid key() to return null.
77 77
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
78 78
 }
79 79
 if (!$sortorder) {
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 			if ($searchCategoryProductOperator == 0) {
286 286
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE p.rowid = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
287 287
 			} else {
288
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
288
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
289 289
 			}
290 290
 		}
291 291
 	}
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 // Output page
375 375
 // --------------------------------------------------------------------
376 376
 
377
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
377
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
378 378
 
379 379
 $arrayofselected = is_array($toselect) ? $toselect : array();
380 380
 
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 	$categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
485 485
 	$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300', 0, 0, '', 'category', $tmptitle);
486 486
 	$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_product_operator" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/>';
487
-	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories') . ' : ' . $tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_pro'); // Tooltip on click
487
+	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories').' : '.$tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_pro'); // Tooltip on click
488 488
 	$moreforfilter .= '</div>';
489 489
 }
490 490
 
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
597 597
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
598 598
 	}
599
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
599
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
600 600
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
601 601
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
602 602
 		$totalarray['nbfield']++;
Please login to merge, or discard this patch.
htdocs/product/class/html.formproduct.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 		}
320 320
 
321 321
 		$out .= '<select '.($multiselect ? 'multiple ' : '').'class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled' : '');
322
-		$out .= ' id="'.$htmlname.'" name="'.($htmlname.($multiselect?'[]':'').($disabled ? '_disabled' : '')).'"';
322
+		$out .= ' id="'.$htmlname.'" name="'.($htmlname.($multiselect ? '[]' : '').($disabled ? '_disabled' : '')).'"';
323 323
 		//$out .= ' placeholder="todo"'; 	// placeholder for select2 must be added by setting the id+placeholder js param when calling select2
324 324
 		$out .= '>';
325 325
 		if ($empty) {
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 
414 414
 		dol_syslog(get_class($this)."::selectWorkstations $selected, $htmlname, $empty, $disabled, $fk_product, $empty_label, $forcecombo, $morecss", LOG_DEBUG);
415 415
 
416
-		$filterstatus='';
416
+		$filterstatus = '';
417 417
 		$out = '';
418 418
 		if (!empty($fk_product) && $fk_product > 0) {
419 419
 			$this->cache_workstations = array();
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
 		}
821 821
 
822 822
 		if (empty($hookmanager)) {
823
-			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
823
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
824 824
 			$hookmanager = new HookManager($this->db);
825 825
 		}
826 826
 		$hookmanager->initHooks(array('productdao'));
@@ -839,9 +839,9 @@  discard block
 block discarded – undo
839 839
 			if (array_key_exists($productId, $this->cache_lot)) {
840 840
 				foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
841 841
 					if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
842
-						$label = $arraytypes['entrepot_label'] . ' - ';
842
+						$label = $arraytypes['entrepot_label'].' - ';
843 843
 						$label .= $arraytypes['batch'];
844
-						$out .= '<option data-warehouse="'.dol_escape_htmltag($label).'" value="' . $arraytypes['batch'] . '">(' . $langs->trans('Stock Total') . ': ' . $arraytypes['qty'] . ')</option>';
844
+						$out .= '<option data-warehouse="'.dol_escape_htmltag($label).'" value="'.$arraytypes['batch'].'">('.$langs->trans('Stock Total').': '.$arraytypes['qty'].')</option>';
845 845
 					}
846 846
 				}
847 847
 			}
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
 			$batch_count = 0;
886 886
 			global $hookmanager;
887 887
 			if (empty($hookmanager)) {
888
-				include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
888
+				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
889 889
 				$hookmanager = new HookManager($this->db);
890 890
 			}
891 891
 			$hookmanager->initHooks(array('productdao'));
Please login to merge, or discard this patch.