@@ -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"; |
@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | } |
| 561 | 561 | |
| 562 | 562 | |
| 563 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 563 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 564 | 564 | /** |
| 565 | 565 | * Mise a jour du lien entre le paiement de salaire et la ligne dans llx_bank generee |
| 566 | 566 | * |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | */ |
| 570 | 570 | public function update_fk_bank($id_bank) |
| 571 | 571 | { |
| 572 | - // phpcs:enable |
|
| 572 | + // phpcs:enable |
|
| 573 | 573 | $sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET fk_bank = ".((int) $id_bank)." WHERE rowid = ".((int) $this->id); |
| 574 | 574 | |
| 575 | 575 | dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG); |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | return $this->LibStatut($this->statut, $mode); |
| 595 | 595 | } |
| 596 | 596 | |
| 597 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 597 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 598 | 598 | /** |
| 599 | 599 | * Renvoi le libelle d'un statut donne |
| 600 | 600 | * |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | */ |
| 605 | 605 | public function LibStatut($status, $mode = 0) |
| 606 | 606 | { |
| 607 | - // phpcs:enable |
|
| 607 | + // phpcs:enable |
|
| 608 | 608 | global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage |
| 609 | 609 | |
| 610 | 610 | $langs->load('compta'); |
@@ -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); |
@@ -1764,14 +1764,14 @@ |
||
| 1764 | 1764 | } |
| 1765 | 1765 | |
| 1766 | 1766 | /** |
| 1767 | - * Export format : iSuite Expert |
|
| 1768 | - * |
|
| 1769 | - * by OpenSolus [https://opensolus.fr] |
|
| 1770 | - * |
|
| 1771 | - * @param array $objectLines data |
|
| 1772 | - * |
|
| 1773 | - * @return void |
|
| 1774 | - */ |
|
| 1767 | + * Export format : iSuite Expert |
|
| 1768 | + * |
|
| 1769 | + * by OpenSolus [https://opensolus.fr] |
|
| 1770 | + * |
|
| 1771 | + * @param array $objectLines data |
|
| 1772 | + * |
|
| 1773 | + * @return void |
|
| 1774 | + */ |
|
| 1775 | 1775 | public function exportiSuiteExpert($objectLines) |
| 1776 | 1776 | { |
| 1777 | 1777 | $this->separator = ';'; |
@@ -622,15 +622,15 @@ |
||
| 622 | 622 | */ |
| 623 | 623 | |
| 624 | 624 | /** |
| 625 | - * Close a shipment (Classify it as "Delivered") |
|
| 626 | - * |
|
| 627 | - * @param int $id Expedition ID |
|
| 628 | - * @param int $notrigger Disabled triggers |
|
| 629 | - * |
|
| 630 | - * @url POST {id}/close |
|
| 631 | - * |
|
| 632 | - * @return int |
|
| 633 | - */ |
|
| 625 | + * Close a shipment (Classify it as "Delivered") |
|
| 626 | + * |
|
| 627 | + * @param int $id Expedition ID |
|
| 628 | + * @param int $notrigger Disabled triggers |
|
| 629 | + * |
|
| 630 | + * @url POST {id}/close |
|
| 631 | + * |
|
| 632 | + * @return int |
|
| 633 | + */ |
|
| 634 | 634 | public function close($id, $notrigger = 0) |
| 635 | 635 | { |
| 636 | 636 | if (!DolibarrApiAccess::$user->rights->expedition->creer) { |
@@ -262,10 +262,10 @@ |
||
| 262 | 262 | public $finished; |
| 263 | 263 | |
| 264 | 264 | /** |
| 265 | - * fk_default_bom indicates the default bom |
|
| 266 | - * |
|
| 267 | - * @var int |
|
| 268 | - */ |
|
| 265 | + * fk_default_bom indicates the default bom |
|
| 266 | + * |
|
| 267 | + * @var int |
|
| 268 | + */ |
|
| 269 | 269 | public $fk_default_bom; |
| 270 | 270 | |
| 271 | 271 | /** |
@@ -457,7 +457,7 @@ discard block |
||
| 457 | 457 | } |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 460 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 461 | 461 | /** |
| 462 | 462 | * Update link between payment salary and line generate into llx_bank |
| 463 | 463 | * |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | */ |
| 467 | 467 | public function update_fk_bank($id_bank) |
| 468 | 468 | { |
| 469 | - // phpcs:enable |
|
| 469 | + // phpcs:enable |
|
| 470 | 470 | $sql = 'UPDATE '.MAIN_DB_PREFIX.'salary SET fk_bank = '.((int) $id_bank); |
| 471 | 471 | $sql .= " WHERE rowid = ".((int) $this->id); |
| 472 | 472 | $result = $this->db->query($sql); |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | return $this->LibStatut($this->paye, $mode, $alreadypaid); |
| 677 | 677 | } |
| 678 | 678 | |
| 679 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 679 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 680 | 680 | /** |
| 681 | 681 | * Renvoi le libelle d'un statut donne |
| 682 | 682 | * |
@@ -610,7 +610,7 @@ discard block |
||
| 610 | 610 | } |
| 611 | 611 | |
| 612 | 612 | |
| 613 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 613 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 614 | 614 | /** |
| 615 | 615 | * Mise a jour du lien entre le paiement de tva et la ligne dans llx_bank generee |
| 616 | 616 | * |
@@ -619,7 +619,7 @@ discard block |
||
| 619 | 619 | */ |
| 620 | 620 | public function update_fk_bank($id_bank) |
| 621 | 621 | { |
| 622 | - // phpcs:enable |
|
| 622 | + // phpcs:enable |
|
| 623 | 623 | $sql = "UPDATE ".MAIN_DB_PREFIX."payment_vat SET fk_bank = ".((int) $id_bank)." WHERE rowid = ".((int) $this->id); |
| 624 | 624 | |
| 625 | 625 | dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG); |
@@ -644,7 +644,7 @@ discard block |
||
| 644 | 644 | return $this->LibStatut($this->statut, $mode); |
| 645 | 645 | } |
| 646 | 646 | |
| 647 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 647 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 648 | 648 | /** |
| 649 | 649 | * Renvoi le libelle d'un statut donne |
| 650 | 650 | * |
@@ -654,7 +654,7 @@ discard block |
||
| 654 | 654 | */ |
| 655 | 655 | public function LibStatut($status, $mode = 0) |
| 656 | 656 | { |
| 657 | - // phpcs:enable |
|
| 657 | + // phpcs:enable |
|
| 658 | 658 | global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage |
| 659 | 659 | |
| 660 | 660 | $langs->load('compta'); |