Completed
Branch develop (a99e44)
by
unknown
15:19
created
htdocs/categories/traduction.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
 
57 57
 $type = $object->type;
58 58
 if (is_numeric($type)) {
59
-	$type = Categorie::$MAP_ID_TO_CODE[$type];   // For backward compatibility
59
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
60 60
 }
61 61
 
62 62
 
Please login to merge, or discard this patch.
htdocs/societe/price.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 
48 48
 // Get parameters
49 49
 $action 		= GETPOST('action', 'aZ09');
50
-$search_prod 	= GETPOST('search_prod', 'alpha');
50
+$search_prod = GETPOST('search_prod', 'alpha');
51 51
 $cancel 		= GETPOST('cancel', 'alpha');
52 52
 $search_label 	= GETPOST('search_label', 'alpha');
53 53
 $search_price 	= GETPOST('search_price');
Please login to merge, or discard this patch.
htdocs/societe/document.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -39,21 +39,21 @@
 block discarded – undo
39 39
 
40 40
 
41 41
 // Get parameters
42
-$action 	= GETPOST('action', 'aZ09');
43
-$confirm 	= GETPOST('confirm');
44
-$id 		= (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
45
-$ref 		= GETPOST('ref', 'alpha');
42
+$action = GETPOST('action', 'aZ09');
43
+$confirm = GETPOST('confirm');
44
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
45
+$ref = GETPOST('ref', 'alpha');
46 46
 
47
-$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
47
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
48 48
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
49 49
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
50
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
50
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
51 51
 
52 52
 if (empty($page) || $page == -1) {
53 53
 	$page = 0;
54 54
 }     // If $page is not defined, or '' or -1
55 55
 
56
-$offset 	= $limit * $page;
56
+$offset = $limit * $page;
57 57
 $pageprev 	= $page - 1;
58 58
 $pagenext 	= $page + 1;
59 59
 
Please login to merge, or discard this patch.
htdocs/resource/agenda.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
  */
96 96
 
97 97
 $parameters = array('id'=>$id);
98
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
98
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
99 99
 if ($reshook < 0) {
100 100
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
101 101
 }
Please login to merge, or discard this patch.
htdocs/compta/stats/cabyprodserv.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 	$month_current = dol_print_date(dol_now(), '%m');
99 99
 	$year_start = $year;
100 100
 }
101
-$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
102
-$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
101
+$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
102
+$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
103 103
 // Quarter
104 104
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
105 105
 	$q = GETPOST("q", "int");
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 $headerparams = array_merge($commonparams, $headerparams);
209 209
 $tableparams = array_merge($commonparams, $tableparams);
210 210
 
211
-$paramslink="";
211
+$paramslink = "";
212 212
 foreach ($allparams as $key => $value) {
213 213
 	$paramslink .= '&'.$key.'='.$value;
214 214
 }
@@ -231,8 +231,8 @@  discard block
 block discarded – undo
231 231
 	$modecompta = "RECETTES-DEPENSES";
232 232
 }
233 233
 
234
-$exportlink="";
235
-$namelink="";
234
+$exportlink = "";
235
+$namelink = "";
236 236
 
237 237
 // Show report header
238 238
 if ($modecompta == "CREANCES-DETTES") {
Please login to merge, or discard this patch.
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.