@@ -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'); |
@@ -294,7 +294,7 @@ |
||
| 294 | 294 | $this->amount = $totalamount; |
| 295 | 295 | $this->total = $totalamount; // deprecated |
| 296 | 296 | $this->db->commit(); |
| 297 | - return $this->id; // id of the last payment inserted |
|
| 297 | + return $this->id; // id of the last payment inserted |
|
| 298 | 298 | } else { |
| 299 | 299 | $this->error = $this->db->error(); |
| 300 | 300 | $this->db->rollback(); |
@@ -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'; |
@@ -619,7 +619,7 @@ |
||
| 619 | 619 | } elseif ($multicurrency) { |
| 620 | 620 | //$this->sumpayed_multicurrency = $obj->multicurrency_amount; |
| 621 | 621 | //return (float) $obj->multicurrency_amount; |
| 622 | - return -1; // Not yet supported |
|
| 622 | + return -1; // Not yet supported |
|
| 623 | 623 | } else { |
| 624 | 624 | //$this->sumpayed = $obj->amount; |
| 625 | 625 | return (float) $obj->amount; |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 171 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 172 | 172 | /** |
| 173 | 173 | * List all price expressions |
| 174 | 174 | * |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | public function list_price_expression() |
| 178 | 178 | { |
| 179 | - // phpcs:enable |
|
| 179 | + // phpcs:enable |
|
| 180 | 180 | $sql = "SELECT rowid, title, expression"; |
| 181 | 181 | $sql .= " FROM " . $this->db->prefix() . $this->table_element; |
| 182 | 182 | $sql .= " ORDER BY title"; |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | |
| 206 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 206 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 207 | 207 | /** |
| 208 | 208 | * Returns any existing rowid with specified title |
| 209 | 209 | * |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | public function find_title($title) |
| 214 | 214 | { |
| 215 | - // phpcs:enable |
|
| 215 | + // phpcs:enable |
|
| 216 | 216 | $sql = "SELECT rowid"; |
| 217 | 217 | $sql .= " FROM " . $this->db->prefix() . $this->table_element; |
| 218 | 218 | $sql .= " WHERE title = '" . $this->db->escape($title) . "'"; |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | return 1; |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 561 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 562 | 562 | /** |
| 563 | 563 | * Update next_update into database |
| 564 | 564 | * |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | */ |
| 570 | 570 | public function update_next_update($next_update, $user = null, $notrigger = 0) |
| 571 | 571 | { |
| 572 | - // phpcs:enable |
|
| 572 | + // phpcs:enable |
|
| 573 | 573 | $error = 0; |
| 574 | 574 | |
| 575 | 575 | $this->next_update = $next_update; |
@@ -603,7 +603,7 @@ discard block |
||
| 603 | 603 | } |
| 604 | 604 | } |
| 605 | 605 | |
| 606 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 606 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 607 | 607 | /** |
| 608 | 608 | * Update last_status into database |
| 609 | 609 | * |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | */ |
| 615 | 615 | public function update_status($last_status, $user = null, $notrigger = 0) |
| 616 | 616 | { |
| 617 | - // phpcs:enable |
|
| 617 | + // phpcs:enable |
|
| 618 | 618 | $error = 0; |
| 619 | 619 | |
| 620 | 620 | $this->last_status = $last_status; |
@@ -971,9 +971,9 @@ |
||
| 971 | 971 | if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) { |
| 972 | 972 | $extratitle = $langs->trans($value); |
| 973 | 973 | $arrayfields['ef.' . $key] = array('label' => $extratitle, 'checked' => 0, |
| 974 | - 'position' => (end($arrayfields)['position'] + 1), |
|
| 975 | - 'langfile' => $extrafields->attributes["product_fournisseur_price"]['langfile'][$key], |
|
| 976 | - 'help' => $extrafields->attributes["product_fournisseur_price"]['help'][$key]); |
|
| 974 | + 'position' => (end($arrayfields)['position'] + 1), |
|
| 975 | + 'langfile' => $extrafields->attributes["product_fournisseur_price"]['langfile'][$key], |
|
| 976 | + 'help' => $extrafields->attributes["product_fournisseur_price"]['help'][$key]); |
|
| 977 | 977 | } |
| 978 | 978 | } |
| 979 | 979 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | |
| 96 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 96 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 97 | 97 | /** |
| 98 | 98 | * Assign custom values for canvas (for example into this->tpl to be used by templates) |
| 99 | 99 | * |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | public function assign_values(&$action, $id = 0, $ref = '') |
| 106 | 106 | { |
| 107 | - // phpcs:enable |
|
| 107 | + // phpcs:enable |
|
| 108 | 108 | global $conf, $langs, $user, $mysoc, $canvas; |
| 109 | 109 | global $form, $formproduct; |
| 110 | 110 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | |
| 105 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 105 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 106 | 106 | /** |
| 107 | 107 | * Assign custom values for canvas (for example into this->tpl to be used by templates) |
| 108 | 108 | * |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | */ |
| 114 | 114 | public function assign_values(&$action, $id = 0, $ref = '') |
| 115 | 115 | { |
| 116 | - // phpcs:enable |
|
| 116 | + // phpcs:enable |
|
| 117 | 117 | global $conf, $langs, $user, $mysoc, $canvas; |
| 118 | 118 | global $form; |
| 119 | 119 | |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | return $this->LibStatut($this->status, $mode); |
| 649 | 649 | } |
| 650 | 650 | |
| 651 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 651 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 652 | 652 | /** |
| 653 | 653 | * Return the status |
| 654 | 654 | * |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | */ |
| 659 | 659 | public static function LibStatut($status, $mode = 0) |
| 660 | 660 | { |
| 661 | - // phpcs:enable |
|
| 661 | + // phpcs:enable |
|
| 662 | 662 | global $langs; |
| 663 | 663 | |
| 664 | 664 | $labelStatus = array(); |
@@ -64,10 +64,10 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | public $picto = 'inventory'; |
| 66 | 66 | |
| 67 | - const STATUS_DRAFT = 0; // Draft |
|
| 68 | - const STATUS_VALIDATED = 1; // Inventory is in process |
|
| 69 | - const STATUS_RECORDED = 2; // Inventory is finisged. Stock movement has been recorded. |
|
| 70 | - const STATUS_CANCELED = 9; // Canceled |
|
| 67 | + const STATUS_DRAFT = 0; // Draft |
|
| 68 | + const STATUS_VALIDATED = 1; // Inventory is in process |
|
| 69 | + const STATUS_RECORDED = 2; // Inventory is finisged. Stock movement has been recorded. |
|
| 70 | + const STATUS_CANCELED = 9; // Canceled |
|
| 71 | 71 | |
| 72 | 72 | /** |
| 73 | 73 | * 'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password') |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | 'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Warehouse', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'index' => 1, 'help' => 'InventoryForASpecificWarehouse', 'picto' => 'stock', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'), |
| 108 | 108 | 'fk_product' => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible' => 1, 'enabled' => 1, 'position' => 32, 'index' => 1, 'help' => 'InventoryForASpecificProduct', 'picto' => 'product', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'), |
| 109 | 109 | 'categories_product' => array('type' => 'chkbxlst:categorie:label:rowid::type=0:0:', 'label' => 'OrProductsWithCategories', 'visible' => 3, 'enabled' => 1, 'position' => 33, 'help' => '', 'picto' => 'category', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx'), |
| 110 | - 'date_inventory' => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => '$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position' => 35, 'csslist' => 'nowraponall'), // This date is not used so disabled by default. |
|
| 110 | + 'date_inventory' => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => '$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position' => 35, 'csslist' => 'nowraponall'), // This date is not used so disabled by default. |
|
| 111 | 111 | 'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 500, 'csslist' => 'nowraponall'), |
| 112 | 112 | 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 501, 'csslist' => 'nowraponall'), |
| 113 | 113 | 'date_validation' => array('type' => 'datetime', 'label' => 'DateValidation', 'visible' => -2, 'enabled' => 1, 'position' => 502, 'csslist' => 'nowraponall'), |
@@ -855,7 +855,7 @@ discard block |
||
| 855 | 855 | return $this->LibStatut($this->status, $mode); |
| 856 | 856 | } |
| 857 | 857 | |
| 858 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 858 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 859 | 859 | /** |
| 860 | 860 | * Return the status |
| 861 | 861 | * |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | */ |
| 866 | 866 | public function LibStatut($status, $mode = 0) |
| 867 | 867 | { |
| 868 | - // phpcs:enable |
|
| 868 | + // phpcs:enable |
|
| 869 | 869 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
| 870 | 870 | global $langs; |
| 871 | 871 | //$langs->load("stocktransfer@stocktransfer"); |