Completed
Branch develop (8b51aa)
by
unknown
16:02
created
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/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/api_products.class.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 
190 190
 		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
191 191
 		$sql .= " FROM ".$this->db->prefix()."product as t";
192
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
192
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
193 193
 		if ($category > 0) {
194 194
 			$sql .= ", ".$this->db->prefix()."categorie_product as c";
195 195
 		}
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 		}
230 230
 
231 231
 		//this query will return total products with the filters given
232
-		$sqlTotals =  str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
232
+		$sqlTotals = str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
233 233
 
234 234
 		$sql .= $this->db->order($sortfield, $sortorder);
235 235
 		if ($limit) {
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 			$obj_ret['pagination'] = array(
293 293
 				'total' => (int) $total,
294 294
 				'page' => $page, //count starts from 0
295
-				'page_count' => ceil((int) $total/$limit),
295
+				'page_count' => ceil((int) $total / $limit),
296 296
 				'limit' => $limit
297 297
 			);
298 298
 		}
@@ -1980,7 +1980,7 @@  discard block
 block discarded – undo
1980 1980
 		unset($object->fk_bank);
1981 1981
 		unset($object->fk_account);
1982 1982
 
1983
-		unset($object->supplierprices);	// Mut use another API to get them
1983
+		unset($object->supplierprices); // Mut use another API to get them
1984 1984
 
1985 1985
 		if (empty(DolibarrApiAccess::$user->rights->stock->lire)) {
1986 1986
 			unset($object->stock_reel);
Please login to merge, or discard this patch.
htdocs/product/traduction.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -134,15 +134,15 @@  discard block
 block discarded – undo
134 134
 
135 135
 		foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet
136 136
 			if ($key == $current_lang) {
137
-				$object->label = GETPOST("libelle-" . $key);
138
-				$object->description = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
139
-				$object->other = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
137
+				$object->label = GETPOST("libelle-".$key);
138
+				$object->description = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
139
+				$object->other = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
140 140
 
141 141
 				$object->update($object->id, $user);
142 142
 			} else {
143
-				$object->multilangs[$key]["label"] = GETPOST("libelle-" . $key);
144
-				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
145
-				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
143
+				$object->multilangs[$key]["label"] = GETPOST("libelle-".$key);
144
+				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
145
+				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
146 146
 			}
147 147
 		}
148 148
 
@@ -235,9 +235,9 @@  discard block
 block discarded – undo
235 235
 if (empty($reshook)) {
236 236
 	if ($action == '') {
237 237
 		if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
238
-			print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=add&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Add") . '</a>';
238
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Add").'</a>';
239 239
 			if ($cnt_trans > 0) {
240
-				print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=edit&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Modify") . '</a>';
240
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
241 241
 			}
242 242
 		}
243 243
 	}
Please login to merge, or discard this patch.
htdocs/product/dynamic_price/class/price_parser.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
 		));
156 156
 
157 157
 		// Retrieve all extrafields if not already not know (should not happen)
158
-		if (! is_object($extrafields)) {
158
+		if (!is_object($extrafields)) {
159 159
 			$extrafields = new ExtraFields($this->db);
160 160
 			$extrafields->fetch_name_optionals_label($product->table_element);
161 161
 		}
Please login to merge, or discard this patch.
htdocs/product/stats/facture_fournisseur.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -246,7 +246,7 @@
 block discarded – undo
246 246
 						$supplierinvoicestatic->id = $objp->facid;
247 247
 						$supplierinvoicestatic->ref = $objp->ref;
248 248
 						$supplierinvoicestatic->ref_supplier = $objp->ref_supplier;
249
-						$supplierinvoicestatic->libelle = $objp->label;	// deprecated
249
+						$supplierinvoicestatic->libelle = $objp->label; // deprecated
250 250
 						$supplierinvoicestatic->label = $objp->label;
251 251
 						$supplierinvoicestatic->total_ht = $objp->total_ht;
252 252
 						$supplierinvoicestatic->total_ttc = $objp->total_ttc;
Please login to merge, or discard this patch.