@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | if ($user->socid > 0) { |
100 | 100 | accessforbidden(); |
101 | 101 | } |
102 | -$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0); |
|
102 | +$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
|
103 | 103 | $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft); |
104 | 104 | |
105 | 105 | if (!$permissiontoread) { |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | $projectstatic->fetch_thirdparty(); |
139 | 139 | } |
140 | 140 | |
141 | -$withProjectUrl=''; |
|
141 | +$withProjectUrl = ''; |
|
142 | 142 | $object->project = clone $projectstatic; |
143 | 143 | |
144 | 144 | if (!empty($withproject)) { |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | $balancestart[$objp->numr] = $obj->amount; |
348 | 348 | $db->free($resql); |
349 | 349 | } |
350 | - print '<td class="right"><span class="amount">'.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, empty($object->currency_code)?$conf->currency:$object->currency_code).'</span></td>'; |
|
350 | + print '<td class="right"><span class="amount">'.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).'</span></td>'; |
|
351 | 351 | |
352 | 352 | // Calculate end amount |
353 | 353 | $sql = "SELECT sum(b.amount) as amount"; |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | $content[$objp->numr] = $obj->amount; |
361 | 361 | $db->free($resql); |
362 | 362 | } |
363 | - print '<td class="right"><span class="amount">'.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, empty($object->currency_code)?$conf->currency:$object->currency_code).'</span></td>'; |
|
363 | + print '<td class="right"><span class="amount">'.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).'</span></td>'; |
|
364 | 364 | |
365 | 365 | print '<td class="center">'; |
366 | 366 | if ($user->rights->banque->consolidate && $action != 'editbankreceipt') { |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | } |
43 | 43 | |
44 | 44 | // Load translation files required by the page |
45 | -$langs->loadLangs(array("companies", "admin", "users", "other","withdrawals")); |
|
45 | +$langs->loadLangs(array("companies", "admin", "users", "other", "withdrawals")); |
|
46 | 46 | |
47 | 47 | // Load variable for pagination |
48 | 48 | $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | if ($date_start !== '') { |
211 | 211 | $sql .= " AND e.dateevent >= '".$db->idate($date_start)."'"; |
212 | 212 | } |
213 | -if ($date_end !== '' ) { |
|
213 | +if ($date_end !== '') { |
|
214 | 214 | $sql .= " AND e.dateevent <= '".$db->idate($date_end)."'"; |
215 | 215 | } |
216 | 216 | if ($search_code) { |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public function getExample() |
78 | 78 | { |
79 | - return $this->prefix.'0-0501-0001'; // TC0-0501-0001 |
|
79 | + return $this->prefix.'0-0501-0001'; // TC0-0501-0001 |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -92,10 +92,10 @@ discard block |
||
92 | 92 | $pryymm = ''; |
93 | 93 | $max = ''; |
94 | 94 | |
95 | - $pos_source = 0; // POS source = Terminal ID |
|
95 | + $pos_source = 0; // POS source = Terminal ID |
|
96 | 96 | |
97 | 97 | // First, we get the max value |
98 | - $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
98 | + $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
99 | 99 | |
100 | 100 | $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; |
101 | 101 | $sql .= " FROM ".MAIN_DB_PREFIX."facture"; |
@@ -135,10 +135,10 @@ discard block |
||
135 | 135 | { |
136 | 136 | global $db; |
137 | 137 | |
138 | - $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID |
|
138 | + $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID |
|
139 | 139 | |
140 | 140 | // First, we get the max value |
141 | - $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
141 | + $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
142 | 142 | $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL |
143 | 143 | $sql .= " FROM ".MAIN_DB_PREFIX."facture"; |
144 | 144 | $sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source."-____-%")."'"; |
@@ -105,7 +105,7 @@ |
||
105 | 105 | $match = preg_grep('/('.preg_quote($htmlname, '/').'[0-9]+)/', array_keys($_GET)); |
106 | 106 | sort($match); |
107 | 107 | |
108 | - $id = (!empty($match[0]) ? $match[0] : ''); // Take first key found into GET array with matching $htmlname123 |
|
108 | + $id = (!empty($match[0]) ? $match[0] : ''); // Take first key found into GET array with matching $htmlname123 |
|
109 | 109 | |
110 | 110 | // When used from jQuery, the search term is added as GET param "term". |
111 | 111 | $searchkey = (($id && GETPOST($id, 'alpha')) ? GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ?GETPOST($htmlname, 'alpha') : '')); |
@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | $langs->loadLangs(array("mrp", "other")); |
39 | 39 | |
40 | 40 | // Get parameters |
41 | -$id = GETPOST('id', 'int'); |
|
41 | +$id = GETPOST('id', 'int'); |
|
42 | 42 | $ref = GETPOST('ref', 'alpha'); |
43 | -$action = GETPOST('action', 'aZ09'); |
|
43 | +$action = GETPOST('action', 'aZ09'); |
|
44 | 44 | $cancel = GETPOST('cancel', 'aZ09'); |
45 | 45 | $backtopage = GETPOST('backtopage', 'alpha'); |
46 | 46 | |
@@ -54,10 +54,10 @@ discard block |
||
54 | 54 | } |
55 | 55 | $search_agenda_label = GETPOST('search_agenda_label'); |
56 | 56 | |
57 | -$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; |
|
57 | +$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; |
|
58 | 58 | $sortfield = GETPOST('sortfield', 'aZ09comma'); |
59 | 59 | $sortorder = GETPOST('sortorder', 'aZ09comma'); |
60 | -$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); |
|
60 | +$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); |
|
61 | 61 | if (empty($page) || $page == -1) { |
62 | 62 | $page = 0; |
63 | 63 | } // If $page is not defined, or '' or -1 |
@@ -52,7 +52,7 @@ |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | // Get parameters |
55 | -$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; |
|
55 | +$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; |
|
56 | 56 | $sortfield = GETPOST('sortfield', 'aZ09comma'); |
57 | 57 | $sortorder = GETPOST('sortorder', 'aZ09comma'); |
58 | 58 | $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); |
@@ -53,20 +53,20 @@ discard block |
||
53 | 53 | // Security check |
54 | 54 | if ($user->socid) $socid = $user->socid; |
55 | 55 | |
56 | -$search_ref = GETPOST('search_ref', 'alpha'); |
|
57 | -$search_date_startday = GETPOST('search_date_startday', 'int'); |
|
58 | -$search_date_startmonth = GETPOST('search_date_startmonth', 'int'); |
|
59 | -$search_date_startyear = GETPOST('search_date_startyear', 'int'); |
|
56 | +$search_ref = GETPOST('search_ref', 'alpha'); |
|
57 | +$search_date_startday = GETPOST('search_date_startday', 'int'); |
|
58 | +$search_date_startmonth = GETPOST('search_date_startmonth', 'int'); |
|
59 | +$search_date_startyear = GETPOST('search_date_startyear', 'int'); |
|
60 | 60 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
61 | -$search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
|
61 | +$search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
|
62 | 62 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
63 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
63 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
64 | 64 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
65 | 65 | $search_company = GETPOST('search_company', 'alpha'); |
66 | 66 | $search_payment_type = GETPOST('search_payment_type'); |
67 | -$search_cheque_num = GETPOST('search_cheque_num', 'alpha'); |
|
67 | +$search_cheque_num = GETPOST('search_cheque_num', 'alpha'); |
|
68 | 68 | $search_bank_account = GETPOST('search_bank_account', 'int'); |
69 | -$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x' |
|
69 | +$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x' |
|
70 | 70 | |
71 | 71 | $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; |
72 | 72 | $sortfield = GETPOST('sortfield', 'aZ09comma'); |
@@ -207,10 +207,10 @@ discard block |
||
207 | 207 | $sql .= natural_search('p.ref', $search_ref); |
208 | 208 | } |
209 | 209 | if ($search_date_start) { |
210 | - $sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'"; |
|
210 | + $sql .= " AND p.datep >= '".$db->idate($search_date_start)."'"; |
|
211 | 211 | } |
212 | 212 | if ($search_date_end) { |
213 | - $sql .=" AND p.datep <= '" . $db->idate($search_date_end) . "'"; |
|
213 | + $sql .= " AND p.datep <= '".$db->idate($search_date_end)."'"; |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | if ($search_company) { |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | // Put here all includes required by your class file |
29 | 29 | require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; |
30 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skillrank.lib.php'; |
|
30 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skillrank.lib.php'; |
|
31 | 31 | |
32 | 32 | /** |
33 | 33 | * Class for SkillRank |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | /** |
105 | 105 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
106 | 106 | */ |
107 | - public $fields=array( |
|
107 | + public $fields = array( |
|
108 | 108 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"), |
109 | 109 | 'fk_skill' => array('type'=>'integer:Skill:hrm/class/skill.class.php:1', 'label'=>'Skill', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>1, 'index'=>1,), |
110 | 110 | 'rankorder' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>'1', 'position'=>4, 'notnull'=>1, 'visible'=>1, 'default' => 0), |
@@ -371,13 +371,13 @@ discard block |
||
371 | 371 | global $user; |
372 | 372 | |
373 | 373 | $this->fk_skill = $currentSkill->fk_skill; |
374 | - $this->rankorder = $currentSkill->rankorder; |
|
374 | + $this->rankorder = $currentSkill->rankorder; |
|
375 | 375 | $this->fk_object = $fk_user; |
376 | 376 | $this->date_creation = dol_now(); |
377 | 377 | $this->fk_user_creat = $user->id; |
378 | 378 | $this->fk_user_modif = $user->id; |
379 | - $this->objecttype = self::SKILLRANK_TYPE_USER; |
|
380 | - $result = $this->create($user); |
|
379 | + $this->objecttype = self::SKILLRANK_TYPE_USER; |
|
380 | + $result = $this->create($user); |
|
381 | 381 | |
382 | 382 | return $result; |
383 | 383 | } |