@@ -241,12 +241,12 @@ |
||
241 | 241 | } |
242 | 242 | |
243 | 243 | /** |
244 | - * Delete a language for this member type |
|
245 | - * |
|
246 | - * @param string $langtodelete Language code to delete |
|
247 | - * @param User $user Object user making delete |
|
248 | - * @return int <0 if KO, >0 if OK |
|
249 | - */ |
|
244 | + * Delete a language for this member type |
|
245 | + * |
|
246 | + * @param string $langtodelete Language code to delete |
|
247 | + * @param User $user Object user making delete |
|
248 | + * @return int <0 if KO, >0 if OK |
|
249 | + */ |
|
250 | 250 | public function delMultiLangs($langtodelete, $user) |
251 | 251 | { |
252 | 252 | $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type_lang"; |
@@ -126,8 +126,8 @@ |
||
126 | 126 | public $usage_bill_time; // Is the time spent on project must be invoiced or not |
127 | 127 | |
128 | 128 | /** |
129 | - * @var integer Event organization: Use Event Organization |
|
130 | - */ |
|
129 | + * @var integer Event organization: Use Event Organization |
|
130 | + */ |
|
131 | 131 | public $usage_organize_event; |
132 | 132 | |
133 | 133 | /** |
@@ -416,7 +416,7 @@ discard block |
||
416 | 416 | return $solde; |
417 | 417 | } |
418 | 418 | |
419 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
419 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
420 | 420 | /** |
421 | 421 | * Total of the VAT from invoices emitted by the thirdparty. |
422 | 422 | * |
@@ -425,7 +425,7 @@ discard block |
||
425 | 425 | */ |
426 | 426 | public function tva_sum_collectee($year = 0) |
427 | 427 | { |
428 | - // phpcs:enable |
|
428 | + // phpcs:enable |
|
429 | 429 | |
430 | 430 | $sql = "SELECT sum(f.total_tva) as amount"; |
431 | 431 | $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1"; |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | } |
451 | 451 | } |
452 | 452 | |
453 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
453 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
454 | 454 | /** |
455 | 455 | * VAT payed |
456 | 456 | * |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | */ |
460 | 460 | public function tva_sum_payee($year = 0) |
461 | 461 | { |
462 | - // phpcs:enable |
|
462 | + // phpcs:enable |
|
463 | 463 | |
464 | 464 | $sql = "SELECT sum(f.total_tva) as total_tva"; |
465 | 465 | $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | } |
486 | 486 | |
487 | 487 | |
488 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
488 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
489 | 489 | /** |
490 | 490 | * Total of the VAT payed |
491 | 491 | * |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | */ |
495 | 495 | public function tva_sum_reglee($year = 0) |
496 | 496 | { |
497 | - // phpcs:enable |
|
497 | + // phpcs:enable |
|
498 | 498 | |
499 | 499 | $sql = "SELECT sum(f.amount) as amount"; |
500 | 500 | $sql .= " FROM ".MAIN_DB_PREFIX."tva as f"; |
@@ -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 | * Update link between payment tva and line generate into llx_bank |
671 | 671 | * |
@@ -674,7 +674,7 @@ discard block |
||
674 | 674 | */ |
675 | 675 | public function update_fk_bank($id_bank) |
676 | 676 | { |
677 | - // phpcs:enable |
|
677 | + // phpcs:enable |
|
678 | 678 | $sql = 'UPDATE '.MAIN_DB_PREFIX.'tva SET fk_bank = '.(int) $id_bank; |
679 | 679 | $sql .= ' WHERE rowid = '.(int) $this->id; |
680 | 680 | $result = $this->db->query($sql); |
@@ -916,7 +916,7 @@ |
||
916 | 916 | /** |
917 | 917 | * @var array $suffix2numAsked map HTTP query parameter suffixes (like '1_0') to line indices so that |
918 | 918 | * extrafields from HTTP query can be assigned to the correct dispatch line |
919 | - */ |
|
919 | + */ |
|
920 | 920 | $suffix2numAsked = array(); |
921 | 921 | $dispatchLines = array(); |
922 | 922 |
@@ -156,7 +156,7 @@ |
||
156 | 156 | * $price Can be set to update AWP (Average Weighted Price) when you make a stock increase |
157 | 157 | * $dlc Eat-by date. Will be used if lot does not exists yet and will be created. |
158 | 158 | * $dluo Sell-by date. Will be used if lot does not exists yet and will be created. |
159 | - * |
|
159 | + * |
|
160 | 160 | * @param int $product_id Id product id {@min 1} {@from body} {@required true} |
161 | 161 | * @param int $warehouse_id Id warehouse {@min 1} {@from body} {@required true} |
162 | 162 | * @param float $qty Qty to add (Use negative value for a stock decrease) {@from body} {@required true} |
@@ -914,11 +914,11 @@ |
||
914 | 914 | |
915 | 915 | |
916 | 916 | /** |
917 | - * Load the info information in the object |
|
918 | - * |
|
919 | - * @param int $id Id of object |
|
920 | - * @return void |
|
921 | - */ |
|
917 | + * Load the info information in the object |
|
918 | + * |
|
919 | + * @param int $id Id of object |
|
920 | + * @return void |
|
921 | + */ |
|
922 | 922 | public function info($id) |
923 | 923 | { |
924 | 924 | $sql = 'SELECT rowid, date_creation as datec, tms as datem,'; |
@@ -405,7 +405,6 @@ |
||
405 | 405 | * Load object lines in memory from the database by type of product |
406 | 406 | * |
407 | 407 | * @param int $typeproduct 0 type product, 1 type service |
408 | - |
|
409 | 408 | * @return int <0 if KO, 0 if not found, >0 if OK |
410 | 409 | */ |
411 | 410 | public function fetchLinesbytypeproduct($typeproduct = 0) |
@@ -581,7 +581,7 @@ discard block |
||
581 | 581 | } |
582 | 582 | |
583 | 583 | |
584 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
584 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
585 | 585 | /** |
586 | 586 | * Mise a jour du lien entre le paiement de salaire et la ligne dans llx_bank generee |
587 | 587 | * |
@@ -590,7 +590,7 @@ discard block |
||
590 | 590 | */ |
591 | 591 | public function update_fk_bank($id_bank) |
592 | 592 | { |
593 | - // phpcs:enable |
|
593 | + // phpcs:enable |
|
594 | 594 | $sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET fk_bank = ".((int) $id_bank)." WHERE rowid = ".((int) $this->id); |
595 | 595 | |
596 | 596 | dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG); |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | return $this->LibStatut($this->statut, $mode); |
670 | 670 | } |
671 | 671 | |
672 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
672 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
673 | 673 | /** |
674 | 674 | * Return the status |
675 | 675 | * |
@@ -679,7 +679,7 @@ discard block |
||
679 | 679 | */ |
680 | 680 | public function LibStatut($status, $mode = 0) |
681 | 681 | { |
682 | - // phpcs:enable |
|
682 | + // phpcs:enable |
|
683 | 683 | global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage |
684 | 684 | |
685 | 685 | $langs->load('compta'); |
@@ -715,12 +715,12 @@ |
||
715 | 715 | } |
716 | 716 | |
717 | 717 | /** |
718 | - * Return clicable link of object (with eventually picto) |
|
719 | - * |
|
720 | - * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link) |
|
721 | - * @param array $arraydata Array of data |
|
722 | - * @return string HTML Code for Kanban thumb. |
|
723 | - */ |
|
718 | + * Return clicable link of object (with eventually picto) |
|
719 | + * |
|
720 | + * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link) |
|
721 | + * @param array $arraydata Array of data |
|
722 | + * @return string HTML Code for Kanban thumb. |
|
723 | + */ |
|
724 | 724 | public function getKanbanView($option = '', $arraydata = null) |
725 | 725 | { |
726 | 726 | global $langs; |