@@ -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"); |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | return $this->LibStatut($this->status, $mode); |
499 | 499 | } |
500 | 500 | |
501 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
501 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
502 | 502 | /** |
503 | 503 | * Return the status |
504 | 504 | * |
@@ -508,7 +508,7 @@ discard block |
||
508 | 508 | */ |
509 | 509 | public function LibStatut($status, $mode = 0) |
510 | 510 | { |
511 | - // phpcs:enable |
|
511 | + // phpcs:enable |
|
512 | 512 | if (is_null($status)) { |
513 | 513 | return ''; |
514 | 514 | } |
@@ -1743,7 +1743,7 @@ discard block |
||
1743 | 1743 | } |
1744 | 1744 | } |
1745 | 1745 | |
1746 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
1746 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
1747 | 1747 | /** |
1748 | 1748 | * Clean sensible object datas |
1749 | 1749 | * |
@@ -1752,7 +1752,7 @@ discard block |
||
1752 | 1752 | */ |
1753 | 1753 | protected function _cleanObjectDatas($object) |
1754 | 1754 | { |
1755 | - // phpcs:enable |
|
1755 | + // phpcs:enable |
|
1756 | 1756 | $object = parent::_cleanObjectDatas($object); |
1757 | 1757 | |
1758 | 1758 | unset($object->nom); // ->name already defined and nom deprecated |
@@ -550,7 +550,7 @@ discard block |
||
550 | 550 | return $this->_cleanObjectDatas($this->contact); |
551 | 551 | } |
552 | 552 | |
553 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
553 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
554 | 554 | /** |
555 | 555 | * Clean sensible object datas |
556 | 556 | * |
@@ -559,7 +559,7 @@ discard block |
||
559 | 559 | */ |
560 | 560 | protected function _cleanObjectDatas($object) |
561 | 561 | { |
562 | - // phpcs:enable |
|
562 | + // phpcs:enable |
|
563 | 563 | $object = parent::_cleanObjectDatas($object); |
564 | 564 | |
565 | 565 | unset($object->total_ht); |
@@ -688,7 +688,7 @@ discard block |
||
688 | 688 | } |
689 | 689 | |
690 | 690 | |
691 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
691 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
692 | 692 | /** |
693 | 693 | * Mise a jour du lien entre le paiement de salaire et la ligne dans llx_bank generee |
694 | 694 | * |
@@ -697,7 +697,7 @@ discard block |
||
697 | 697 | */ |
698 | 698 | public function update_fk_bank($id_bank) |
699 | 699 | { |
700 | - // phpcs:enable |
|
700 | + // phpcs:enable |
|
701 | 701 | $sql = "UPDATE " . MAIN_DB_PREFIX . "payment_salary SET fk_bank = " . ((int) $id_bank) . " WHERE rowid = " . ((int) $this->id); |
702 | 702 | |
703 | 703 | dol_syslog(get_class($this) . "::update_fk_bank", LOG_DEBUG); |
@@ -776,7 +776,7 @@ discard block |
||
776 | 776 | return $this->LibStatut($this->statut, $mode); |
777 | 777 | } |
778 | 778 | |
779 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
779 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
780 | 780 | /** |
781 | 781 | * Return the status |
782 | 782 | * |
@@ -786,7 +786,7 @@ discard block |
||
786 | 786 | */ |
787 | 787 | public function LibStatut($status, $mode = 0) |
788 | 788 | { |
789 | - // phpcs:enable |
|
789 | + // phpcs:enable |
|
790 | 790 | global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage |
791 | 791 | |
792 | 792 | $langs->load('compta'); |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | } |
449 | 449 | } |
450 | 450 | |
451 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
451 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
452 | 452 | /** |
453 | 453 | * Update link between payment salary and line generate into llx_bank |
454 | 454 | * |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | */ |
458 | 458 | public function update_fk_bank($id_bank) |
459 | 459 | { |
460 | - // phpcs:enable |
|
460 | + // phpcs:enable |
|
461 | 461 | $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'salary SET fk_bank = ' . ((int) $id_bank); |
462 | 462 | $sql .= " WHERE rowid = " . ((int) $this->id); |
463 | 463 | $result = $this->db->query($sql); |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | } |
666 | 666 | } |
667 | 667 | |
668 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
668 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
669 | 669 | /** |
670 | 670 | * Tag social contribution as paid completely |
671 | 671 | * |
@@ -676,7 +676,7 @@ discard block |
||
676 | 676 | */ |
677 | 677 | public function set_paid($user) |
678 | 678 | { |
679 | - // phpcs:enable |
|
679 | + // phpcs:enable |
|
680 | 680 | dol_syslog(get_class($this) . "::set_paid is deprecated, use setPaid instead", LOG_NOTICE); |
681 | 681 | return $this->setPaid($user); |
682 | 682 | } |
@@ -703,7 +703,7 @@ discard block |
||
703 | 703 | } |
704 | 704 | } |
705 | 705 | |
706 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
706 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
707 | 707 | /** |
708 | 708 | * Remove tag paid on social contribution |
709 | 709 | * |
@@ -712,7 +712,7 @@ discard block |
||
712 | 712 | */ |
713 | 713 | public function set_unpaid($user) |
714 | 714 | { |
715 | - // phpcs:enable |
|
715 | + // phpcs:enable |
|
716 | 716 | $sql = "UPDATE " . MAIN_DB_PREFIX . "salary SET"; |
717 | 717 | $sql .= " paye = 0"; |
718 | 718 | $sql .= " WHERE rowid = " . ((int) $this->id); |
@@ -740,7 +740,7 @@ discard block |
||
740 | 740 | return $this->LibStatut($this->paye, $mode, $alreadypaid); |
741 | 741 | } |
742 | 742 | |
743 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
743 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
744 | 744 | /** |
745 | 745 | * Return label of a given status |
746 | 746 | * |
@@ -751,7 +751,7 @@ discard block |
||
751 | 751 | */ |
752 | 752 | public function LibStatut($status, $mode = 0, $alreadypaid = -1) |
753 | 753 | { |
754 | - // phpcs:enable |
|
754 | + // phpcs:enable |
|
755 | 755 | global $langs; |
756 | 756 | |
757 | 757 | // Load translation files required by the page |
@@ -834,7 +834,7 @@ discard block |
||
834 | 834 | return $return; |
835 | 835 | } |
836 | 836 | |
837 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
837 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
838 | 838 | /** |
839 | 839 | * Create a withdrawal request for a direct debit order or a credit transfer order. |
840 | 840 | * Use the remain to pay excluding all existing open direct debit requests. |
@@ -848,7 +848,7 @@ discard block |
||
848 | 848 | */ |
849 | 849 | public function demande_prelevement($fuser, $amount = 0, $type = 'direct-debit', $sourcetype = 'salaire', $checkduplicateamongall = 0) |
850 | 850 | { |
851 | - // phpcs:enable |
|
851 | + // phpcs:enable |
|
852 | 852 | global $conf, $mysoc; |
853 | 853 | |
854 | 854 | $error = 0; |
@@ -956,7 +956,7 @@ discard block |
||
956 | 956 | } |
957 | 957 | } |
958 | 958 | |
959 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
959 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
960 | 960 | /** |
961 | 961 | * Remove a direct debit request or a credit transfer request |
962 | 962 | * |
@@ -966,7 +966,7 @@ discard block |
||
966 | 966 | */ |
967 | 967 | public function demande_prelevement_delete($fuser, $did) |
968 | 968 | { |
969 | - // phpcs:enable |
|
969 | + // phpcs:enable |
|
970 | 970 | $sql = 'DELETE FROM ' . $this->db->prefix() . 'prelevement_demande'; |
971 | 971 | $sql .= ' WHERE rowid = ' . ((int) $did); |
972 | 972 | $sql .= ' AND traite = 0'; |
@@ -455,7 +455,7 @@ discard block |
||
455 | 455 | return $paymentsalary; |
456 | 456 | } |
457 | 457 | |
458 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
458 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
459 | 459 | /** |
460 | 460 | * Clean sensible object datas |
461 | 461 | * |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | */ |
465 | 465 | protected function _cleanObjectDatas($object) |
466 | 466 | { |
467 | - // phpcs:enable |
|
467 | + // phpcs:enable |
|
468 | 468 | $object = parent::_cleanObjectDatas($object); |
469 | 469 | |
470 | 470 | unset($object->rowid); |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | ); |
296 | 296 | } |
297 | 297 | |
298 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
298 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
299 | 299 | /** |
300 | 300 | * Clean sensible object datas |
301 | 301 | * |
@@ -304,30 +304,30 @@ discard block |
||
304 | 304 | */ |
305 | 305 | public function _cleanObjectDatas($object) |
306 | 306 | { |
307 | - // phpcs:disable |
|
308 | - $object = parent::_cleanObjectDatas($object); |
|
309 | - |
|
310 | - return $object; |
|
311 | - } |
|
312 | - |
|
313 | - /** |
|
314 | - * Validate fields before create or update object |
|
315 | - * |
|
316 | - * @param array $data Array of data to validate |
|
317 | - * @param array $fields Array of fields needed |
|
318 | - * @return array |
|
319 | - * |
|
320 | - * @throws RestException |
|
321 | - */ |
|
322 | - private function validate($data, $fields) |
|
323 | - { |
|
324 | - $hook = array(); |
|
325 | - foreach ($fields as $field) { |
|
326 | - if (!isset($data[$field])) { |
|
327 | - throw new RestException(400, $field." field missing"); |
|
328 | - } |
|
329 | - $hook[$field] = $data[$field]; |
|
330 | - } |
|
331 | - return $hook; |
|
332 | - } |
|
307 | + // phpcs:disable |
|
308 | + $object = parent::_cleanObjectDatas($object); |
|
309 | + |
|
310 | + return $object; |
|
311 | + } |
|
312 | + |
|
313 | + /** |
|
314 | + * Validate fields before create or update object |
|
315 | + * |
|
316 | + * @param array $data Array of data to validate |
|
317 | + * @param array $fields Array of fields needed |
|
318 | + * @return array |
|
319 | + * |
|
320 | + * @throws RestException |
|
321 | + */ |
|
322 | + private function validate($data, $fields) |
|
323 | + { |
|
324 | + $hook = array(); |
|
325 | + foreach ($fields as $field) { |
|
326 | + if (!isset($data[$field])) { |
|
327 | + throw new RestException(400, $field." field missing"); |
|
328 | + } |
|
329 | + $hook[$field] = $data[$field]; |
|
330 | + } |
|
331 | + return $hook; |
|
332 | + } |
|
333 | 333 | } |
@@ -893,7 +893,7 @@ discard block |
||
893 | 893 | return $this->LibStatut($this->status, $mode); |
894 | 894 | } |
895 | 895 | |
896 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
896 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
897 | 897 | /** |
898 | 898 | * Return the status |
899 | 899 | * |
@@ -903,7 +903,7 @@ discard block |
||
903 | 903 | */ |
904 | 904 | public function LibStatut($status, $mode = 0) |
905 | 905 | { |
906 | - // phpcs:enable |
|
906 | + // phpcs:enable |
|
907 | 907 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
908 | 908 | global $langs; |
909 | 909 | //$langs->load("recruitment"); |