@@ -383,13 +383,13 @@ |
||
383 | 383 | global $user; |
384 | 384 | |
385 | 385 | $this->fk_skill = $currentSkill->fk_skill; |
386 | - $this->rankorder = $currentSkill->rankorder; |
|
386 | + $this->rankorder = $currentSkill->rankorder; |
|
387 | 387 | $this->fk_object = $fk_user; |
388 | 388 | $this->date_creation = dol_now(); |
389 | 389 | $this->fk_user_creat = $user->id; |
390 | 390 | $this->fk_user_modif = $user->id; |
391 | 391 | $this->objecttype = self::SKILLRANK_TYPE_USER; |
392 | - $result = $this->create($user); |
|
392 | + $result = $this->create($user); |
|
393 | 393 | |
394 | 394 | return $result; |
395 | 395 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | 'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 21, 'notnull' => 0, 'visible' => 1,), |
111 | 111 | 'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => 2,), |
112 | 112 | 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => 2,), |
113 | - 'deplacement' => array('type' => 'select', 'required' => 1,'label' => 'NeedBusinessTravels', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array(0 => "No", 1 => "Yes"), 'default' => '0'), |
|
113 | + 'deplacement' => array('type' => 'select', 'required' => 1, 'label' => 'NeedBusinessTravels', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array(0 => "No", 1 => "Yes"), 'default' => '0'), |
|
114 | 114 | 'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 0,), |
115 | 115 | 'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 71, 'notnull' => 0, 'visible' => 0,), |
116 | 116 | 'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',), |
@@ -844,7 +844,7 @@ discard block |
||
844 | 844 | public function LibStatut($status, $mode = 0) |
845 | 845 | { |
846 | 846 | // phpcs:enable |
847 | - return ''; // There is no status on job profile for the moment |
|
847 | + return ''; // There is no status on job profile for the moment |
|
848 | 848 | |
849 | 849 | /* |
850 | 850 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
@@ -72,12 +72,12 @@ |
||
72 | 72 | /** |
73 | 73 | * @var string |
74 | 74 | */ |
75 | - public $exporttype; // deb or des |
|
75 | + public $exporttype; // deb or des |
|
76 | 76 | |
77 | 77 | /** |
78 | 78 | * @var string |
79 | 79 | */ |
80 | - public $type_declaration; // 'introduction' or 'expedition' |
|
80 | + public $type_declaration; // 'introduction' or 'expedition' |
|
81 | 81 | public $numero_declaration; |
82 | 82 | |
83 | 83 |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | 'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,), |
122 | 122 | 'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 1010), |
123 | 123 | 'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 2, 'position' => 1000, 'default' => '0', 'notnull' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'InProgress', '3' => 'StatusMOProduced', '9' => 'Canceled')), |
124 | - 'fk_parent_line' => array('type' => 'integer:MoLine:mrp/class/mo.class.php', 'label' => 'ParentMo', 'enabled' => 1, 'visible' => 0, 'position' => 1020, 'default' => '0', 'notnull' => 0, 'index' => 1,'showoncombobox' => 0), |
|
124 | + 'fk_parent_line' => array('type' => 'integer:MoLine:mrp/class/mo.class.php', 'label' => 'ParentMo', 'enabled' => 1, 'visible' => 0, 'position' => 1020, 'default' => '0', 'notnull' => 0, 'index' => 1, 'showoncombobox' => 0), |
|
125 | 125 | ); |
126 | 126 | public $rowid; |
127 | 127 | public $entity; |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | } |
331 | 331 | |
332 | 332 | if (!$error) { |
333 | - $result = $this->createProduction($user, $notrigger); // Insert lines from BOM |
|
333 | + $result = $this->createProduction($user, $notrigger); // Insert lines from BOM |
|
334 | 334 | if ($result <= 0) { |
335 | 335 | $error++; |
336 | 336 | } |
@@ -909,7 +909,7 @@ discard block |
||
909 | 909 | } |
910 | 910 | $productstatic = new Product($this->db); |
911 | 911 | |
912 | - $arrayoflines = $this->fetchLinesLinked('consumed', $idline); // Get lines consumed under the one to delete |
|
912 | + $arrayoflines = $this->fetchLinesLinked('consumed', $idline); // Get lines consumed under the one to delete |
|
913 | 913 | |
914 | 914 | $result = 0; |
915 | 915 | |
@@ -1796,7 +1796,7 @@ discard block |
||
1796 | 1796 | $this->tpl['disable_stock_change'] = $line->disable_stock_change; |
1797 | 1797 | $this->tpl['efficiency'] = $line->efficiency; |
1798 | 1798 | |
1799 | - global $conf; // used into template |
|
1799 | + global $conf; // used into template |
|
1800 | 1800 | $res = include DOL_DOCUMENT_ROOT . '/mrp/tpl/originproductline.tpl.php'; |
1801 | 1801 | } |
1802 | 1802 |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | |
378 | 378 | if (!empty($arraytoconsume) && !empty($arraytoproduce)) { |
379 | 379 | $pos = 0; |
380 | - $arrayofarrayname = array("arraytoconsume","arraytoproduce"); |
|
380 | + $arrayofarrayname = array("arraytoconsume", "arraytoproduce"); |
|
381 | 381 | foreach ($arrayofarrayname as $arrayname) { |
382 | 382 | foreach (${$arrayname} as $value) { |
383 | 383 | $tmpproduct = new Product($this->db); |
@@ -747,7 +747,7 @@ discard block |
||
747 | 747 | $this->db->begin(); |
748 | 748 | |
749 | 749 | $pos = 0; |
750 | - $arrayofarrayname = array("arraytoconsume","arraytoproduce"); |
|
750 | + $arrayofarrayname = array("arraytoconsume", "arraytoproduce"); |
|
751 | 751 | foreach ($arrayofarrayname as $arrayname) { |
752 | 752 | foreach (${$arrayname} as $value) { |
753 | 753 | if (empty($value["objectid"])) { |
@@ -734,9 +734,9 @@ discard block |
||
734 | 734 | if ($this->origin_object instanceof CommonObject && empty($this->origin_object->lines)) { |
735 | 735 | $res = $this->origin_object->fetch_lines(); |
736 | 736 | if ($this->origin_object instanceof CommandeFournisseur) { |
737 | - $this->commandeFournisseur = $this->origin_object; // deprecated |
|
737 | + $this->commandeFournisseur = $this->origin_object; // deprecated |
|
738 | 738 | } else { |
739 | - $this->commandeFournisseur = null; // deprecated |
|
739 | + $this->commandeFournisseur = null; // deprecated |
|
740 | 740 | } |
741 | 741 | if ($res < 0) { |
742 | 742 | return $res; |
@@ -1358,7 +1358,7 @@ discard block |
||
1358 | 1358 | if (getDolGlobalInt("STOCK_CALCULATE_ON_RECEPTION_CLOSE")) { |
1359 | 1359 | $this->labelStatus[1] = 'StatusReceptionValidatedToReceive'; |
1360 | 1360 | } |
1361 | - $this->labelStatus[2] = 'StatusReceptionProcessed'; |
|
1361 | + $this->labelStatus[2] = 'StatusReceptionProcessed'; |
|
1362 | 1362 | |
1363 | 1363 | // List of short language codes for status |
1364 | 1364 | $this->labelStatusShort[-1] = 'StatusReceptionCanceledShort'; |
@@ -1468,7 +1468,7 @@ discard block |
||
1468 | 1468 | while ($xnbp < $nbp) { |
1469 | 1469 | $line = new CommandeFournisseurDispatch($this->db); |
1470 | 1470 | $line->desc = $langs->trans("Description") . " " . $xnbp; |
1471 | - $line->libelle = $langs->trans("Description") . " " . $xnbp; // deprecated |
|
1471 | + $line->libelle = $langs->trans("Description") . " " . $xnbp; // deprecated |
|
1472 | 1472 | $line->label = $langs->trans("Description") . " " . $xnbp; |
1473 | 1473 | $line->qty = 10; |
1474 | 1474 |
@@ -204,11 +204,11 @@ |
||
204 | 204 | |
205 | 205 | $receptionline->fk_product = $line['fk_product']; |
206 | 206 | $receptionline->fk_entrepot = $line['fk_entrepot']; |
207 | - $receptionline->fk_element = $line['fk_element'] ?? $line['origin_id']; // example: purchase order id. this->origin is 'supplier_order' |
|
207 | + $receptionline->fk_element = $line['fk_element'] ?? $line['origin_id']; // example: purchase order id. this->origin is 'supplier_order' |
|
208 | 208 | $receptionline->origin_line_id = $line['fk_elementdet'] ?? $line['origin_line_id']; // example: purchase order id |
209 | - $receptionline->fk_elementdet = $line['fk_elementdet'] ?? $line['origin_line_id']; // example: purchase order line id |
|
210 | - $receptionline->origin_type = $line['element_type'] ?? $line['origin_type']; // example 'supplier_order' |
|
211 | - $receptionline->element_type = $line['element_type'] ?? $line['origin_type']; // example 'supplier_order' |
|
209 | + $receptionline->fk_elementdet = $line['fk_elementdet'] ?? $line['origin_line_id']; // example: purchase order line id |
|
210 | + $receptionline->origin_type = $line['element_type'] ?? $line['origin_type']; // example 'supplier_order' |
|
211 | + $receptionline->element_type = $line['element_type'] ?? $line['origin_type']; // example 'supplier_order' |
|
212 | 212 | $receptionline->qty = $line['qty']; |
213 | 213 | //$receptionline->rang = $line['rang']; |
214 | 214 | $receptionline->array_options = $line['array_options']; |
@@ -746,7 +746,7 @@ discard block |
||
746 | 746 | $this->statut = $obj->status; // deprecated |
747 | 747 | $this->status = $obj->status; |
748 | 748 | $this->opp_status = $obj->fk_opp_status; |
749 | - $this->opp_amount = $obj->opp_amount; |
|
749 | + $this->opp_amount = $obj->opp_amount; |
|
750 | 750 | $this->opp_percent = $obj->opp_percent; |
751 | 751 | $this->budget_amount = $obj->budget_amount; |
752 | 752 | $this->model_pdf = $obj->model_pdf; |
@@ -1703,7 +1703,7 @@ discard block |
||
1703 | 1703 | global $langs, $conf; |
1704 | 1704 | |
1705 | 1705 | $error = 0; |
1706 | - $clone_project_id = 0; // For static toolcheck |
|
1706 | + $clone_project_id = 0; // For static toolcheck |
|
1707 | 1707 | |
1708 | 1708 | dol_syslog("createFromClone clone_contact=" . json_encode($clone_contact) . " clone_task=" . json_encode($clone_task) . " clone_project_file=" . json_encode($clone_project_file) . " clone_note=" . json_encode($clone_note) . " move_date=" . json_encode($move_date), LOG_DEBUG); |
1709 | 1709 | |
@@ -1997,7 +1997,7 @@ discard block |
||
1997 | 1997 | if ($tableName == "actioncomm") { |
1998 | 1998 | $sql .= " SET fk_project=" . $this->id; |
1999 | 1999 | $sql .= " WHERE id=" . ((int) $elementSelectId); |
2000 | - } elseif (in_array($tableName, ["entrepot","mrp_mo","stocktransfer_stocktransfer"])) { |
|
2000 | + } elseif (in_array($tableName, ["entrepot", "mrp_mo", "stocktransfer_stocktransfer"])) { |
|
2001 | 2001 | $sql .= " SET fk_project=" . $this->id; |
2002 | 2002 | $sql .= " WHERE rowid=" . ((int) $elementSelectId); |
2003 | 2003 | } else { |
@@ -2188,7 +2188,7 @@ discard block |
||
2188 | 2188 | $date = explode('-', $obj->element_date); |
2189 | 2189 | $week_number = getWeekNumber($date[2], $date[1], $date[0]); |
2190 | 2190 | } |
2191 | - '@phan-var-force int $week_number'; // Needed because phan considers it might be null |
|
2191 | + '@phan-var-force int $week_number'; // Needed because phan considers it might be null |
|
2192 | 2192 | if (empty($weekalreadyfound[$week_number])) { |
2193 | 2193 | $this->monthWorkLoad[$week_number] = $obj->element_duration; |
2194 | 2194 | $this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = $obj->element_duration; |
@@ -2535,7 +2535,7 @@ discard block |
||
2535 | 2535 | if (method_exists($this, 'getLibStatut')) { |
2536 | 2536 | $return .= '<div class="info-box-status small inline-block valignmiddle">' . $this->getLibStatut(3) . '</div>'; |
2537 | 2537 | } |
2538 | - $return .= '</div>'; // end div line status |
|
2538 | + $return .= '</div>'; // end div line status |
|
2539 | 2539 | |
2540 | 2540 | $return .= '</div>'; |
2541 | 2541 | $return .= '</div>'; |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | if ($foundintocache) { // Cache file found and is not too old |
332 | 332 | dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . "."); |
333 | 333 | $data = json_decode(file_get_contents($newpathofdestfile), true); |
334 | - '@phan-var-force array $data'; // Phan can not interpret json_decode |
|
334 | + '@phan-var-force array $data'; // Phan can not interpret json_decode |
|
335 | 335 | } else { |
336 | 336 | $year = $startyear; |
337 | 337 | while ($year <= $endyear) { |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | if ($foundintocache) { // Cache file found and is not too old |
443 | 443 | dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . "."); |
444 | 444 | $data = json_decode(file_get_contents($newpathofdestfile), true); |
445 | - '@phan-var-force array $data'; // Phan can not interpret json_decode |
|
445 | + '@phan-var-force array $data'; // Phan can not interpret json_decode |
|
446 | 446 | } else { |
447 | 447 | $year = $startyear; |
448 | 448 | while ($year <= $endyear) { |