@@ -193,7 +193,7 @@ |
||
193 | 193 | $facavoir->fetch($facid); |
194 | 194 | $invoicecredits[] = $facavoir->getNomUrl(1); |
195 | 195 | } |
196 | - print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')'; |
|
196 | + print ' ('.$langs->transnoentities("InvoiceHasAvoir").(count($invoicecredits) ? ' ' : '').implode(',', $invoicecredits).')'; |
|
197 | 197 | } |
198 | 198 | /* |
199 | 199 | if ($facidnext > 0) { |
@@ -335,10 +335,10 @@ |
||
335 | 335 | if (in_array($element, ['context1', 'context2'])) { |
336 | 336 | $datacount = 0; |
337 | 337 | |
338 | - $parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1) . '?id=' . $id . '&module='.$element; |
|
338 | + $parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1).'?id='.$id.'&module='.$element; |
|
339 | 339 | $parameters['head'][$counter][1] = $langs->trans('MyModuleTab'); |
340 | 340 | if ($datacount > 0) { |
341 | - $parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">' . $datacount . '</span>'; |
|
341 | + $parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">'.$datacount.'</span>'; |
|
342 | 342 | } |
343 | 343 | $parameters['head'][$counter][2] = 'mymoduleemails'; |
344 | 344 | $counter++; |
@@ -270,7 +270,7 @@ |
||
270 | 270 | $reponsesadd = str_split($obj->reponses); |
271 | 271 | $lengthresponses = count($reponsesadd); |
272 | 272 | for ($cpt = $lengthresponses; $cpt > $cleinsertion; $cpt--) { |
273 | - $reponsesadd[$cpt] = $reponsesadd[$cpt-1]; |
|
273 | + $reponsesadd[$cpt] = $reponsesadd[$cpt - 1]; |
|
274 | 274 | } |
275 | 275 | $reponsesadd[$cleinsertion] = '0'; |
276 | 276 | $reponsesadd = implode($reponsesadd); |
@@ -436,8 +436,12 @@ discard block |
||
436 | 436 | $tmpuser->fetch($object->user_author_id); |
437 | 437 | |
438 | 438 | $creator_info = $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs); |
439 | - if ($tmpuser->email) $creator_info .= ', '.$langs->trans("EMail").': '.$tmpuser->email; |
|
440 | - if ($tmpuser->office_phone) $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone; |
|
439 | + if ($tmpuser->email) { |
|
440 | + $creator_info .= ', '.$langs->trans("EMail").': '.$tmpuser->email; |
|
441 | + } |
|
442 | + if ($tmpuser->office_phone) { |
|
443 | + $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone; |
|
444 | + } |
|
441 | 445 | |
442 | 446 | $notetoshow = dol_concatdesc($notetoshow, $creator_info); |
443 | 447 | } |
@@ -1519,7 +1523,9 @@ discard block |
||
1519 | 1523 | global $conf, $langs; |
1520 | 1524 | |
1521 | 1525 | $ltrdirection = 'L'; |
1522 | - if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R'; |
|
1526 | + if ($outputlangs->trans("DIRECTION") == 'rtl') { |
|
1527 | + $ltrdirection = 'R'; |
|
1528 | + } |
|
1523 | 1529 | |
1524 | 1530 | // Load traductions files required by page |
1525 | 1531 | $outputlangs->loadLangs(array("main", "propal", "companies", "bills")); |
@@ -300,7 +300,7 @@ |
||
300 | 300 | if (!empty($conf->mycompany->multidir_output[$object->entity])) { |
301 | 301 | $logodir = $conf->mycompany->multidir_output[$object->entity]; |
302 | 302 | } |
303 | - $pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
303 | + $pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
304 | 304 | $tplidx = $pdf->importPage(1); |
305 | 305 | } |
306 | 306 |
@@ -113,8 +113,10 @@ |
||
113 | 113 | $search_all = GETPOST("search_all", 'alpha'); |
114 | 114 | $search = array(); |
115 | 115 | foreach ($object->fields as $key => $val) { |
116 | - if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha'); |
|
117 | -} |
|
116 | + if (GETPOST('search_'.$key, 'alpha') !== '') { |
|
117 | + $search[$key] = GETPOST('search_'.$key, 'alpha'); |
|
118 | + } |
|
119 | + } |
|
118 | 120 | |
119 | 121 | // List of fields to search into when doing a "search in all" |
120 | 122 | $fieldstosearchall = array(); |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | $this->menu = array(); |
264 | 264 | $r = 0; |
265 | 265 | // Add here entries to declare new menus |
266 | - $this->menu[$r++]=array( |
|
266 | + $this->menu[$r++] = array( |
|
267 | 267 | // '' 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 |
268 | 268 | 'fk_menu'=>'fk_mainmenu=mrp', |
269 | 269 | // This is a Left menu entry |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | 'url'=>'', |
276 | 276 | // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
277 | 277 | 'langs'=>'mrp', |
278 | - 'position'=>1100+$r, |
|
278 | + 'position'=>1100 + $r, |
|
279 | 279 | // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
280 | 280 | 'enabled'=>'$conf->workstation->enabled', |
281 | 281 | // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | // 0=Menu for internal users, 1=external users, 2=both |
285 | 285 | 'user'=>2, |
286 | 286 | ); |
287 | - $this->menu[$r++]=array( |
|
287 | + $this->menu[$r++] = array( |
|
288 | 288 | // '' 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 |
289 | 289 | 'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation', |
290 | 290 | // This is a Left menu entry |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | 'url'=>'/workstation/workstation_card.php?action=create', |
296 | 296 | // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
297 | 297 | 'langs'=>'mrp', |
298 | - 'position'=>1100+$r, |
|
298 | + 'position'=>1100 + $r, |
|
299 | 299 | // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
300 | 300 | 'enabled'=>'$conf->workstation->enabled', |
301 | 301 | // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | // 0=Menu for internal users, 1=external users, 2=both |
305 | 305 | 'user'=>2 |
306 | 306 | ); |
307 | - $this->menu[$r++]=array( |
|
307 | + $this->menu[$r++] = array( |
|
308 | 308 | // '' 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 |
309 | 309 | 'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation', |
310 | 310 | // This is a Left menu entry |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | 'url'=>'/workstation/workstation_list.php', |
316 | 316 | // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
317 | 317 | 'langs'=>'mrp', |
318 | - 'position'=>1101+$r, |
|
318 | + 'position'=>1101 + $r, |
|
319 | 319 | // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
320 | 320 | 'enabled'=>'$conf->workstation->enabled', |
321 | 321 | // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules |
@@ -80,10 +80,10 @@ discard block |
||
80 | 80 | |
81 | 81 | |
82 | 82 | // Load variable for pagination |
83 | -$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; |
|
83 | +$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; |
|
84 | 84 | $sortfield = GETPOST('sortfield', 'aZ09comma'); |
85 | 85 | $sortorder = GETPOST('sortorder', 'aZ09comma'); |
86 | -$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); |
|
86 | +$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); |
|
87 | 87 | if (empty($page) || $page == -1) { |
88 | 88 | $page = 0; |
89 | 89 | } // If $page is not defined, or '' or -1 |
@@ -98,34 +98,34 @@ discard block |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | |
101 | -$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); |
|
101 | +$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); |
|
102 | 102 | |
103 | 103 | $search_ref = GETPOST('search_ref', 'alpha'); |
104 | 104 | $search_user = GETPOST('search_user', 'int'); |
105 | -$search_amount_ht = GETPOST('search_amount_ht', 'alpha'); |
|
105 | +$search_amount_ht = GETPOST('search_amount_ht', 'alpha'); |
|
106 | 106 | $search_amount_vat = GETPOST('search_amount_vat', 'alpha'); |
107 | 107 | $search_amount_ttc = GETPOST('search_amount_ttc', 'alpha'); |
108 | -$search_status = (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma')); |
|
108 | +$search_status = (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma')); |
|
109 | 109 | |
110 | -$search_date_startday = GETPOST('search_date_startday', 'int'); |
|
110 | +$search_date_startday = GETPOST('search_date_startday', 'int'); |
|
111 | 111 | $search_date_startmonth = GETPOST('search_date_startmonth', 'int'); |
112 | -$search_date_startyear = GETPOST('search_date_startyear', 'int'); |
|
112 | +$search_date_startyear = GETPOST('search_date_startyear', 'int'); |
|
113 | 113 | $search_date_startendday = GETPOST('search_date_startendday', 'int'); |
114 | -$search_date_startendmonth = GETPOST('search_date_startendmonth', 'int'); |
|
115 | -$search_date_startendyear = GETPOST('search_date_startendyear', 'int'); |
|
116 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
114 | +$search_date_startendmonth = GETPOST('search_date_startendmonth', 'int'); |
|
115 | +$search_date_startendyear = GETPOST('search_date_startendyear', 'int'); |
|
116 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
117 | 117 | $search_date_startend = dol_mktime(23, 59, 59, $search_date_startendmonth, $search_date_startendday, $search_date_startendyear); |
118 | 118 | |
119 | 119 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
120 | 120 | $search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
121 | 121 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
122 | -$search_date_endendday = GETPOST('search_date_endendday', 'int'); |
|
122 | +$search_date_endendday = GETPOST('search_date_endendday', 'int'); |
|
123 | 123 | $search_date_endendmonth = GETPOST('search_date_endendmonth', 'int'); |
124 | 124 | $search_date_endendyear = GETPOST('search_date_endendyear', 'int'); |
125 | -$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver |
|
126 | -$search_date_endend = dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear); |
|
125 | +$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver |
|
126 | +$search_date_endend = dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear); |
|
127 | 127 | |
128 | -$optioncss = GETPOST('optioncss', 'alpha'); |
|
128 | +$optioncss = GETPOST('optioncss', 'alpha'); |
|
129 | 129 | |
130 | 130 | if ($search_status == '') { |
131 | 131 | $search_status = -1; |
@@ -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), |
@@ -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 |