@@ -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 |
@@ -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 | } |
@@ -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) { |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $sql .= " AND entity = ".$conf->entity; |
| 92 | 92 | |
| 93 | 93 | $resql = $db->query($sql); |
| 94 | - if ($resql) { |
|
| 94 | + if ($resql) { |
|
| 95 | 95 | $obj = $db->fetch_object($resql); |
| 96 | 96 | if ($obj) { |
| 97 | 97 | $max = intval($obj->max); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | $sql .= " AND entity = ".$conf->entity; |
| 128 | 128 | |
| 129 | 129 | $resql = $db->query($sql); |
| 130 | - if ($resql) { |
|
| 130 | + if ($resql) { |
|
| 131 | 131 | $obj = $db->fetch_object($resql); |
| 132 | 132 | if ($obj) { |
| 133 | 133 | $max = intval($obj->max); |
@@ -127,7 +127,7 @@ |
||
| 127 | 127 | $sql .= " AND entity = ".$conf->entity; |
| 128 | 128 | |
| 129 | 129 | $resql = $db->query($sql); |
| 130 | - if ($resql) { |
|
| 130 | + if ($resql) { |
|
| 131 | 131 | $obj = $db->fetch_object($resql); |
| 132 | 132 | if ($obj) { |
| 133 | 133 | $max = intval($obj->max); |
@@ -221,7 +221,7 @@ |
||
| 221 | 221 | |
| 222 | 222 | if (!$notrigger) { |
| 223 | 223 | // Call triggers |
| 224 | - $result=$this->call_trigger('LINERECEPTION_CREATE', $user); |
|
| 224 | + $result = $this->call_trigger('LINERECEPTION_CREATE', $user); |
|
| 225 | 225 | if ($result < 0) { |
| 226 | 226 | $error++; |
| 227 | 227 | } |