Completed
Branch develop (e18bab)
by
unknown
13:56
created
htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 		$maxfilesizearray = getMaxFileSizeArray();
163 163
 		$maxmin = $maxfilesizearray['maxmin'];
164 164
 		if ($maxmin > 0) {
165
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
165
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
166 166
 		}
167 167
 		$texte .= ' <input type="file" name="uploadfile">';
168 168
 		$texte .= '<input type="hidden" value="TICKET_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
254 254
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
255 255
 
256
-				$newfiletmp = $objectref . '_' . $newfiletmp;
256
+				$newfiletmp = $objectref.'_'.$newfiletmp;
257 257
 
258 258
 				// Get extension (ods or odt)
259 259
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -262,11 +262,11 @@  discard block
 block discarded – undo
262 262
 					if ($format == '1') {
263 263
 						$format = '%Y%m%d%H%M%S';
264 264
 					}
265
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
265
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
266 266
 				} else {
267
-					$filename = $newfiletmp . '.' . $newfileformat;
267
+					$filename = $newfiletmp.'.'.$newfileformat;
268 268
 				}
269
-				$file = $dir . '/' . $filename;
269
+				$file = $dir.'/'.$filename;
270 270
 				//print "newdir=".$dir;
271 271
 				//print "newfile=".$newfile;
272 272
 				//print "file=".$file;
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 				dol_mkdir($conf->ticket->dir_temp);
276 276
 				if (!is_writable($conf->ticket->dir_temp)) {
277 277
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->ticket->dir_temp);
278
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
278
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
279 279
 					return -1;
280 280
 				}
281 281
 
Please login to merge, or discard this patch.
htdocs/core/modules/ticket/mod_ticket_universal.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 	 *  Dolibarr version of the loaded document
34 34
 	 *  @var string
35 35
 	 */
36
-	public $version = 'dolibarr';  // 'development', 'experimental', 'dolibarr'
36
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
37 37
 
38 38
 	/**
39 39
 	 *  @var string Error code (or message)
Please login to merge, or discard this patch.
htdocs/core/modules/modExpedition.class.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
 		$this->export_fields_array[$r] = array(
247 247
 			's.rowid'=>"IdCompany", 's.nom'=>'ThirdParty', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country',
248 248
 			'co.code'=>'CountryCode', 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5',
249
-			's.idprof6'=>'ProfId6', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_customer'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation",  'c.date_valid'=>"DateValidation",
249
+			's.idprof6'=>'ProfId6', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_customer'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation", 'c.date_valid'=>"DateValidation",
250 250
 			'c.date_delivery'=>"DateDeliveryPlanned", 'c.tracking_number'=>"TrackingNumber", 'c.height'=>"Height", 'c.width'=>"Width", 'c.size'=>"Depth",
251 251
 			'c.size_units'=>'SizeUnits', 'c.weight'=>"Weight", 'c.weight_units'=>"WeightUnits", 'c.fk_statut'=>'Status', 'c.note_public'=>"NotePublic",
252 252
 			'ed.rowid'=>'LineId', 'cd.description'=>'Description', 'ed.qty'=>"Qty", 'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
Please login to merge, or discard this patch.
htdocs/core/modules/facture/modules_facture.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 		$address = SwissQrBill\DataGroup\Element\CombinedAddress::create(
121 121
 			$this->emetteur->name,
122 122
 			$this->emetteur->address,
123
-			$this->emetteur->zip . " " . $this->emetteur->town,
123
+			$this->emetteur->zip." ".$this->emetteur->town,
124 124
 			$this->emetteur->country_code
125 125
 		);
126 126
 		if (!$address->isValid()) {
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			$address = SwissQrBill\DataGroup\Element\CombinedAddress::create(
176 176
 				$object->thirdparty->name,
177 177
 				$object->thirdparty->address,
178
-				$object->thirdparty->zip . " " . $object->thirdparty->town,
178
+				$object->thirdparty->zip." ".$object->thirdparty->town,
179 179
 				$object->thirdparty->country_code
180 180
 			);
181 181
 			if (!$address->isValid()) {
Please login to merge, or discard this patch.
htdocs/core/modules/export/export_excel2007.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -363,7 +363,7 @@
 block discarded – undo
363 363
 				if ($typefield == 'Text' || $typefield == 'TextAuto') {
364 364
 					// If $newvalue start with an equal sign we don't want it to be interpreted as a formula, so we add a '. Such transformation should be
365 365
 					// done by SetCellValueByColumnAndRow but it is not, so we do it ourself.
366
-					$newvalue = (dol_substr($newvalue, 0, 1) === '=' ? '\'' : '') . $newvalue;
366
+					$newvalue = (dol_substr($newvalue, 0, 1) === '=' ? '\'' : '').$newvalue;
367 367
 					$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
368 368
 					$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
369 369
 					$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
Please login to merge, or discard this patch.
htdocs/core/modules/modWebhook.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -259,17 +259,17 @@
 block discarded – undo
259 259
 		$r = 0;
260 260
 		// Add here entries to declare new permissions
261 261
 		/* BEGIN MODULEBUILDER PERMISSIONS */
262
-		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
262
+		$this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used)
263 263
 		$this->rights[$r][1] = 'Read Webhooks'; // Permission label
264 264
 		$this->rights[$r][4] = 'webhook_target';
265 265
 		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->read)
266 266
 		$r++;
267
-		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
267
+		$this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used)
268 268
 		$this->rights[$r][1] = 'Create/Update Webhooks'; // Permission label
269 269
 		$this->rights[$r][4] = 'webhook_target';
270 270
 		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->write)
271 271
 		$r++;
272
-		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
272
+		$this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used)
273 273
 		$this->rights[$r][1] = 'Delete Webhooks'; // Permission label
274 274
 		$this->rights[$r][4] = 'webhook_target';
275 275
 		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->delete)
Please login to merge, or discard this patch.
htdocs/core/modules/printing/printgcp.modules.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 				'type'=>'info',
117 117
 			);
118 118
 		} else {
119
-			$keyforprovider = '';	// @FIXME
119
+			$keyforprovider = ''; // @FIXME
120 120
 
121 121
 			$this->google_id = getDolGlobalString('OAUTH_GOOGLE_ID');
122 122
 			$this->google_secret = getDolGlobalString('OAUTH_GOOGLE_SECRET');
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 		global $conf;
259 259
 		$ret = array();
260 260
 
261
-		$keyforprovider = '';	// @FIXME
261
+		$keyforprovider = ''; // @FIXME
262 262
 
263 263
 		// Token storage
264 264
 		$storage = new DoliStorage($this->db, $conf, $keyforprovider);
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 			'contentType' => $contenttype,
401 401
 		);
402 402
 
403
-		$keyforprovider = '';	// @FIXME
403
+		$keyforprovider = ''; // @FIXME
404 404
 
405 405
 		// Dolibarr Token storage
406 406
 		$storage = new DoliStorage($this->db, $conf, $keyforprovider);
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
 		$error = 0;
453 453
 		$html = '';
454 454
 
455
-		$keyforprovider = '';	// @FIXME
455
+		$keyforprovider = ''; // @FIXME
456 456
 
457 457
 		// Token storage
458 458
 		$storage = new DoliStorage($this->db, $conf, $keyforprovider);
Please login to merge, or discard this patch.
htdocs/core/class/fiscalyear.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@
 block discarded – undo
244 244
 
245 245
 			$this->id = $obj->rowid;
246 246
 			$this->ref = $obj->rowid;
247
-			$this->date_start	= $this->db->jdate($obj->date_start);
247
+			$this->date_start = $this->db->jdate($obj->date_start);
248 248
 			$this->date_end = $this->db->jdate($obj->date_end);
249 249
 			$this->label = $obj->label;
250 250
 			$this->statut = $obj->status;
Please login to merge, or discard this patch.
htdocs/core/ajax/ajaxinvoiceline.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
 		$showempty = 0;
61 61
 	}
62 62
 
63
-	$return['value']	= $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1);
63
+	$return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1);
64 64
 	//$return['num'] = $form->num;
65 65
 	//$return['error']	= $form->error;
66 66
 
Please login to merge, or discard this patch.