@@ -129,11 +129,11 @@ |
||
| 129 | 129 | unset($object->barcode_type_code); |
| 130 | 130 | unset($object->barcode_type_label); |
| 131 | 131 | |
| 132 | - unset($object->mode_reglement); // We use mode_reglement_id now |
|
| 133 | - unset($object->cond_reglement); // We use cond_reglement_id now |
|
| 134 | - unset($object->note); // We use note_public or note_private now |
|
| 135 | - unset($object->contact); // We use contact_id now |
|
| 136 | - unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
| 132 | + unset($object->mode_reglement); // We use mode_reglement_id now |
|
| 133 | + unset($object->cond_reglement); // We use cond_reglement_id now |
|
| 134 | + unset($object->note); // We use note_public or note_private now |
|
| 135 | + unset($object->contact); // We use contact_id now |
|
| 136 | + unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
| 137 | 137 | |
| 138 | 138 | unset($object->projet); // Should be fk_project |
| 139 | 139 | unset($object->project); // Should be fk_project |
@@ -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); |
@@ -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 |
@@ -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 |
@@ -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); |
@@ -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 | } |