View GitHub Repository dolibarr

Schedule Inspection
Subscribe
Completed
Branch — develop (c8a997)
by
unknown
17:23
created
Status
Category
Toggle Patches
htdocs/commande/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -73,7 +73,7 @@
 
 block discarded – undo
73 73
74 74 
 $object = new Commande($db);
75 75
76 
-$usercancreate  =  $user->hasRight("commande", "creer");
76 
+$usercancreate = $user->hasRight("commande", "creer");
77 77 
 $permissiontoadd = $usercancreate;
78 78
79 79 
 // Security check
Please login to merge, or discard this patch.
htdocs/comm/mailing/class/advtargetemailing.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -125,7 +125,7 @@  discard block
 
 block discarded – undo
125 125 
 		$customerStatic->loadCacheOfProspStatus();
126 126 
 		if (!empty($customerStatic->cacheprospectstatus)) {
127 127 
 			foreach ($customerStatic->cacheprospectstatus as $dataProspectSt) {
128 
-				$this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label'];
128 
+				$this->type_statuscommprospect[$dataProspectSt['id']] = $dataProspectSt['label'];
129 129 
 			}
130 130 
 		} else {
131 131 
 			$this->type_statuscommprospect = array(
 
@@ -628,7 +628,7 @@  discard block
 
 block discarded – undo
628 628 
 						}
629 629 
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
630 630 
 						if ($arrayquery['options_'.$key] > 0) {
631 
-							$sqlwhere[]= " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
631 
+							$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
632 632 
 						}
633 633 
 					} else {
634 634 
 						if (is_array($arrayquery['options_'.$key])) {
Please login to merge, or discard this patch.
htdocs/accountancy/class/accountancycategory.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -627,7 +627,7 @@  discard block
 
 block discarded – undo
627 627 
 		if (is_array($cpt)) {
628 628 
 			$listofaccount = '';
629 629 
 			foreach ($cpt as $cptcursor) {
630 
-				if (! is_null($cptcursor)) {
630 
+				if (!is_null($cptcursor)) {
631 631 
 					if ($listofaccount) {
632 632 
 						$listofaccount .= ",";
633 633 
 					}
 
@@ -776,7 +776,7 @@  discard block
 
 block discarded – undo
776 776
777 777 
 		$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type, c.sens";
778 778 
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
779 
-		$sql .= " WHERE c.active = " . (int) $active;
779 
+		$sql .= " WHERE c.active = ".(int) $active;
780 780 
 		$sql .= " AND c.entity = ".$conf->entity;
781 781 
 		if ($categorytype >= 0) {
782 782 
 			$sql .= " AND c.category_type = 1";
Please login to merge, or discard this patch.
htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -179,7 +179,7 @@  discard block
 
 block discarded – undo
179 179 
 		$maxfilesizearray = getMaxFileSizeArray();
180 180 
 		$maxmin = $maxfilesizearray['maxmin'];
181 181 
 		if ($maxmin > 0) {
182 
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
182 
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
183 183 
 		}
184 184 
 		$texte .= ' <input type="file" name="uploadfile">';
185 185 
 		$texte .= '<input type="hidden" value="RECEPTION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 
@@ -273,7 +273,7 @@  discard block
 
 block discarded – undo
273 273 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
274 274 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
275 275 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
276 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
276 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
277 277 
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
278 278 
 				// Get extension (ods or odt)
279 279 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -282,11 +282,11 @@  discard block
 
 block discarded – undo
282 282 
 					if ($format == '1') {
283 283 
 						$format = '%Y%m%d%H%M%S';
284 284 
 					}
285 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
285 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
286 286 
 				} else {
287 
-					$filename = $newfiletmp . '.' . $newfileformat;
287 
+					$filename = $newfiletmp.'.'.$newfileformat;
288 288 
 				}
289 
-				$file = $dir . '/' . $filename;
289 
+				$file = $dir.'/'.$filename;
290 290 
 				//print "newdir=".$dir;
291 291 
 				//print "newfile=".$newfile;
292 292 
 				//print "file=".$file;
 
@@ -295,7 +295,7 @@  discard block
 
 block discarded – undo
295 295 
 				dol_mkdir($conf->reception->dir_temp);
296 296 
 				if (!is_writable($conf->reception->dir_temp)) {
297 297 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->reception->dir_temp);
298 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
298 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
299 299 
 					return -1;
300 300 
 				}
301 301
Please login to merge, or discard this patch.
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -186,7 +186,7 @@  discard block
 
 block discarded – undo
186 186 
 		$maxfilesizearray = getMaxFileSizeArray();
187 187 
 		$maxmin = $maxfilesizearray['maxmin'];
188 188 
 		if ($maxmin > 0) {
189 
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
189 
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
190 190 
 		}
191 191 
 		$texte .= ' <input type="file" name="uploadfile">';
192 192 
 		$texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 
@@ -280,7 +280,7 @@  discard block
 
 block discarded – undo
280 280 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
281 281 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
282 282 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
283 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
283 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
284 284 
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
285 285 
 				// Get extension (ods or odt)
286 286 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -289,11 +289,11 @@  discard block
 
 block discarded – undo
289 289 
 					if ($format == '1') {
290 290 
 						$format = '%Y%m%d%H%M%S';
291 291 
 					}
292 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
292 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
293 293 
 				} else {
294 
-					$filename = $newfiletmp . '.' . $newfileformat;
294 
+					$filename = $newfiletmp.'.'.$newfileformat;
295 295 
 				}
296 
-				$file = $dir . '/' . $filename;
296 
+				$file = $dir.'/'.$filename;
297 297 
 				//print "newdir=".$dir;
298 298 
 				//print "newfile=".$newfile;
299 299 
 				//print "file=".$file;
 
@@ -302,7 +302,7 @@  discard block
 
 block discarded – undo
302 302 
 				dol_mkdir($conf->expedition->dir_temp);
303 303 
 				if (!is_writable($conf->expedition->dir_temp)) {
304 304 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->expedition->dir_temp);
305 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
305 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
306 306 
 					return -1;
307 307 
 				}
308 308
Please login to merge, or discard this patch.
htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -180,7 +180,7 @@  discard block
 
 block discarded – undo
180 180 
 		$maxfilesizearray = getMaxFileSizeArray();
181 181 
 		$maxmin = $maxfilesizearray['maxmin'];
182 182 
 		if ($maxmin > 0) {
183 
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
183 
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
184 184 
 		}
185 185 
 		$texte .= ' <input type="file" name="uploadfile">';
186 186 
 		$texte .= '<input type="hidden" value="BOM_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 
@@ -276,7 +276,7 @@  discard block
 
 block discarded – undo
276 276 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
277 277 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
278 278 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
279 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
279 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
280 280 
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
281 281 
 				// Get extension (ods or odt)
282 282 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -285,11 +285,11 @@  discard block
 
 block discarded – undo
285 285 
 					if ($format == '1') {
286 286 
 						$format = '%Y%m%d%H%M%S';
287 287 
 					}
288 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
288 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
289 289 
 				} else {
290 
-					$filename = $newfiletmp . '.' . $newfileformat;
290 
+					$filename = $newfiletmp.'.'.$newfileformat;
291 291 
 				}
292 
-				$file = $dir . '/' . $filename;
292 
+				$file = $dir.'/'.$filename;
293 293 
 				//print "newdir=".$dir;
294 294 
 				//print "newfile=".$newfile;
295 295 
 				//print "file=".$file;
 
@@ -298,7 +298,7 @@  discard block
 
 block discarded – undo
298 298 
 				dol_mkdir($conf->bom->dir_temp);
299 299 
 				if (!is_writable($conf->bom->dir_temp)) {
300 300 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->bom->dir_temp);
301 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
301 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
302 302 
 					return -1;
303 303 
 				}
304 304
Please login to merge, or discard this patch.
htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -269,7 +269,7 @@  discard block
 
 block discarded – undo
269 269 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
270 270 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
271 271 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
272 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
272 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
273 273 
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
274 274 
 				// Get extension (ods or odt)
275 275 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -278,11 +278,11 @@  discard block
 
 block discarded – undo
278 278 
 					if ($format == '1') {
279 279 
 						$format = '%Y%m%d%H%M%S';
280 280 
 					}
281 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
281 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
282 282 
 				} else {
283 
-					$filename = $newfiletmp . '.' . $newfileformat;
283 
+					$filename = $newfiletmp.'.'.$newfileformat;
284 284 
 				}
285 
-				$file = $dir . '/' . $filename;
285 
+				$file = $dir.'/'.$filename;
286 286 
 				//print "newdir=".$dir;
287 287 
 				//print "newfile=".$newfile;
288 288 
 				//print "file=".$file;
 
@@ -291,7 +291,7 @@  discard block
 
 block discarded – undo
291 291 
 				dol_mkdir($conf->mrp->dir_temp);
292 292 
 				if (!is_writable($conf->mrp->dir_temp)) {
293 293 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->mrp->dir_temp);
294 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
294 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
295 295 
 					return -1;
296 296 
 				}
297 297
Please login to merge, or discard this patch.
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -187,7 +187,7 @@  discard block
 
 block discarded – undo
187 187 
 		$maxfilesizearray = getMaxFileSizeArray();
188 188 
 		$maxmin = $maxfilesizearray['maxmin'];
189 189 
 		if ($maxmin > 0) {
190 
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
190 
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
191 191 
 		}
192 192 
 		$texte .= ' <input type="file" name="uploadfile">';
193 193 
 		$texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 
@@ -282,7 +282,7 @@  discard block
 
 block discarded – undo
282 282 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
283 283 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
284 284 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
285 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
285 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
286 286
287 287 
 				// Get extension (ods or odt)
288 288 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -291,11 +291,11 @@  discard block
 
 block discarded – undo
291 291 
 					if ($format == '1') {
292 292 
 						$format = '%Y%m%d%H%M%S';
293 293 
 					}
294 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
294 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
295 295 
 				} else {
296 
-					$filename = $newfiletmp . '.' . $newfileformat;
296 
+					$filename = $newfiletmp.'.'.$newfileformat;
297 297 
 				}
298 
-				$file = $dir . '/' . $filename;
298 
+				$file = $dir.'/'.$filename;
299 299 
 				//print "newdir=".$dir;
300 300 
 				//print "newfile=".$newfile;
301 301 
 				//print "file=".$file;
 
@@ -304,7 +304,7 @@  discard block
 
 block discarded – undo
304 304 
 				dol_mkdir($conf->commande->dir_temp);
305 305 
 				if (!is_writable($conf->commande->dir_temp)) {
306 306 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->commande->dir_temp);
307 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
307 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
308 308 
 					return -1;
309 309 
 				}
310 310
Please login to merge, or discard this patch.
core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -264,7 +264,7 @@  discard block
 
 block discarded – undo
264 264 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
265 265 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
266 266 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
267 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
267 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
268 268 
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
269 269 
 				// Get extension (ods or odt)
270 270 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -273,11 +273,11 @@  discard block
 
 block discarded – undo
273 273 
 					if ($format == '1') {
274 274 
 						$format = '%Y%m%d%H%M%S';
275 275 
 					}
276 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
276 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
277 277 
 				} else {
278 
-					$filename = $newfiletmp . '.' . $newfileformat;
278 
+					$filename = $newfiletmp.'.'.$newfileformat;
279 279 
 				}
280 
-				$file = $dir . '/' . $filename;
280 
+				$file = $dir.'/'.$filename;
281 281 
 				//print "newdir=".$dir;
282 282 
 				//print "newfile=".$newfile;
283 283 
 				//print "file=".$file;
 
@@ -286,7 +286,7 @@  discard block
 
 block discarded – undo
286 286 
 				dol_mkdir($conf->fournisseur->commande->dir_temp);
287 287 
 				if (!is_writable($conf->fournisseur->commande->dir_temp)) {
288 288 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->fournisseur->commande->dir_temp);
289 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
289 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
290 290 
 					return -1;
291 291 
 				}
292 292
Please login to merge, or discard this patch.