@@ -608,7 +608,7 @@ discard block |
||
608 | 608 | $this->note_public = $obj->note_public; |
609 | 609 | $this->note_private = $obj->note_private; |
610 | 610 | |
611 | - $this->statut = $obj->status; // deprecated |
|
611 | + $this->statut = $obj->status; // deprecated |
|
612 | 612 | $this->status = $obj->status; |
613 | 613 | |
614 | 614 | $this->photo = $obj->photo; |
@@ -735,7 +735,7 @@ discard block |
||
735 | 735 | if (getDolGlobalString('MAIN_ENABLE_DEFAULT_VALUES')) { |
736 | 736 | // Load user->default_values for user. TODO Save this in memcached ? |
737 | 737 | $defaultValues = new DefaultValues($this->db); |
738 | - $result = $defaultValues->fetchAll('', '', 0, 0, '(t.user_id:in:0,' . $this->id . ') AND (entity:in:' . (isset($this->entity) ? $this->entity : $conf->entity) . ',' . $conf->entity . ')'); // User 0 (all) + me (if defined) |
|
738 | + $result = $defaultValues->fetchAll('', '', 0, 0, '(t.user_id:in:0,' . $this->id . ') AND (entity:in:' . (isset($this->entity) ? $this->entity : $conf->entity) . ',' . $conf->entity . ')'); // User 0 (all) + me (if defined) |
|
739 | 739 | //$result = $defaultValues->fetchAll('', '', 0, 0, array('t.user_id'=>array(0, $this->id), 'entity'=>array((isset($this->entity) ? $this->entity : $conf->entity), $conf->entity))); // User 0 (all) + me (if defined) |
740 | 740 | |
741 | 741 | if (!is_array($result) && $result < 0) { |
@@ -849,16 +849,16 @@ discard block |
||
849 | 849 | // Special case for external user |
850 | 850 | if (!empty($this->socid)) { |
851 | 851 | if ($module == 'societe' && ($permlevel1 == 'creer' || $permlevel1 == 'write')) { |
852 | - return 0; // An external user never has the permission ->societe->write to see all thirdparties (always restricted to himself) |
|
852 | + return 0; // An external user never has the permission ->societe->write to see all thirdparties (always restricted to himself) |
|
853 | 853 | } |
854 | 854 | if ($module == 'societe' && $permlevel1 == 'client' && $permlevel2 == 'voir') { |
855 | - return 0; // An external user never has the permission ->societe->client->voir to see all thirdparties (always restricted to himself) |
|
855 | + return 0; // An external user never has the permission ->societe->client->voir to see all thirdparties (always restricted to himself) |
|
856 | 856 | } |
857 | 857 | if ($module == 'societe' && $permlevel1 == 'export') { |
858 | - return 0; // An external user never has the permission ->societe->export to see all thirdparties (always restricted to himself) |
|
858 | + return 0; // An external user never has the permission ->societe->export to see all thirdparties (always restricted to himself) |
|
859 | 859 | } |
860 | 860 | if ($module == 'societe' && ($permlevel1 == 'supprimer' || $permlevel1 == 'delete')) { |
861 | - return 0; // An external user never has the permission ->societe->delete to see all thirdparties (always restricted to himself) |
|
861 | + return 0; // An external user never has the permission ->societe->delete to see all thirdparties (always restricted to himself) |
|
862 | 862 | } |
863 | 863 | } |
864 | 864 | |
@@ -1006,7 +1006,7 @@ discard block |
||
1006 | 1006 | $sql .= " FROM " . $this->db->prefix() . "rights_def"; |
1007 | 1007 | $sql .= " WHERE entity = " . ((int) $entity); |
1008 | 1008 | if (!empty($whereforadd) && $whereforadd != 'allmodules') { |
1009 | - $sql .= " AND (" . $whereforadd . ")"; // Note: parenthesis are important because whereforadd can contains OR. Also note that $whereforadd is already sanitized |
|
1009 | + $sql .= " AND (" . $whereforadd . ")"; // Note: parenthesis are important because whereforadd can contains OR. Also note that $whereforadd is already sanitized |
|
1010 | 1010 | } |
1011 | 1011 | |
1012 | 1012 | $sqldelete = "DELETE FROM " . $this->db->prefix() . "user_rights"; |
@@ -1142,7 +1142,7 @@ discard block |
||
1142 | 1142 | $sql .= " FROM " . $this->db->prefix() . "rights_def"; |
1143 | 1143 | $sql .= " WHERE entity IN (" . $this->db->sanitize($entity, 0, 0, 0, 0) . ")"; |
1144 | 1144 | if (!empty($wherefordel) && $wherefordel != 'allmodules') { |
1145 | - $sql .= " AND (" . $wherefordel . ")"; // Note: parenthesis are important because wherefordel can contains OR. Also note that $wherefordel is already sanitized |
|
1145 | + $sql .= " AND (" . $wherefordel . ")"; // Note: parenthesis are important because wherefordel can contains OR. Also note that $wherefordel is already sanitized |
|
1146 | 1146 | } |
1147 | 1147 | |
1148 | 1148 | // avoid admin to remove his own important rights |
@@ -1316,12 +1316,12 @@ discard block |
||
1316 | 1316 | $sql .= " AND r.entity = " . ((int) $conf->entity); |
1317 | 1317 | } |
1318 | 1318 | } else { |
1319 | - $sql .= " AND gr.entity = " . ((int) $conf->entity); // Only groups created in current entity |
|
1319 | + $sql .= " AND gr.entity = " . ((int) $conf->entity); // Only groups created in current entity |
|
1320 | 1320 | // The entity on the table gu=usergroup_user should be useless and should never be used because it is already into gr and r. |
1321 | 1321 | // but when using MULTICOMPANY_TRANSVERSE_MODE, we may have inserted record that make rubbish result here due to the duplicate record of |
1322 | 1322 | // other entities, so we are forced to add a filter on gu here |
1323 | 1323 | $sql .= " AND gu.entity IN (0," . $conf->entity . ")"; |
1324 | - $sql .= " AND r.entity = " . ((int) $conf->entity); // Only permission of modules enabled in current entity |
|
1324 | + $sql .= " AND r.entity = " . ((int) $conf->entity); // Only permission of modules enabled in current entity |
|
1325 | 1325 | } |
1326 | 1326 | // End of strange business rule |
1327 | 1327 | $sql .= " AND gr.fk_usergroup = gu.fk_usergroup"; |
@@ -2794,7 +2794,7 @@ discard block |
||
2794 | 2794 | $sql .= " WHERE fk_user = " . ((int) $this->id); |
2795 | 2795 | $sql .= " AND fk_usergroup = " . ((int) $group); |
2796 | 2796 | if (empty($entity)) { |
2797 | - $sql .= " AND entity IN (0, 1)"; // group may be in entity 0 (so $entity=0) and link with user into entity 1. |
|
2797 | + $sql .= " AND entity IN (0, 1)"; // group may be in entity 0 (so $entity=0) and link with user into entity 1. |
|
2798 | 2798 | } else { |
2799 | 2799 | $sql .= " AND entity = " . ((int) $entity); |
2800 | 2800 | } |
@@ -3514,7 +3514,7 @@ discard block |
||
3514 | 3514 | $this->iplastlogin = '127.0.0.1'; |
3515 | 3515 | $this->datepreviouslogin = $now; |
3516 | 3516 | $this->ippreviouslogin = '127.0.0.1'; |
3517 | - $this->statut = 1; // deprecated |
|
3517 | + $this->statut = 1; // deprecated |
|
3518 | 3518 | $this->status = 1; |
3519 | 3519 | |
3520 | 3520 | $this->entity = 1; |
@@ -1764,7 +1764,7 @@ discard block |
||
1764 | 1764 | } |
1765 | 1765 | |
1766 | 1766 | |
1767 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1767 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1768 | 1768 | /** |
1769 | 1769 | * Create a user from a contact object. User will be internal but if contact is linked to a third party, user will be external |
1770 | 1770 | * |
@@ -1775,7 +1775,7 @@ discard block |
||
1775 | 1775 | */ |
1776 | 1776 | public function create_from_contact($contact, $login = '', $password = '') |
1777 | 1777 | { |
1778 | - // phpcs:enable |
|
1778 | + // phpcs:enable |
|
1779 | 1779 | global $conf, $user, $langs; |
1780 | 1780 | |
1781 | 1781 | $error = 0; |
@@ -1850,7 +1850,7 @@ discard block |
||
1850 | 1850 | } |
1851 | 1851 | } |
1852 | 1852 | |
1853 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1853 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1854 | 1854 | /** |
1855 | 1855 | * Create a user into database from a member object. |
1856 | 1856 | * If $member->fk_soc is set, it will be an external user. |
@@ -1861,7 +1861,7 @@ discard block |
||
1861 | 1861 | */ |
1862 | 1862 | public function create_from_member($member, $login = '') |
1863 | 1863 | { |
1864 | - // phpcs:enable |
|
1864 | + // phpcs:enable |
|
1865 | 1865 | global $user; |
1866 | 1866 | |
1867 | 1867 | // Set properties on new user |
@@ -1939,7 +1939,7 @@ discard block |
||
1939 | 1939 | } |
1940 | 1940 | } |
1941 | 1941 | |
1942 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1942 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1943 | 1943 | /** |
1944 | 1944 | * Assign rights by default |
1945 | 1945 | * |
@@ -1947,7 +1947,7 @@ discard block |
||
1947 | 1947 | */ |
1948 | 1948 | public function set_default_rights() |
1949 | 1949 | { |
1950 | - // phpcs:enable |
|
1950 | + // phpcs:enable |
|
1951 | 1951 | global $conf; |
1952 | 1952 | |
1953 | 1953 | $rd = array(); |
@@ -2336,7 +2336,7 @@ discard block |
||
2336 | 2336 | } |
2337 | 2337 | } |
2338 | 2338 | |
2339 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2339 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2340 | 2340 | /** |
2341 | 2341 | * Update the user's last login date in the database. |
2342 | 2342 | * Function called when a new connection is made by the user |
@@ -2345,7 +2345,7 @@ discard block |
||
2345 | 2345 | */ |
2346 | 2346 | public function update_last_login_date() |
2347 | 2347 | { |
2348 | - // phpcs:enable |
|
2348 | + // phpcs:enable |
|
2349 | 2349 | $now = dol_now(); |
2350 | 2350 | |
2351 | 2351 | $userremoteip = getUserRemoteIP(); |
@@ -2516,7 +2516,7 @@ discard block |
||
2516 | 2516 | } |
2517 | 2517 | } |
2518 | 2518 | |
2519 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2519 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2520 | 2520 | /** |
2521 | 2521 | * Send a new password (or instructions to reset it) by email |
2522 | 2522 | * |
@@ -2527,7 +2527,7 @@ discard block |
||
2527 | 2527 | */ |
2528 | 2528 | public function send_password($user, $password = '', $changelater = 0) |
2529 | 2529 | { |
2530 | - // phpcs:enable |
|
2530 | + // phpcs:enable |
|
2531 | 2531 | global $conf, $langs, $mysoc; |
2532 | 2532 | global $dolibarr_main_url_root; |
2533 | 2533 | |
@@ -2644,7 +2644,7 @@ discard block |
||
2644 | 2644 | } |
2645 | 2645 | |
2646 | 2646 | |
2647 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2647 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2648 | 2648 | /** |
2649 | 2649 | * Read clicktodial information for user |
2650 | 2650 | * |
@@ -2652,7 +2652,7 @@ discard block |
||
2652 | 2652 | */ |
2653 | 2653 | public function fetch_clicktodial() |
2654 | 2654 | { |
2655 | - // phpcs:enable |
|
2655 | + // phpcs:enable |
|
2656 | 2656 | $sql = "SELECT url, login, pass, poste "; |
2657 | 2657 | $sql .= " FROM " . $this->db->prefix() . "user_clicktodial as u"; |
2658 | 2658 | $sql .= " WHERE u.fk_user = " . ((int) $this->id); |
@@ -2678,7 +2678,7 @@ discard block |
||
2678 | 2678 | } |
2679 | 2679 | } |
2680 | 2680 | |
2681 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2681 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2682 | 2682 | /** |
2683 | 2683 | * Update clicktodial info |
2684 | 2684 | * |
@@ -2686,7 +2686,7 @@ discard block |
||
2686 | 2686 | */ |
2687 | 2687 | public function update_clicktodial() |
2688 | 2688 | { |
2689 | - // phpcs:enable |
|
2689 | + // phpcs:enable |
|
2690 | 2690 | $this->db->begin(); |
2691 | 2691 | |
2692 | 2692 | $sql = "DELETE FROM " . $this->db->prefix() . "user_clicktodial"; |
@@ -2716,7 +2716,7 @@ discard block |
||
2716 | 2716 | } |
2717 | 2717 | |
2718 | 2718 | |
2719 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2719 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2720 | 2720 | /** |
2721 | 2721 | * Add user into a group |
2722 | 2722 | * |
@@ -2727,7 +2727,7 @@ discard block |
||
2727 | 2727 | */ |
2728 | 2728 | public function SetInGroup($group, $entity, $notrigger = 0) |
2729 | 2729 | { |
2730 | - // phpcs:enable |
|
2730 | + // phpcs:enable |
|
2731 | 2731 | global $conf, $langs, $user; |
2732 | 2732 | |
2733 | 2733 | $error = 0; |
@@ -2772,7 +2772,7 @@ discard block |
||
2772 | 2772 | } |
2773 | 2773 | } |
2774 | 2774 | |
2775 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2775 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2776 | 2776 | /** |
2777 | 2777 | * Remove a user from a group |
2778 | 2778 | * |
@@ -2783,7 +2783,7 @@ discard block |
||
2783 | 2783 | */ |
2784 | 2784 | public function RemoveFromGroup($group, $entity, $notrigger = 0) |
2785 | 2785 | { |
2786 | - // phpcs:enable |
|
2786 | + // phpcs:enable |
|
2787 | 2787 | global $conf, $langs, $user; |
2788 | 2788 | |
2789 | 2789 | $error = 0; |
@@ -3176,7 +3176,7 @@ discard block |
||
3176 | 3176 | return $this->LibStatut(isset($this->statut) ? (int) $this->statut : (int) $this->status, $mode); |
3177 | 3177 | } |
3178 | 3178 | |
3179 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3179 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3180 | 3180 | /** |
3181 | 3181 | * Return the label of a status of user (active, inactive) |
3182 | 3182 | * |
@@ -3186,7 +3186,7 @@ discard block |
||
3186 | 3186 | */ |
3187 | 3187 | public function LibStatut($status, $mode = 0) |
3188 | 3188 | { |
3189 | - // phpcs:enable |
|
3189 | + // phpcs:enable |
|
3190 | 3190 | global $langs; |
3191 | 3191 | |
3192 | 3192 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
@@ -3278,8 +3278,8 @@ discard block |
||
3278 | 3278 | } |
3279 | 3279 | |
3280 | 3280 | |
3281 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
3282 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3281 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
3282 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3283 | 3283 | /** |
3284 | 3284 | * Retourne chaine DN complete dans l'annuaire LDAP pour l'objet |
3285 | 3285 | * |
@@ -3291,7 +3291,7 @@ discard block |
||
3291 | 3291 | */ |
3292 | 3292 | public function _load_ldap_dn($info, $mode = 0) |
3293 | 3293 | { |
3294 | - // phpcs:enable |
|
3294 | + // phpcs:enable |
|
3295 | 3295 | global $conf; |
3296 | 3296 | $dn = ''; |
3297 | 3297 | if ($mode == 0) { |
@@ -3304,8 +3304,8 @@ discard block |
||
3304 | 3304 | return $dn; |
3305 | 3305 | } |
3306 | 3306 | |
3307 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
3308 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3307 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
3308 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3309 | 3309 | /** |
3310 | 3310 | * Initialize the info array (array of LDAP values) that will be used to call LDAP functions |
3311 | 3311 | * |
@@ -3313,7 +3313,7 @@ discard block |
||
3313 | 3313 | */ |
3314 | 3314 | public function _load_ldap_info() |
3315 | 3315 | { |
3316 | - // phpcs:enable |
|
3316 | + // phpcs:enable |
|
3317 | 3317 | global $conf, $langs; |
3318 | 3318 | |
3319 | 3319 | $info = array(); |
@@ -3619,7 +3619,7 @@ discard block |
||
3619 | 3619 | } |
3620 | 3620 | } |
3621 | 3621 | |
3622 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3622 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3623 | 3623 | /** |
3624 | 3624 | * Update user using data from the LDAP |
3625 | 3625 | * |
@@ -3628,7 +3628,7 @@ discard block |
||
3628 | 3628 | */ |
3629 | 3629 | public function update_ldap2dolibarr(&$ldapuser) |
3630 | 3630 | { |
3631 | - // phpcs:enable |
|
3631 | + // phpcs:enable |
|
3632 | 3632 | // TODO: Voir pourquoi le update met à jour avec toutes les valeurs vide (global $user écrase ?) |
3633 | 3633 | global $user, $conf; |
3634 | 3634 | |
@@ -3673,7 +3673,7 @@ discard block |
||
3673 | 3673 | } |
3674 | 3674 | |
3675 | 3675 | |
3676 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3676 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3677 | 3677 | /** |
3678 | 3678 | * Return and array with all instantiated first level children users of current user |
3679 | 3679 | * |
@@ -3682,7 +3682,7 @@ discard block |
||
3682 | 3682 | */ |
3683 | 3683 | public function get_children() |
3684 | 3684 | { |
3685 | - // phpcs:enable |
|
3685 | + // phpcs:enable |
|
3686 | 3686 | $sql = "SELECT rowid FROM " . $this->db->prefix() . "user"; |
3687 | 3687 | $sql .= " WHERE fk_user = " . ((int) $this->id); |
3688 | 3688 | |
@@ -3733,7 +3733,7 @@ discard block |
||
3733 | 3733 | } |
3734 | 3734 | } |
3735 | 3735 | |
3736 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3736 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3737 | 3737 | /** |
3738 | 3738 | * Build the hierarchy/tree of users into an array. |
3739 | 3739 | * Set and return this->users that is an array sorted according to tree with arrays of: |
@@ -3749,7 +3749,7 @@ discard block |
||
3749 | 3749 | */ |
3750 | 3750 | public function get_full_tree($deleteafterid = 0, $filter = '') |
3751 | 3751 | { |
3752 | - // phpcs:enable |
|
3752 | + // phpcs:enable |
|
3753 | 3753 | global $conf, $user; |
3754 | 3754 | global $hookmanager; |
3755 | 3755 | |
@@ -3878,7 +3878,7 @@ discard block |
||
3878 | 3878 | return $childids; |
3879 | 3879 | } |
3880 | 3880 | |
3881 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3881 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3882 | 3882 | /** |
3883 | 3883 | * For user id_user and its children available in this->users, define property fullpath and fullname. |
3884 | 3884 | * Function called by get_full_tree(). |
@@ -3889,7 +3889,7 @@ discard block |
||
3889 | 3889 | */ |
3890 | 3890 | public function build_path_from_id_user($id_user, $protection = 0) |
3891 | 3891 | { |
3892 | - // phpcs:enable |
|
3892 | + // phpcs:enable |
|
3893 | 3893 | //dol_syslog(get_only_class($this)."::build_path_from_id_user id_user=".$id_user." protection=".$protection, LOG_DEBUG); |
3894 | 3894 | |
3895 | 3895 | if (!empty($this->users[$id_user]['fullpath'])) { |
@@ -4009,7 +4009,7 @@ discard block |
||
4009 | 4009 | return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); |
4010 | 4010 | } |
4011 | 4011 | |
4012 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
4012 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
4013 | 4013 | /** |
4014 | 4014 | * Return property of user from its id |
4015 | 4015 | * |
@@ -4019,7 +4019,7 @@ discard block |
||
4019 | 4019 | */ |
4020 | 4020 | public function user_get_property($rowid, $mode) |
4021 | 4021 | { |
4022 | - // phpcs:enable |
|
4022 | + // phpcs:enable |
|
4023 | 4023 | $user_property = ''; |
4024 | 4024 | |
4025 | 4025 | if (empty($rowid)) { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $this->db = $db; |
65 | 65 | } |
66 | 66 | |
67 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
67 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
68 | 68 | |
69 | 69 | /** |
70 | 70 | * Output a combo list with projects qualified for a third party / user |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function select_projects($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 16, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $morecss = '', $htmlid = '', $morefilter = '') |
91 | 91 | { |
92 | - // phpcs:enable |
|
92 | + // phpcs:enable |
|
93 | 93 | global $langs, $conf, $form; |
94 | 94 | |
95 | 95 | $selected_input_value = ''; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | } |
133 | 133 | } |
134 | 134 | |
135 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
135 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
136 | 136 | |
137 | 137 | /** |
138 | 138 | * Returns an array with projects qualified for a third party |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | */ |
158 | 158 | public function select_projects_list($socid = -1, $selected = 0, $htmlname = 'projectid', $maxlength = 24, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $htmlid = '', $morecss = 'maxwidth500', $morefilter = '') |
159 | 159 | { |
160 | - // phpcs:enable |
|
160 | + // phpcs:enable |
|
161 | 161 | global $user, $conf, $langs; |
162 | 162 | |
163 | 163 | |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | } |
530 | 530 | |
531 | 531 | |
532 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
532 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
533 | 533 | |
534 | 534 | /** |
535 | 535 | * Build a HTML select list of element of same thirdparty to suggest to link them to project |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | */ |
545 | 545 | public function select_element($table_element, $socid = 0, $morecss = '', $limitonstatus = -2, $projectkey = "fk_projet", $placeholder = '') |
546 | 546 | { |
547 | - // phpcs:enable |
|
547 | + // phpcs:enable |
|
548 | 548 | global $conf, $langs; |
549 | 549 | |
550 | 550 | if ($table_element == 'projet_task') { |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | } |
491 | 491 | |
492 | 492 | |
493 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
493 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
494 | 494 | /** |
495 | 495 | * Add a link between bank line record and its source |
496 | 496 | * |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | */ |
504 | 504 | public function add_url_line($line_id, $url_id, $url, $label, $type) |
505 | 505 | { |
506 | - // phpcs:enable |
|
506 | + // phpcs:enable |
|
507 | 507 | $sql = "INSERT INTO " . MAIN_DB_PREFIX . "bank_url ("; |
508 | 508 | $sql .= "fk_bank"; |
509 | 509 | $sql .= ", url_id"; |
@@ -528,7 +528,7 @@ discard block |
||
528 | 528 | } |
529 | 529 | } |
530 | 530 | |
531 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
531 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
532 | 532 | /** |
533 | 533 | * TODO Move this into AccountLine |
534 | 534 | * Return array with links from llx_bank_url |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | */ |
541 | 541 | public function get_url($fk_bank = 0, $url_id = 0, $type = '') |
542 | 542 | { |
543 | - // phpcs:enable |
|
543 | + // phpcs:enable |
|
544 | 544 | $lines = array(); |
545 | 545 | |
546 | 546 | // Check parameters |
@@ -998,7 +998,7 @@ discard block |
||
998 | 998 | } |
999 | 999 | |
1000 | 1000 | |
1001 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1001 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1002 | 1002 | /** |
1003 | 1003 | * Update BBAN (RIB) account fields |
1004 | 1004 | * |
@@ -1007,7 +1007,7 @@ discard block |
||
1007 | 1007 | */ |
1008 | 1008 | public function update_bban(User $user = null) |
1009 | 1009 | { |
1010 | - // phpcs:enable |
|
1010 | + // phpcs:enable |
|
1011 | 1011 | global $conf, $langs; |
1012 | 1012 | |
1013 | 1013 | // Load library to get BAN control function |
@@ -1245,7 +1245,7 @@ discard block |
||
1245 | 1245 | return $this->LibStatut($this->status, $mode); |
1246 | 1246 | } |
1247 | 1247 | |
1248 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1248 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1249 | 1249 | /** |
1250 | 1250 | * Return label of given object status |
1251 | 1251 | * |
@@ -1255,7 +1255,7 @@ discard block |
||
1255 | 1255 | */ |
1256 | 1256 | public function LibStatut($status, $mode = 0) |
1257 | 1257 | { |
1258 | - // phpcs:enable |
|
1258 | + // phpcs:enable |
|
1259 | 1259 | global $langs; |
1260 | 1260 | $langs->load('banks'); |
1261 | 1261 | |
@@ -1273,7 +1273,7 @@ discard block |
||
1273 | 1273 | } |
1274 | 1274 | |
1275 | 1275 | |
1276 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1276 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1277 | 1277 | /** |
1278 | 1278 | * Indicates if an account can be deleted or not (without movements) |
1279 | 1279 | * |
@@ -1281,7 +1281,7 @@ discard block |
||
1281 | 1281 | */ |
1282 | 1282 | public function can_be_deleted() |
1283 | 1283 | { |
1284 | - // phpcs:enable |
|
1284 | + // phpcs:enable |
|
1285 | 1285 | $can_be_deleted = false; |
1286 | 1286 | |
1287 | 1287 | $sql = "SELECT COUNT(rowid) as nb"; |
@@ -1345,7 +1345,7 @@ discard block |
||
1345 | 1345 | return (float) price2num($solde, 'MU'); |
1346 | 1346 | } |
1347 | 1347 | |
1348 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1348 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1349 | 1349 | /** |
1350 | 1350 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
1351 | 1351 | * |
@@ -1355,7 +1355,7 @@ discard block |
||
1355 | 1355 | */ |
1356 | 1356 | public function load_board(User $user, $filteraccountid = 0) |
1357 | 1357 | { |
1358 | - // phpcs:enable |
|
1358 | + // phpcs:enable |
|
1359 | 1359 | global $conf, $langs; |
1360 | 1360 | |
1361 | 1361 | if ($user->socid) { |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | //! Numero d'erreur Plage 1024-1279 |
60 | 60 | public $errno; |
61 | 61 | |
62 | - public $type = 'CHQ'; // 'CHQ', 'TRA', ... |
|
62 | + public $type = 'CHQ'; // 'CHQ', 'TRA', ... |
|
63 | 63 | |
64 | 64 | public $amount; |
65 | 65 | public $date_bordereau; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_account as ba ON bc.fk_bank_account = ba.rowid"; |
106 | 106 | $sql .= " WHERE bc.entity = " . $conf->entity; |
107 | 107 | if ($id) { |
108 | - $sql .= " AND bc.rowid = " . ((int)$id); |
|
108 | + $sql .= " AND bc.rowid = " . ((int) $id); |
|
109 | 109 | } |
110 | 110 | if ($ref) { |
111 | 111 | $sql .= " AND bc.ref = '" . $this->db->escape($ref) . "'"; |
@@ -183,12 +183,12 @@ discard block |
||
183 | 183 | $sql .= ") VALUES ("; |
184 | 184 | $sql .= "'" . $this->db->idate($now) . "'"; |
185 | 185 | $sql .= ", '" . $this->db->idate($now) . "'"; |
186 | - $sql .= ", " . ((int)$user->id); |
|
187 | - $sql .= ", " . ((int)$account_id); |
|
186 | + $sql .= ", " . ((int) $user->id); |
|
187 | + $sql .= ", " . ((int) $account_id); |
|
188 | 188 | $sql .= ", 0"; |
189 | 189 | $sql .= ", 0"; |
190 | 190 | $sql .= ", 0"; |
191 | - $sql .= ", " . ((int)$conf->entity); |
|
191 | + $sql .= ", " . ((int) $conf->entity); |
|
192 | 192 | $sql .= ", 0"; |
193 | 193 | $sql .= ", ''"; |
194 | 194 | $sql .= ", '" . $this->db->escape($this->type) . "'"; |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | if ($this->id > 0 && $this->errno == 0) { |
206 | 206 | $sql = "UPDATE " . MAIN_DB_PREFIX . "bordereau_cheque"; |
207 | 207 | $sql .= " SET ref = '(PROV" . $this->id . ")'"; |
208 | - $sql .= " WHERE rowid=" . ((int)$this->id); |
|
208 | + $sql .= " WHERE rowid=" . ((int) $this->id); |
|
209 | 209 | |
210 | 210 | $resql = $this->db->query($sql); |
211 | 211 | if (!$resql) { |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | $sql .= " WHERE b.fk_type = '" . $this->db->escape($this->type) . "'"; |
223 | 223 | $sql .= " AND b.amount > 0"; |
224 | 224 | $sql .= " AND b.fk_bordereau = 0"; |
225 | - $sql .= " AND b.fk_account = " . ((int)$account_id); |
|
225 | + $sql .= " AND b.fk_account = " . ((int) $account_id); |
|
226 | 226 | if ($limit) { |
227 | 227 | $sql .= $this->db->plimit($limit); |
228 | 228 | } |
@@ -251,8 +251,8 @@ discard block |
||
251 | 251 | |
252 | 252 | if ($checkremise) { |
253 | 253 | $sql = "UPDATE " . MAIN_DB_PREFIX . "bank"; |
254 | - $sql .= " SET fk_bordereau = " . ((int)$this->id); |
|
255 | - $sql .= " WHERE rowid = " . ((int)$lineid); |
|
254 | + $sql .= " SET fk_bordereau = " . ((int) $this->id); |
|
255 | + $sql .= " WHERE rowid = " . ((int) $lineid); |
|
256 | 256 | |
257 | 257 | $resql = $this->db->query($sql); |
258 | 258 | if (!$resql) { |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | $this->db->begin(); |
307 | 307 | |
308 | 308 | $sql = "DELETE FROM " . MAIN_DB_PREFIX . "bordereau_cheque"; |
309 | - $sql .= " WHERE rowid = " . ((int)$this->id); |
|
309 | + $sql .= " WHERE rowid = " . ((int) $this->id); |
|
310 | 310 | $sql .= " AND entity = " . $conf->entity; |
311 | 311 | |
312 | 312 | $resql = $this->db->query($sql); |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | if ($this->errno === 0) { |
322 | 322 | $sql = "UPDATE " . MAIN_DB_PREFIX . "bank"; |
323 | 323 | $sql .= " SET fk_bordereau = 0"; |
324 | - $sql .= " WHERE fk_bordereau = " . ((int)$this->id); |
|
324 | + $sql .= " WHERE fk_bordereau = " . ((int) $this->id); |
|
325 | 325 | |
326 | 326 | $resql = $this->db->query($sql); |
327 | 327 | if (!$resql) { |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | if ($this->errno == 0 && $numref) { |
361 | 361 | $sql = "UPDATE " . MAIN_DB_PREFIX . "bordereau_cheque"; |
362 | 362 | $sql .= " SET statut = 1, ref = '" . $this->db->escape($numref) . "'"; |
363 | - $sql .= " WHERE rowid = " . ((int)$this->id); |
|
363 | + $sql .= " WHERE rowid = " . ((int) $this->id); |
|
364 | 364 | $sql .= " AND entity = " . $conf->entity; |
365 | 365 | $sql .= " AND statut = 0"; |
366 | 366 | |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | $classname = getDolGlobalString('CHEQUERECEIPTS_ADDON'); |
422 | 422 | |
423 | 423 | // Include file with class |
424 | - $dirmodels = array_merge(array('/'), (array)$conf->modules_parts['models']); |
|
424 | + $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']); |
|
425 | 425 | |
426 | 426 | foreach ($dirmodels as $reldir) { |
427 | 427 | $dir = dol_buildpath($reldir . "core/modules/cheque/"); |
@@ -603,7 +603,7 @@ discard block |
||
603 | 603 | $sql .= ", " . MAIN_DB_PREFIX . "bordereau_cheque as bc"; |
604 | 604 | $sql .= " WHERE b.fk_account = ba.rowid"; |
605 | 605 | $sql .= " AND b.fk_bordereau = bc.rowid"; |
606 | - $sql .= " AND bc.rowid = " . ((int)$this->id); |
|
606 | + $sql .= " AND bc.rowid = " . ((int) $this->id); |
|
607 | 607 | $sql .= " AND bc.entity = " . $conf->entity; |
608 | 608 | $sql .= " ORDER BY b.dateo ASC, b.rowid ASC"; |
609 | 609 | |
@@ -666,7 +666,7 @@ discard block |
||
666 | 666 | $nb = 0; |
667 | 667 | $sql = "SELECT amount "; |
668 | 668 | $sql .= " FROM " . MAIN_DB_PREFIX . "bank"; |
669 | - $sql .= " WHERE fk_bordereau = " . ((int)$this->id); |
|
669 | + $sql .= " WHERE fk_bordereau = " . ((int) $this->id); |
|
670 | 670 | |
671 | 671 | $resql = $this->db->query($sql); |
672 | 672 | if ($resql) { |
@@ -679,9 +679,9 @@ discard block |
||
679 | 679 | |
680 | 680 | $sql = "UPDATE " . MAIN_DB_PREFIX . "bordereau_cheque"; |
681 | 681 | $sql .= " SET amount = " . price2num($total); |
682 | - $sql .= ", nbcheque = " . ((int)$nb); |
|
683 | - $sql .= " WHERE rowid = " . ((int)$this->id); |
|
684 | - $sql .= " AND entity = " . ((int)$conf->entity); |
|
682 | + $sql .= ", nbcheque = " . ((int) $nb); |
|
683 | + $sql .= " WHERE rowid = " . ((int) $this->id); |
|
684 | + $sql .= " AND entity = " . ((int) $conf->entity); |
|
685 | 685 | |
686 | 686 | $resql = $this->db->query($sql); |
687 | 687 | if (!$resql) { |
@@ -716,8 +716,8 @@ discard block |
||
716 | 716 | if ($this->id > 0) { |
717 | 717 | $sql = "UPDATE " . MAIN_DB_PREFIX . "bank"; |
718 | 718 | $sql .= " SET fk_bordereau = 0"; |
719 | - $sql .= " WHERE rowid = " . ((int)$account_id); |
|
720 | - $sql .= " AND fk_bordereau = " . ((int)$this->id); |
|
719 | + $sql .= " WHERE rowid = " . ((int) $account_id); |
|
720 | + $sql .= " AND fk_bordereau = " . ((int) $this->id); |
|
721 | 721 | |
722 | 722 | $resql = $this->db->query($sql); |
723 | 723 | if ($resql) { |
@@ -765,7 +765,7 @@ discard block |
||
765 | 765 | // Get invoices list to reopen them |
766 | 766 | $sql = 'SELECT pf.fk_facture, pf.amount'; |
767 | 767 | $sql .= ' FROM ' . MAIN_DB_PREFIX . 'paiement_facture as pf'; |
768 | - $sql .= ' WHERE pf.fk_paiement = ' . ((int)$payment->id); |
|
768 | + $sql .= ' WHERE pf.fk_paiement = ' . ((int) $payment->id); |
|
769 | 769 | |
770 | 770 | $resql = $this->db->query($sql); |
771 | 771 | if ($resql) { |
@@ -830,7 +830,7 @@ discard block |
||
830 | 830 | if ($user->hasRight('banque', 'cheque')) { |
831 | 831 | $sql = "UPDATE " . MAIN_DB_PREFIX . "bordereau_cheque"; |
832 | 832 | $sql .= " SET date_bordereau = " . ($date ? "'" . $this->db->idate($date) . "'" : 'null'); |
833 | - $sql .= " WHERE rowid = " . ((int)$this->id); |
|
833 | + $sql .= " WHERE rowid = " . ((int) $this->id); |
|
834 | 834 | |
835 | 835 | dol_syslog("RemiseCheque::set_date", LOG_DEBUG); |
836 | 836 | $resql = $this->db->query($sql); |
@@ -861,7 +861,7 @@ discard block |
||
861 | 861 | if ($user->hasRight('banque', 'cheque')) { |
862 | 862 | $sql = "UPDATE " . MAIN_DB_PREFIX . "bordereau_cheque"; |
863 | 863 | $sql .= " SET ref = '" . $this->db->escape($ref) . "'"; |
864 | - $sql .= " WHERE rowid = " . ((int)$this->id); |
|
864 | + $sql .= " WHERE rowid = " . ((int) $this->id); |
|
865 | 865 | |
866 | 866 | dol_syslog("RemiseCheque::set_number", LOG_DEBUG); |
867 | 867 | $resql = $this->db->query($sql); |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | if (!$error) { |
120 | - $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . ((int)$this->id); |
|
120 | + $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . ((int) $this->id); |
|
121 | 121 | |
122 | 122 | $res = $this->db->query($sql); |
123 | 123 | if (!$res) { |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc'; |
158 | 158 | $sql .= ' FROM ' . MAIN_DB_PREFIX . 'facturedet_rec as l'; |
159 | 159 | $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product as p ON l.fk_product = p.rowid'; |
160 | - $sql .= ' WHERE l.rowid = ' . ((int)$rowid); |
|
160 | + $sql .= ' WHERE l.rowid = ' . ((int) $rowid); |
|
161 | 161 | $sql .= ' ORDER BY l.rang'; |
162 | 162 | |
163 | 163 | dol_syslog('FactureRec::fetch', LOG_DEBUG); |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'; |
246 | 246 | |
247 | 247 | $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet_rec SET"; |
248 | - $sql .= " fk_facture = " . ((int)$this->fk_facture); |
|
248 | + $sql .= " fk_facture = " . ((int) $this->fk_facture); |
|
249 | 249 | $sql .= ", fk_parent_line=" . ($this->fk_parent_line > 0 ? $this->fk_parent_line : "null"); |
250 | 250 | $sql .= ", label=" . (!empty($this->label) ? "'" . $this->db->escape($this->label) . "'" : "null"); |
251 | 251 | $sql .= ", description='" . $this->db->escape($this->desc) . "'"; |
@@ -258,12 +258,12 @@ discard block |
||
258 | 258 | $sql .= ", localtax2_tx=" . price2num($this->localtax2_tx); |
259 | 259 | $sql .= ", localtax2_type='" . $this->db->escape($this->localtax2_type) . "'"; |
260 | 260 | $sql .= ", fk_product=" . ($this->fk_product > 0 ? $this->fk_product : "null"); |
261 | - $sql .= ", product_type=" . ((int)$this->product_type); |
|
261 | + $sql .= ", product_type=" . ((int) $this->product_type); |
|
262 | 262 | $sql .= ", remise_percent=" . price2num($this->remise_percent); |
263 | 263 | $sql .= ", subprice=" . price2num($this->subprice); |
264 | 264 | $sql .= ", info_bits=" . price2num($this->info_bits); |
265 | - $sql .= ", date_start_fill=" . (int)$this->date_start_fill; |
|
266 | - $sql .= ", date_end_fill=" . (int)$this->date_end_fill; |
|
265 | + $sql .= ", date_start_fill=" . (int) $this->date_start_fill; |
|
266 | + $sql .= ", date_end_fill=" . (int) $this->date_end_fill; |
|
267 | 267 | if (empty($this->skip_update_total)) { |
268 | 268 | $sql .= ", total_ht=" . price2num($this->total_ht); |
269 | 269 | $sql .= ", total_tva=" . price2num($this->total_tva); |
@@ -271,11 +271,11 @@ discard block |
||
271 | 271 | $sql .= ", total_localtax2=" . price2num($this->total_localtax2); |
272 | 272 | $sql .= ", total_ttc=" . price2num($this->total_ttc); |
273 | 273 | } |
274 | - $sql .= ", rang=" . ((int)$this->rang); |
|
275 | - $sql .= ", special_code=" . ((int)$this->special_code); |
|
274 | + $sql .= ", rang=" . ((int) $this->rang); |
|
275 | + $sql .= ", special_code=" . ((int) $this->special_code); |
|
276 | 276 | $sql .= ", fk_unit=" . ($this->fk_unit ? "'" . $this->db->escape($this->fk_unit) . "'" : "null"); |
277 | 277 | $sql .= ", fk_contract_line=" . ($this->fk_contract_line ? $this->fk_contract_line : "null"); |
278 | - $sql .= " WHERE rowid = " . ((int)$this->id); |
|
278 | + $sql .= " WHERE rowid = " . ((int) $this->id); |
|
279 | 279 | |
280 | 280 | $this->db->begin(); |
281 | 281 |
@@ -886,7 +886,7 @@ discard block |
||
886 | 886 | } |
887 | 887 | |
888 | 888 | |
889 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
889 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
890 | 890 | /** |
891 | 891 | * Mise a jour du lien entre le paiement et la ligne generee dans llx_bank |
892 | 892 | * |
@@ -895,7 +895,7 @@ discard block |
||
895 | 895 | */ |
896 | 896 | public function update_fk_bank($id_bank) |
897 | 897 | { |
898 | - // phpcs:enable |
|
898 | + // phpcs:enable |
|
899 | 899 | $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' set fk_bank = ' . ((int) $id_bank); |
900 | 900 | $sql .= " WHERE rowid = " . ((int) $this->id); |
901 | 901 | |
@@ -910,7 +910,7 @@ discard block |
||
910 | 910 | } |
911 | 911 | } |
912 | 912 | |
913 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
913 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
914 | 914 | /** |
915 | 915 | * Updates the payment date |
916 | 916 | * |
@@ -919,7 +919,7 @@ discard block |
||
919 | 919 | */ |
920 | 920 | public function update_date($date) |
921 | 921 | { |
922 | - // phpcs:enable |
|
922 | + // phpcs:enable |
|
923 | 923 | $error = 0; |
924 | 924 | |
925 | 925 | if (!empty($date) && $this->statut != 1) { |
@@ -967,7 +967,7 @@ discard block |
||
967 | 967 | return -1; //no date given or already validated |
968 | 968 | } |
969 | 969 | |
970 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
970 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
971 | 971 | /** |
972 | 972 | * Updates the payment number |
973 | 973 | * |
@@ -976,7 +976,7 @@ discard block |
||
976 | 976 | */ |
977 | 977 | public function update_num($num_payment) |
978 | 978 | { |
979 | - // phpcs:enable |
|
979 | + // phpcs:enable |
|
980 | 980 | if (!empty($num_payment) && $this->statut != 1) { |
981 | 981 | $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element; |
982 | 982 | $sql .= " SET num_paiement = '" . $this->db->escape($num_payment) . "'"; |
@@ -1373,7 +1373,7 @@ discard block |
||
1373 | 1373 | return $this->LibStatut($this->statut, $mode); |
1374 | 1374 | } |
1375 | 1375 | |
1376 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1376 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1377 | 1377 | /** |
1378 | 1378 | * Return the label of a given status |
1379 | 1379 | * |
@@ -1383,7 +1383,7 @@ discard block |
||
1383 | 1383 | */ |
1384 | 1384 | public function LibStatut($status, $mode = 0) |
1385 | 1385 | { |
1386 | - // phpcs:enable |
|
1386 | + // phpcs:enable |
|
1387 | 1387 | global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage |
1388 | 1388 | |
1389 | 1389 | $langs->load('compta'); |
@@ -1425,7 +1425,7 @@ discard block |
||
1425 | 1425 | return ''; |
1426 | 1426 | } |
1427 | 1427 | |
1428 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1428 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1429 | 1429 | /** |
1430 | 1430 | * Load the third party of object, from id into this->thirdparty. |
1431 | 1431 | * For payments, take the thirdparty linked to the first invoice found. This is enough because payments are done on invoices of the same thirdparty. |
@@ -1435,7 +1435,7 @@ discard block |
||
1435 | 1435 | */ |
1436 | 1436 | public function fetch_thirdparty($force_thirdparty_id = 0) |
1437 | 1437 | { |
1438 | - // phpcs:enable |
|
1438 | + // phpcs:enable |
|
1439 | 1439 | |
1440 | 1440 | if (empty($force_thirdparty_id)) { |
1441 | 1441 | $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | $this->db = $db; |
167 | 167 | } |
168 | 168 | |
169 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
169 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
170 | 170 | /** |
171 | 171 | * Add a movement of stock (in one direction only). |
172 | 172 | * This is the lowest level method to record a stock change. There is no control if warehouse is open or not. |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | */ |
197 | 197 | public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0, $donotcleanemptylines = 0, $force_update_batch = false) |
198 | 198 | { |
199 | - // phpcs:enable |
|
199 | + // phpcs:enable |
|
200 | 200 | global $conf, $langs; |
201 | 201 | |
202 | 202 | |
@@ -965,7 +965,7 @@ discard block |
||
965 | 965 | return $result; |
966 | 966 | } |
967 | 967 | |
968 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
968 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
969 | 969 | /** |
970 | 970 | * Return Url link of origin object |
971 | 971 | * |
@@ -975,7 +975,7 @@ discard block |
||
975 | 975 | */ |
976 | 976 | public function get_origin($origin_id, $origin_type) |
977 | 977 | { |
978 | - // phpcs:enable |
|
978 | + // phpcs:enable |
|
979 | 979 | $origin = ''; |
980 | 980 | |
981 | 981 | switch ($origin_type) { |
@@ -1188,7 +1188,7 @@ discard block |
||
1188 | 1188 | return $this->LibStatut($mode); |
1189 | 1189 | } |
1190 | 1190 | |
1191 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1191 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1192 | 1192 | /** |
1193 | 1193 | * Return the label of the status |
1194 | 1194 | * |
@@ -1197,7 +1197,7 @@ discard block |
||
1197 | 1197 | */ |
1198 | 1198 | public function LibStatut($mode = 0) |
1199 | 1199 | { |
1200 | - // phpcs:enable |
|
1200 | + // phpcs:enable |
|
1201 | 1201 | global $langs; |
1202 | 1202 | |
1203 | 1203 | if ($mode == 0 || $mode == 1) { |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | } |
404 | 404 | |
405 | 405 | |
406 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
406 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
407 | 407 | /** |
408 | 408 | * Function sending an email to the current member with the text supplied in parameter. |
409 | 409 | * |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | */ |
425 | 425 | public function send_an_email($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '', $moreinheader = '') |
426 | 426 | { |
427 | - // phpcs:enable |
|
427 | + // phpcs:enable |
|
428 | 428 | dol_syslog('Warning using deprecated Adherent::send_an_email', LOG_WARNING); |
429 | 429 | |
430 | 430 | return $this->sendEmail($text, $subject, $filename_list, $mimetype_list, $mimefilename_list, $addr_cc, $addr_bcc, $deliveryreceipt, $msgishtml, $errors_to, $moreinheader); |
@@ -1009,7 +1009,7 @@ discard block |
||
1009 | 1009 | } |
1010 | 1010 | |
1011 | 1011 | |
1012 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1012 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1013 | 1013 | /** |
1014 | 1014 | * Update denormalized last subscription date. |
1015 | 1015 | * This function is called when we delete a subscription for example. |
@@ -1019,7 +1019,7 @@ discard block |
||
1019 | 1019 | */ |
1020 | 1020 | public function update_end_date($user) |
1021 | 1021 | { |
1022 | - // phpcs:enable |
|
1022 | + // phpcs:enable |
|
1023 | 1023 | $this->db->begin(); |
1024 | 1024 | |
1025 | 1025 | // Search for last subscription id and end date |
@@ -1329,7 +1329,7 @@ discard block |
||
1329 | 1329 | } |
1330 | 1330 | |
1331 | 1331 | |
1332 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1332 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1333 | 1333 | /** |
1334 | 1334 | * Method to load member from its login |
1335 | 1335 | * |
@@ -1338,7 +1338,7 @@ discard block |
||
1338 | 1338 | */ |
1339 | 1339 | public function fetch_login($login) |
1340 | 1340 | { |
1341 | - // phpcs:enable |
|
1341 | + // phpcs:enable |
|
1342 | 1342 | global $conf; |
1343 | 1343 | |
1344 | 1344 | $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "adherent"; |
@@ -1356,7 +1356,7 @@ discard block |
||
1356 | 1356 | } |
1357 | 1357 | } |
1358 | 1358 | |
1359 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1359 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1360 | 1360 | /** |
1361 | 1361 | * Method to load member from its name |
1362 | 1362 | * |
@@ -1366,7 +1366,7 @@ discard block |
||
1366 | 1366 | */ |
1367 | 1367 | public function fetch_name($firstname, $lastname) |
1368 | 1368 | { |
1369 | - // phpcs:enable |
|
1369 | + // phpcs:enable |
|
1370 | 1370 | global $conf; |
1371 | 1371 | |
1372 | 1372 | $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "adherent"; |
@@ -1537,7 +1537,7 @@ discard block |
||
1537 | 1537 | } |
1538 | 1538 | |
1539 | 1539 | |
1540 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1540 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1541 | 1541 | /** |
1542 | 1542 | * Function to get member subscriptions data: |
1543 | 1543 | * subscriptions, |
@@ -1548,7 +1548,7 @@ discard block |
||
1548 | 1548 | */ |
1549 | 1549 | public function fetch_subscriptions() |
1550 | 1550 | { |
1551 | - // phpcs:enable |
|
1551 | + // phpcs:enable |
|
1552 | 1552 | global $langs; |
1553 | 1553 | |
1554 | 1554 | |
@@ -2109,7 +2109,7 @@ discard block |
||
2109 | 2109 | } |
2110 | 2110 | } |
2111 | 2111 | |
2112 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2112 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2113 | 2113 | /** |
2114 | 2114 | * Function to add member into external tools mailing-list, spip, etc. |
2115 | 2115 | * |
@@ -2117,7 +2117,7 @@ discard block |
||
2117 | 2117 | */ |
2118 | 2118 | public function add_to_abo() |
2119 | 2119 | { |
2120 | - // phpcs:enable |
|
2120 | + // phpcs:enable |
|
2121 | 2121 | global $langs; |
2122 | 2122 | |
2123 | 2123 | include_once DOL_DOCUMENT_ROOT . '/mailmanspip/class/mailmanspip.class.php'; |
@@ -2161,7 +2161,7 @@ discard block |
||
2161 | 2161 | } |
2162 | 2162 | |
2163 | 2163 | |
2164 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2164 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2165 | 2165 | /** |
2166 | 2166 | * Function to delete a member from external tools like mailing-list, spip, etc. |
2167 | 2167 | * |
@@ -2169,7 +2169,7 @@ discard block |
||
2169 | 2169 | */ |
2170 | 2170 | public function del_to_abo() |
2171 | 2171 | { |
2172 | - // phpcs:enable |
|
2172 | + // phpcs:enable |
|
2173 | 2173 | global $conf, $langs; |
2174 | 2174 | |
2175 | 2175 | include_once DOL_DOCUMENT_ROOT . '/mailmanspip/class/mailmanspip.class.php'; |
@@ -2428,7 +2428,7 @@ discard block |
||
2428 | 2428 | return $this->LibStatut($this->statut, $this->need_subscription, $this->datefin, $mode); |
2429 | 2429 | } |
2430 | 2430 | |
2431 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2431 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2432 | 2432 | /** |
2433 | 2433 | * Renvoi le libelle d'un statut donne |
2434 | 2434 | * |
@@ -2440,7 +2440,7 @@ discard block |
||
2440 | 2440 | */ |
2441 | 2441 | public function LibStatut($status, $need_subscription, $date_end_subscription, $mode = 0) |
2442 | 2442 | { |
2443 | - // phpcs:enable |
|
2443 | + // phpcs:enable |
|
2444 | 2444 | global $langs; |
2445 | 2445 | $langs->load("members"); |
2446 | 2446 | |
@@ -2514,7 +2514,7 @@ discard block |
||
2514 | 2514 | } |
2515 | 2515 | } |
2516 | 2516 | |
2517 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2517 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2518 | 2518 | /** |
2519 | 2519 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
2520 | 2520 | * |
@@ -2524,7 +2524,7 @@ discard block |
||
2524 | 2524 | */ |
2525 | 2525 | public function load_board($user, $mode) |
2526 | 2526 | { |
2527 | - // phpcs:enable |
|
2527 | + // phpcs:enable |
|
2528 | 2528 | global $conf, $langs; |
2529 | 2529 | |
2530 | 2530 | if ($user->socid) { |
@@ -2698,8 +2698,8 @@ discard block |
||
2698 | 2698 | } |
2699 | 2699 | |
2700 | 2700 | |
2701 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2702 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
2701 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2702 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
2703 | 2703 | /** |
2704 | 2704 | * Retourne chaine DN complete dans l'annuaire LDAP pour l'objet |
2705 | 2705 | * |
@@ -2711,7 +2711,7 @@ discard block |
||
2711 | 2711 | */ |
2712 | 2712 | public function _load_ldap_dn($info, $mode = 0) |
2713 | 2713 | { |
2714 | - // phpcs:enable |
|
2714 | + // phpcs:enable |
|
2715 | 2715 | global $conf; |
2716 | 2716 | $dn = ''; |
2717 | 2717 | if ($mode == 0) { |
@@ -2727,8 +2727,8 @@ discard block |
||
2727 | 2727 | } |
2728 | 2728 | |
2729 | 2729 | |
2730 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2731 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
2730 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2731 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
2732 | 2732 | /** |
2733 | 2733 | * Initialise tableau info (tableau des attributes LDAP) |
2734 | 2734 | * |
@@ -2736,7 +2736,7 @@ discard block |
||
2736 | 2736 | */ |
2737 | 2737 | public function _load_ldap_info() |
2738 | 2738 | { |
2739 | - // phpcs:enable |
|
2739 | + // phpcs:enable |
|
2740 | 2740 | global $conf, $langs; |
2741 | 2741 | |
2742 | 2742 | $info = array(); |
@@ -636,7 +636,7 @@ discard block |
||
636 | 636 | } |
637 | 637 | } |
638 | 638 | |
639 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
639 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
640 | 640 | /** |
641 | 641 | * Load the project with id $this->fk_project into this->project |
642 | 642 | * |
@@ -644,7 +644,7 @@ discard block |
||
644 | 644 | */ |
645 | 645 | public function fetch_projet() |
646 | 646 | { |
647 | - // phpcs:enable |
|
647 | + // phpcs:enable |
|
648 | 648 | |
649 | 649 | if (empty($this->fk_project) && !empty($this->fk_projet)) { |
650 | 650 | $this->fk_project = $this->fk_projet; // For backward compatibility |
@@ -863,7 +863,7 @@ discard block |
||
863 | 863 | return $this->LibStatut($this->status, $mode); |
864 | 864 | } |
865 | 865 | |
866 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
866 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
867 | 867 | /** |
868 | 868 | * Return the status |
869 | 869 | * |
@@ -873,7 +873,7 @@ discard block |
||
873 | 873 | */ |
874 | 874 | public function LibStatut($status, $mode = 0) |
875 | 875 | { |
876 | - // phpcs:enable |
|
876 | + // phpcs:enable |
|
877 | 877 | global $langs; |
878 | 878 | |
879 | 879 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |