@@ -276,12 +276,12 @@ discard block |
||
276 | 276 | } |
277 | 277 | |
278 | 278 | /** |
279 | - * Delete a language for this member type |
|
280 | - * |
|
281 | - * @param string $langtodelete Language code to delete |
|
282 | - * @param User $user Object user making delete |
|
283 | - * @return int Return integer <0 if KO, >0 if OK |
|
284 | - */ |
|
279 | + * Delete a language for this member type |
|
280 | + * |
|
281 | + * @param string $langtodelete Language code to delete |
|
282 | + * @param User $user Object user making delete |
|
283 | + * @return int Return integer <0 if KO, >0 if OK |
|
284 | + */ |
|
285 | 285 | public function delMultiLangs($langtodelete, $user) |
286 | 286 | { |
287 | 287 | $sql = "DELETE FROM " . MAIN_DB_PREFIX . "adherent_type_lang"; |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | } |
533 | 533 | } |
534 | 534 | |
535 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
535 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
536 | 536 | /** |
537 | 537 | * Return list of members' type |
538 | 538 | * |
@@ -541,7 +541,7 @@ discard block |
||
541 | 541 | */ |
542 | 542 | public function liste_array($status = -1) |
543 | 543 | { |
544 | - // phpcs:enable |
|
544 | + // phpcs:enable |
|
545 | 545 | global $langs; |
546 | 546 | |
547 | 547 | $adherenttypes = array(); |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | return $this->LibStatut($this->status, $mode); |
785 | 785 | } |
786 | 786 | |
787 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
787 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
788 | 788 | /** |
789 | 789 | * Return the label of a given status |
790 | 790 | * |
@@ -794,7 +794,7 @@ discard block |
||
794 | 794 | */ |
795 | 795 | public function LibStatut($status, $mode = 0) |
796 | 796 | { |
797 | - // phpcs:enable |
|
797 | + // phpcs:enable |
|
798 | 798 | global $langs; |
799 | 799 | $langs->load('companies'); |
800 | 800 | |
@@ -813,8 +813,8 @@ discard block |
||
813 | 813 | return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode); |
814 | 814 | } |
815 | 815 | |
816 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
817 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
816 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
817 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
818 | 818 | /** |
819 | 819 | * Retourne chaine DN complete dans l'annuaire LDAP pour l'objet |
820 | 820 | * |
@@ -826,7 +826,7 @@ discard block |
||
826 | 826 | */ |
827 | 827 | public function _load_ldap_dn($info, $mode = 0) |
828 | 828 | { |
829 | - // phpcs:enable |
|
829 | + // phpcs:enable |
|
830 | 830 | $dn = ''; |
831 | 831 | if ($mode == 0) { |
832 | 832 | $dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES') . "=" . $info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')] . "," . getDolGlobalString('LDAP_MEMBER_TYPE_DN'); |
@@ -841,8 +841,8 @@ discard block |
||
841 | 841 | } |
842 | 842 | |
843 | 843 | |
844 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
845 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
844 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
845 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
846 | 846 | /** |
847 | 847 | * Initialize the info array (array of LDAP values) that will be used to call LDAP functions |
848 | 848 | * |
@@ -850,7 +850,7 @@ discard block |
||
850 | 850 | */ |
851 | 851 | public function _load_ldap_info() |
852 | 852 | { |
853 | - // phpcs:enable |
|
853 | + // phpcs:enable |
|
854 | 854 | $info = array(); |
855 | 855 | |
856 | 856 | // Object classes |
@@ -512,7 +512,7 @@ |
||
512 | 512 | $this->amount = $obj->amount; |
513 | 513 | $this->caneditamount = $obj->caneditamount; |
514 | 514 | $this->mail_valid = $obj->mail_valid; |
515 | - $this->note = $obj->note_public; // deprecated |
|
515 | + $this->note = $obj->note_public; // deprecated |
|
516 | 516 | $this->note_public = $obj->note_public; |
517 | 517 | $this->vote = $obj->vote; |
518 | 518 |
@@ -468,7 +468,7 @@ discard block |
||
468 | 468 | return ''; |
469 | 469 | } |
470 | 470 | |
471 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
471 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
472 | 472 | /** |
473 | 473 | * Return the label of a given status |
474 | 474 | * |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | */ |
479 | 479 | public function LibStatut($status, $mode = 0) |
480 | 480 | { |
481 | - // phpcs:enable |
|
481 | + // phpcs:enable |
|
482 | 482 | |
483 | 483 | //$langs->load("members"); |
484 | 484 |
@@ -241,7 +241,7 @@ |
||
241 | 241 | $this->dateh = $this->db->jdate($obj->dateh); |
242 | 242 | $this->datef = $this->db->jdate($obj->datef); |
243 | 243 | $this->amount = $obj->subscription; |
244 | - $this->note = $obj->note_public; // deprecated |
|
244 | + $this->note = $obj->note_public; // deprecated |
|
245 | 245 | $this->note_public = $obj->note_public; |
246 | 246 | $this->fk_bank = $obj->fk_bank; |
247 | 247 | return 1; |
@@ -118,7 +118,7 @@ |
||
118 | 118 | if ($this->apiService == 'groq') { |
119 | 119 | $this->apiEndpoint = 'https://api.groq.com/openai/v1/chat/completions'; |
120 | 120 | if ($model == 'auto') { |
121 | - $model = getDolGlobalString('AI_API_GROK_MODEL_TEXT', 'mixtral-8x7b-32768'); // 'llama3-8b-8192', 'gemma-7b-it' |
|
121 | + $model = getDolGlobalString('AI_API_GROK_MODEL_TEXT', 'mixtral-8x7b-32768'); // 'llama3-8b-8192', 'gemma-7b-it' |
|
122 | 122 | } |
123 | 123 | } elseif ($this->apiService == 'chatgpt') { |
124 | 124 | $this->apiEndpoint = 'https://api.openai.com/v1/chat/completions'; |
@@ -847,7 +847,7 @@ discard block |
||
847 | 847 | return $this->LibStatut($this->status, $mode); |
848 | 848 | } |
849 | 849 | |
850 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
850 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
851 | 851 | /** |
852 | 852 | * Return the status |
853 | 853 | * |
@@ -857,7 +857,7 @@ discard block |
||
857 | 857 | */ |
858 | 858 | public function LibStatut($status, $mode = 0) |
859 | 859 | { |
860 | - // phpcs:enable |
|
860 | + // phpcs:enable |
|
861 | 861 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
862 | 862 | global $langs; |
863 | 863 | //$langs->load("agenda"); |
@@ -837,7 +837,7 @@ discard block |
||
837 | 837 | return $this->LibStatut($this->status, $mode); |
838 | 838 | } |
839 | 839 | |
840 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
840 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
841 | 841 | /** |
842 | 842 | * Return the label of a given status |
843 | 843 | * |
@@ -847,7 +847,7 @@ discard block |
||
847 | 847 | */ |
848 | 848 | public function LibStatut($status, $mode = 0) |
849 | 849 | { |
850 | - // phpcs:enable |
|
850 | + // phpcs:enable |
|
851 | 851 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
852 | 852 | global $langs; |
853 | 853 |
@@ -1430,7 +1430,7 @@ discard block |
||
1430 | 1430 | foreach ($this->lines as &$line) { |
1431 | 1431 | $tmpproduct->cost_price = 0; |
1432 | 1432 | $tmpproduct->pmp = 0; |
1433 | - $result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading |
|
1433 | + $result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading |
|
1434 | 1434 | |
1435 | 1435 | if ($tmpproduct->type == $tmpproduct::TYPE_PRODUCT) { |
1436 | 1436 | if (empty($line->fk_bom_child)) { |
@@ -1625,7 +1625,7 @@ discard block |
||
1625 | 1625 | */ |
1626 | 1626 | public function getKanbanView($option = '', $arraydata = null) |
1627 | 1627 | { |
1628 | - global $db,$langs; |
|
1628 | + global $db, $langs; |
|
1629 | 1629 | |
1630 | 1630 | $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); |
1631 | 1631 |
@@ -437,7 +437,6 @@ discard block |
||
437 | 437 | * Load object lines in memory from the database by type of product |
438 | 438 | * |
439 | 439 | * @param int $typeproduct 0 type product, 1 type service |
440 | - |
|
441 | 440 | * @return int Return integer <0 if KO, 0 if not found, >0 if OK |
442 | 441 | */ |
443 | 442 | public function fetchLinesbytypeproduct($typeproduct = 0) |
@@ -1206,7 +1205,7 @@ discard block |
||
1206 | 1205 | return $this->LibStatut($this->status, $mode); |
1207 | 1206 | } |
1208 | 1207 | |
1209 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1208 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1210 | 1209 | /** |
1211 | 1210 | * Return the status |
1212 | 1211 | * |
@@ -1216,7 +1215,7 @@ discard block |
||
1216 | 1215 | */ |
1217 | 1216 | public function LibStatut($status, $mode = 0) |
1218 | 1217 | { |
1219 | - // phpcs:enable |
|
1218 | + // phpcs:enable |
|
1220 | 1219 | if (empty($this->labelStatus)) { |
1221 | 1220 | global $langs; |
1222 | 1221 | //$langs->load("mrp"); |
@@ -1325,7 +1324,7 @@ discard block |
||
1325 | 1324 | } |
1326 | 1325 | } |
1327 | 1326 | |
1328 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1327 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1329 | 1328 | /** |
1330 | 1329 | * Return if at least one photo is available |
1331 | 1330 | * |
@@ -1334,7 +1333,7 @@ discard block |
||
1334 | 1333 | */ |
1335 | 1334 | public function is_photo_available($sdir) |
1336 | 1335 | { |
1337 | - // phpcs:enable |
|
1336 | + // phpcs:enable |
|
1338 | 1337 | include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; |
1339 | 1338 | include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php'; |
1340 | 1339 |
@@ -716,7 +716,7 @@ discard block |
||
716 | 716 | } |
717 | 717 | } |
718 | 718 | |
719 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
719 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
720 | 720 | /** |
721 | 721 | * Clean sensible object datas |
722 | 722 | * |
@@ -725,7 +725,7 @@ discard block |
||
725 | 725 | */ |
726 | 726 | protected function _cleanObjectDatas($object) |
727 | 727 | { |
728 | - // phpcs:enable |
|
728 | + // phpcs:enable |
|
729 | 729 | $object = parent::_cleanObjectDatas($object); |
730 | 730 | |
731 | 731 | unset($object->rowid); |
@@ -48,7 +48,7 @@ |
||
48 | 48 | 'receivable_on_assignment' => array('label' => 'AssetAccountancyCodeReceivableOnAssignment'), |
49 | 49 | 'proceeds_from_sales' => array('label' => 'AssetAccountancyCodeProceedsFromSales'), |
50 | 50 | 'vat_collected' => array('label' => 'AssetAccountancyCodeVatCollected'), |
51 | - 'vat_deductible' => array('label' => 'AssetAccountancyCodeVatDeductible','column_break' => true), |
|
51 | + 'vat_deductible' => array('label' => 'AssetAccountancyCodeVatDeductible', 'column_break' => true), |
|
52 | 52 | ), |
53 | 53 | ), |
54 | 54 | 'accelerated_depreciation' => array( |
@@ -1438,7 +1438,7 @@ discard block |
||
1438 | 1438 | return $this->LibStatut($this->status, $mode); |
1439 | 1439 | } |
1440 | 1440 | |
1441 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1441 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1442 | 1442 | /** |
1443 | 1443 | * Return the status |
1444 | 1444 | * |
@@ -1448,7 +1448,7 @@ discard block |
||
1448 | 1448 | */ |
1449 | 1449 | public function LibStatut($status, $mode = 0) |
1450 | 1450 | { |
1451 | - // phpcs:enable |
|
1451 | + // phpcs:enable |
|
1452 | 1452 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
1453 | 1453 | global $langs; |
1454 | 1454 | //$langs->load("assets"); |