@@ -961,7 +961,7 @@ |
||
961 | 961 | if (!empty($activefilter)) { // Use a predefined trusted filter (defined into setup by admin). |
962 | 962 | if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter) { |
963 | 963 | $filter = '('.$this->filter.')'; |
964 | - } elseif (((string) $activefilter == 'group') && $this->filtergroup ) { |
|
964 | + } elseif (((string) $activefilter == 'group') && $this->filtergroup) { |
|
965 | 965 | $filter = '('.$this->filtergroup.')'; |
966 | 966 | } elseif (((string) $activefilter == 'member') && $this->filter) { |
967 | 967 | $filter = '('.$this->filtermember.')'; |
@@ -98,7 +98,7 @@ |
||
98 | 98 | /** |
99 | 99 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
100 | 100 | */ |
101 | - public $fields=array( |
|
101 | + public $fields = array( |
|
102 | 102 | 'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10), |
103 | 103 | 'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'position'=>15, 'index'=>1), |
104 | 104 | 'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20), |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | |
356 | 356 | if (!empty($arraytoconsume) && !empty($arraytoproduce)) { |
357 | 357 | $pos = 0; |
358 | - $arrayofarrayname = array("arraytoconsume","arraytoproduce"); |
|
358 | + $arrayofarrayname = array("arraytoconsume", "arraytoproduce"); |
|
359 | 359 | foreach ($arrayofarrayname as $arrayname) { |
360 | 360 | foreach ($$arrayname as $value) { |
361 | 361 | $tmpproduct = new Product($this->db); |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | if (empty($value["qty"])) { |
367 | 367 | throw new RestException(500, "Field qty required in ".$arrayname); |
368 | 368 | } |
369 | - if ($value["qty"]!=0) { |
|
369 | + if ($value["qty"] != 0) { |
|
370 | 370 | $qtytoprocess = $value["qty"]; |
371 | 371 | if (isset($value["fk_warehouse"])) { // If there is a warehouse to set |
372 | 372 | if (!($value["fk_warehouse"] > 0)) { // If there is no warehouse set. |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | */ |
302 | 302 | /* END MODULEBUILDER TOPMENU */ |
303 | 303 | |
304 | - $this->menu[$r++]=array( |
|
304 | + $this->menu[$r++] = array( |
|
305 | 305 | // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
306 | 306 | 'fk_menu'=>'fk_mainmenu=ticket', |
307 | 307 | // This is a Left menu entry |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | // 0=Menu for internal users, 1=external users, 2=both |
323 | 323 | 'user'=>2, |
324 | 324 | ); |
325 | - $this->menu[$r++]=array( |
|
325 | + $this->menu[$r++] = array( |
|
326 | 326 | // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
327 | 327 | 'fk_menu'=>'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord', |
328 | 328 | // This is a Left menu entry |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | // 0=Menu for internal users, 1=external users, 2=both |
343 | 343 | 'user'=>2, |
344 | 344 | ); |
345 | - $this->menu[$r++]=array( |
|
345 | + $this->menu[$r++] = array( |
|
346 | 346 | // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
347 | 347 | 'fk_menu'=>'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord', |
348 | 348 | // This is a Left menu entry |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
65 | 65 | $search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
66 | 66 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
67 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
67 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
68 | 68 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
69 | 69 | $search_company = GETPOST("search_company", 'alpha'); |
70 | 70 | $search_paymenttype = GETPOST("search_paymenttype"); |
@@ -227,10 +227,10 @@ discard block |
||
227 | 227 | $sql .= natural_search('p.ref', $search_ref); |
228 | 228 | } |
229 | 229 | if ($search_date_start) { |
230 | - $sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'"; |
|
230 | + $sql .= " AND p.datep >= '".$db->idate($search_date_start)."'"; |
|
231 | 231 | } |
232 | 232 | if ($search_date_end) { |
233 | - $sql .= " AND p.datep <= '" . $db->idate($search_date_end) . "'"; |
|
233 | + $sql .= " AND p.datep <= '".$db->idate($search_date_end)."'"; |
|
234 | 234 | } |
235 | 235 | if ($search_account > 0) { |
236 | 236 | $sql .= " AND b.fk_account=".((int) $search_account); |
@@ -404,7 +404,7 @@ |
||
404 | 404 | include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; |
405 | 405 | // End add extra fields object |
406 | 406 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
407 | - $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'societe as s'; |
|
407 | + $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'societe as s'; |
|
408 | 408 | if (is_object($user) && empty($user->rights->societe->client->voir)) { |
409 | 409 | $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid'; |
410 | 410 | } |
@@ -107,7 +107,7 @@ |
||
107 | 107 | $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>'; |
108 | 108 | } else { |
109 | 109 | $disabled = 0; |
110 | - if (!$obj->fk_statut > 0 && ! $draftonly) { |
|
110 | + if (!$obj->fk_statut > 0 && !$draftonly) { |
|
111 | 111 | $disabled = 1; |
112 | 112 | $labeltoshow .= ' ('.$langs->trans("Draft").')'; |
113 | 113 | } |
@@ -136,7 +136,7 @@ |
||
136 | 136 | $dataseries = dol_sort_array($dataseries, 1, 'desc'); |
137 | 137 | |
138 | 138 | // Merge all entrie after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic). |
139 | -$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
139 | +$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
140 | 140 | $i = 0; |
141 | 141 | if (count($dataseries) > ($KEEPNFIRST + 1)) { |
142 | 142 | foreach ($dataseries as $key => $val) { |
@@ -116,10 +116,10 @@ discard block |
||
116 | 116 | |
117 | 117 | if (!$error) { |
118 | 118 | setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); |
119 | - $action = ''; // To avoid to execute next actions |
|
119 | + $action = ''; // To avoid to execute next actions |
|
120 | 120 | } else { |
121 | 121 | setEventMessages($langs->trans("Error"), null, 'errors'); |
122 | - $action = ''; // To avoid to execute next actions |
|
122 | + $action = ''; // To avoid to execute next actions |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | |
@@ -134,10 +134,10 @@ discard block |
||
134 | 134 | |
135 | 135 | if (!$error) { |
136 | 136 | setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); |
137 | - $action = ''; // To avoid to execute next actions |
|
137 | + $action = ''; // To avoid to execute next actions |
|
138 | 138 | } else { |
139 | 139 | setEventMessages($langs->trans("Error"), null, 'errors'); |
140 | - $action = ''; // To avoid to execute next actions |
|
140 | + $action = ''; // To avoid to execute next actions |
|
141 | 141 | } |
142 | 142 | } |
143 | 143 |