@@ -786,7 +786,7 @@ discard block |
||
786 | 786 | return $this->LibStatut($this->status, $mode); |
787 | 787 | } |
788 | 788 | |
789 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
789 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
790 | 790 | /** |
791 | 791 | * Return the status |
792 | 792 | * |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | */ |
797 | 797 | public function LibStatut($status, $mode = 0) |
798 | 798 | { |
799 | - // phpcs:enable |
|
799 | + // phpcs:enable |
|
800 | 800 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
801 | 801 | global $langs; |
802 | 802 | //$langs->load("hrm"); |
@@ -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 | } |
@@ -638,7 +638,7 @@ discard block |
||
638 | 638 | return $this->LibStatut($this->status, $mode); |
639 | 639 | } |
640 | 640 | |
641 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
641 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
642 | 642 | /** |
643 | 643 | * Return the status |
644 | 644 | * |
@@ -648,7 +648,7 @@ discard block |
||
648 | 648 | */ |
649 | 649 | public function LibStatut($status, $mode = 0) |
650 | 650 | { |
651 | - // phpcs:enable |
|
651 | + // phpcs:enable |
|
652 | 652 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
653 | 653 | global $langs; |
654 | 654 | //$langs->load("mymodule"); |
@@ -786,7 +786,7 @@ discard block |
||
786 | 786 | return $this->LibStatut($this->status, $mode); |
787 | 787 | } |
788 | 788 | |
789 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
789 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
790 | 790 | /** |
791 | 791 | * Return the status |
792 | 792 | * |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | */ |
797 | 797 | public function LibStatut($status, $mode = 0) |
798 | 798 | { |
799 | - // phpcs:enable |
|
799 | + // phpcs:enable |
|
800 | 800 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
801 | 801 | global $langs; |
802 | 802 | //$langs->load("hrm"); |
@@ -786,7 +786,7 @@ discard block |
||
786 | 786 | return $this->LibStatut($this->status, $mode); |
787 | 787 | } |
788 | 788 | |
789 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
789 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
790 | 790 | /** |
791 | 791 | * Return the status |
792 | 792 | * |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | */ |
797 | 797 | public function LibStatut($status, $mode = 0) |
798 | 798 | { |
799 | - // phpcs:enable |
|
799 | + // phpcs:enable |
|
800 | 800 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
801 | 801 | global $langs; |
802 | 802 | //$langs->load("hrm"); |
@@ -833,7 +833,7 @@ discard block |
||
833 | 833 | return $this->LibStatut($this->status, $mode); |
834 | 834 | } |
835 | 835 | |
836 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
836 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
837 | 837 | /** |
838 | 838 | * Return the status |
839 | 839 | * |
@@ -843,7 +843,7 @@ discard block |
||
843 | 843 | */ |
844 | 844 | public function LibStatut($status, $mode = 0) |
845 | 845 | { |
846 | - // phpcs:enable |
|
846 | + // phpcs:enable |
|
847 | 847 | return ''; // There is no status on job profile for the moment |
848 | 848 | |
849 | 849 | /* |
@@ -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)) { |
@@ -786,7 +786,7 @@ discard block |
||
786 | 786 | return $this->LibStatut($this->status, $mode); |
787 | 787 | } |
788 | 788 | |
789 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
789 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
790 | 790 | /** |
791 | 791 | * Return the status |
792 | 792 | * |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | */ |
797 | 797 | public function LibStatut($status, $mode = 0) |
798 | 798 | { |
799 | - // phpcs:enable |
|
799 | + // phpcs:enable |
|
800 | 800 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
801 | 801 | global $langs; |
802 | 802 | //$langs->load("hrm"); |
@@ -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 |
@@ -1523,7 +1523,7 @@ discard block |
||
1523 | 1523 | return $this->LibStatut($this->status, $mode); |
1524 | 1524 | } |
1525 | 1525 | |
1526 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1526 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1527 | 1527 | /** |
1528 | 1528 | * Return the status |
1529 | 1529 | * |
@@ -1533,7 +1533,7 @@ discard block |
||
1533 | 1533 | */ |
1534 | 1534 | public function LibStatut($status, $mode = 0) |
1535 | 1535 | { |
1536 | - // phpcs:enable |
|
1536 | + // phpcs:enable |
|
1537 | 1537 | if (empty($this->labelStatus)) { |
1538 | 1538 | global $langs; |
1539 | 1539 | //$langs->load("mrp"); |
@@ -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 |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | } |
342 | 342 | |
343 | 343 | |
344 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
344 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
345 | 345 | /** |
346 | 346 | * Clean sensible object datas |
347 | 347 | * |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | */ |
351 | 351 | protected function _cleanObjectDatas($object) |
352 | 352 | { |
353 | - // phpcs:enable |
|
353 | + // phpcs:enable |
|
354 | 354 | $object = parent::_cleanObjectDatas($object); |
355 | 355 | |
356 | 356 | unset($object->rowid); |
@@ -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"])) { |