Completed
Branch develop (983845)
by
unknown
18:30
created
htdocs/compta/stats/byratecountry.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 	$month_current = dol_print_date(dol_now(), '%m');
54 54
 	$year_start = $year;
55 55
 }
56
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver');	// We use timezone of server so report is same from everywhere
57
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
56
+$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
57
+$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
58 58
 
59 59
 // Quarter
60 60
 $q = '';
@@ -158,8 +158,8 @@  discard block
 block discarded – undo
158 158
 
159 159
 llxHeader('', $langs->trans("TurnoverReport"), '', '', 0, 0, '', '', $morequerystring);
160 160
 
161
-$exportlink="";
162
-$namelink="";
161
+$exportlink = "";
162
+$namelink = "";
163 163
 //print load_fiche_titre($langs->trans("VAT"),"");
164 164
 
165 165
 //$fsearch.='<br>';
Please login to merge, or discard this patch.
htdocs/admin/emailcollector_card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -493,7 +493,7 @@
 block discarded – undo
493 493
 
494 494
 					dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread);
495 495
 
496
-					$result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect);	// timeout seems ignored with ssl connect
496
+					$result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect); // timeout seems ignored with ssl connect
497 497
 					$result2 = imap_timeout(IMAP_READTIMEOUT, $timeoutread);
498 498
 					$result3 = imap_timeout(IMAP_WRITETIMEOUT, 5);
499 499
 					$result4 = imap_timeout(IMAP_CLOSETIMEOUT, 5);
Please login to merge, or discard this patch.
htdocs/core/modules/modSociete.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 		$this->rights[$r][0] = 130;
203 203
 		$this->rights[$r][1] = 'Modify thirdparty information payment';
204 204
 		$this->rights[$r][3] = 0;
205
-		$this->rights[$r][4] = 'thirdparty_paymentinformation_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
205
+		$this->rights[$r][4] = 'thirdparty_paymentinformation_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
206 206
 		$this->rights[$r][5] = 'write';
207 207
 
208 208
 		// 262 : Restrict access to sales representative
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
 		}
705 705
 		// Add profids as criteria to search duplicates
706 706
 		$langs->load("companies");
707
-		$i=1;
707
+		$i = 1;
708 708
 		while ($i <= 6) {
709 709
 			if ($i == 1) {
710 710
 				$this->import_updatekeys_array[$r]['s.siren'] = 'ProfId1'.(empty($mysoc->country_code) ? '' : $mysoc->country_code);
Please login to merge, or discard this patch.
htdocs/fourn/facture/note.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@
 block discarded – undo
177 177
 			$facavoir->fetch($facid);
178 178
 			$invoicecredits[] = $facavoir->getNomUrl(1);
179 179
 		}
180
-		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
180
+		print ' ('.$langs->transnoentities("InvoiceHasAvoir").implode(',', $invoicecredits).')';
181 181
 	}
182 182
 	/*
183 183
 	if ($facidnext > 0) {
Please login to merge, or discard this patch.
htdocs/fourn/product/list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,9 +29,9 @@
 block discarded – undo
29 29
 
30 30
 // Load Dolibarr environment
31 31
 require '../../main.inc.php';
32
-require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
33
-require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
34
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.class.php';
32
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
34
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
35 35
 
36 36
 
37 37
 // Load translation files required by the page
Please login to merge, or discard this patch.
template/core/modules/mymodule/doc/doc_generic_myobject_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="MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
283 283
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
284 284
 
285
-				$newfiletmp = $objectref . '_' . $newfiletmp;
285
+				$newfiletmp = $objectref.'_'.$newfiletmp;
286 286
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
287 287
 
288 288
 				// Get extension (ods or odt)
@@ -292,11 +292,11 @@  discard block
 block discarded – undo
292 292
 					if ($format == '1') {
293 293
 						$format = '%Y%m%d%H%M%S';
294 294
 					}
295
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
295
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
296 296
 				} else {
297
-					$filename = $newfiletmp . '.' . $newfileformat;
297
+					$filename = $newfiletmp.'.'.$newfileformat;
298 298
 				}
299
-				$file = $dir . '/' . $filename;
299
+				$file = $dir.'/'.$filename;
300 300
 				//print "newdir=".$dir;
301 301
 				//print "newfile=".$newfile;
302 302
 				//print "file=".$file;
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 				dol_mkdir($conf->mymodule->dir_temp);
306 306
 				if (!is_writable($conf->mymodule->dir_temp)) {
307 307
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->mymodule->dir_temp);
308
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
308
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
309 309
 					return -1;
310 310
 				}
311 311
 
Please login to merge, or discard this patch.
htdocs/product/stock/productlot_note.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
 
34 34
 // Get parameters
35 35
 $id = GETPOST('id', 'int');
36
-$ref        = GETPOST('ref', 'alpha');
36
+$ref = GETPOST('ref', 'alpha');
37 37
 $action = GETPOST('action', 'aZ09');
38 38
 
39 39
 // Initialize technical objects
Please login to merge, or discard this patch.
htdocs/fourn/paiement/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@
 block discarded – undo
126 126
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
127 127
 
128 128
 	// Amount
129
-	$morehtmlref .= '<br>'.$langs->trans('Amount').' : '. price($object->amount, '', $langs, 0, 0, -1, $conf->currency);
129
+	$morehtmlref .= '<br>'.$langs->trans('Amount').' : '.price($object->amount, '', $langs, 0, 0, -1, $conf->currency);
130 130
 
131 131
 	$allow_delete = 1;
132 132
 	// Bank account
Please login to merge, or discard this patch.
htdocs/supplier_proposal/list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 $search_date_endday = GETPOST('search_date_endday', 'int');
75 75
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
76 76
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
77
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
77
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
78 78
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
79 79
 $search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
80 80
 $search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 $search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
83 83
 $search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
84 84
 $search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
85
-$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
85
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver
86 86
 $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
87 87
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
88 88
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 			if ($searchCategoryProductOperator == 0) {
443 443
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
444 444
 			} else {
445
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
445
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
446 446
 			}
447 447
 		}
448 448
 	}
Please login to merge, or discard this patch.