@@ -45,8 +45,8 @@ |
||
45 | 45 | public $qty; |
46 | 46 | public $dluo_qty; // deprecated, use qty |
47 | 47 | public $entrepot_id; |
48 | - public $fk_origin_stock; // rowid in llx_product_batch table (not useful) |
|
49 | - public $fk_warehouse; // warehouse ID |
|
48 | + public $fk_origin_stock; // rowid in llx_product_batch table (not useful) |
|
49 | + public $fk_warehouse; // warehouse ID |
|
50 | 50 | public $fk_expeditiondet; |
51 | 51 | |
52 | 52 |
@@ -81,7 +81,7 @@ |
||
81 | 81 | $socid = $user->socid; |
82 | 82 | } |
83 | 83 | |
84 | -$result = restrictedArea($user, 'expedition', 0, ''); // We use 0 for id, because there is no particular shipment on this tab, only id of order is known |
|
84 | +$result = restrictedArea($user, 'expedition', 0, ''); // We use 0 for id, because there is no particular shipment on this tab, only id of order is known |
|
85 | 85 | |
86 | 86 | |
87 | 87 |
@@ -91,7 +91,7 @@ |
||
91 | 91 | |
92 | 92 | // Default sort order (if not yet defined by previous GETPOST) |
93 | 93 | if (!$sortfield) { |
94 | - reset($objectposition->fields); // Reset is required to avoid key() to return null. |
|
94 | + reset($objectposition->fields); // Reset is required to avoid key() to return null. |
|
95 | 95 | $sortfield = "t." . key($objectposition->fields); // Set here default search field. By default 1st field in definition. |
96 | 96 | } |
97 | 97 | if (!$sortorder) { |
@@ -62,7 +62,7 @@ |
||
62 | 62 | |
63 | 63 | // Permissions |
64 | 64 | $permissionnote = $user->hasRight('hrm', 'evaluation', 'write'); // Used by the include of actions_setnotes.inc.php |
65 | -$permissiontoread = $user->hasRight('hrm', 'evaluation', 'read'); // Used by the include of actions_addupdatedelete.inc.php |
|
65 | +$permissiontoread = $user->hasRight('hrm', 'evaluation', 'read'); // Used by the include of actions_addupdatedelete.inc.php |
|
66 | 66 | |
67 | 67 | // Security check (enable the most restrictive one) |
68 | 68 | //if ($user->socid > 0) accessforbidden(); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
57 | 57 | $mode = GETPOST('mode', 'alpha'); // for mode view result |
58 | 58 | |
59 | -$id = GETPOSTINT('id'); |
|
59 | +$id = GETPOSTINT('id'); |
|
60 | 60 | |
61 | 61 | // Load variable for pagination |
62 | 62 | $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | // Default sort order (if not yet defined by previous GETPOST) |
87 | 87 | if (!$sortfield) { |
88 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
88 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
89 | 89 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
90 | 90 | } |
91 | 91 | if (!$sortorder) { |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | } |
487 | 487 | |
488 | 488 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
489 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
489 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
490 | 490 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
491 | 491 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
492 | 492 | |
@@ -577,7 +577,7 @@ discard block |
||
577 | 577 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
578 | 578 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
579 | 579 | } |
580 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
580 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
581 | 581 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
582 | 582 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
583 | 583 | $totalarray['nbfield']++; |
@@ -41,7 +41,7 @@ |
||
41 | 41 | $action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
42 | 42 | $backtopage = GETPOST('backtopage', 'alpha'); |
43 | 43 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
44 | -$id = GETPOSTINT('id'); |
|
44 | +$id = GETPOSTINT('id'); |
|
45 | 45 | |
46 | 46 | // Initialize technical objects |
47 | 47 | $form = new Form($db); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | require_once constant('DOL_DOCUMENT_ROOT') . '/hrm/class/skillrank.class.php'; |
39 | 39 | |
40 | 40 | // Load translation files required by the page |
41 | -$langs->loadLangs(array('hrm', 'other', 'products')); // why products? |
|
41 | +$langs->loadLangs(array('hrm', 'other', 'products')); // why products? |
|
42 | 42 | |
43 | 43 | // Get parameters |
44 | 44 | $id = GETPOSTINT('id'); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'jobcard'; // To manage different context of search |
50 | 50 | $backtopage = GETPOST('backtopage', 'alpha'); |
51 | 51 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
52 | -$lineid = GETPOSTINT('lineid'); |
|
52 | +$lineid = GETPOSTINT('lineid'); |
|
53 | 53 | |
54 | 54 | // Initialize technical objects |
55 | 55 | $object = new Job($db); |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | |
42 | 42 | |
43 | 43 | // Load translation files required by the page |
44 | -$langs->loadLangs(array('hrm', 'other', 'products')); // why products? |
|
44 | +$langs->loadLangs(array('hrm', 'other', 'products')); // why products? |
|
45 | 45 | |
46 | 46 | // Get parameters |
47 | 47 | $id = GETPOSTINT('id'); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'evaluationcard'; // To manage different context of search |
53 | 53 | $backtopage = GETPOST('backtopage', 'alpha'); |
54 | 54 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
55 | -$lineid = GETPOSTINT('lineid'); |
|
55 | +$lineid = GETPOSTINT('lineid'); |
|
56 | 56 | |
57 | 57 | // Initialize technical objects |
58 | 58 | $object = new Evaluation($db); |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | */ |
228 | 228 | public function create(User $user, $notrigger = 0) |
229 | 229 | { |
230 | - global $langs,$conf; |
|
230 | + global $langs, $conf; |
|
231 | 231 | |
232 | 232 | $resultcreate = $this->createCommon($user, $notrigger); |
233 | 233 | |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | $skilldet->rankorder = $i; |
267 | 267 | $skilldet->fk_skill = $this->id; |
268 | 268 | |
269 | - $result = $skilldet->create($user); |
|
269 | + $result = $skilldet->create($user); |
|
270 | 270 | if ($result <= 0) { |
271 | 271 | $error++; |
272 | 272 | } |