@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | } |
674 | 674 | |
675 | 675 | |
676 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
676 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
677 | 677 | /** |
678 | 678 | * Mise a jour du lien entre le paiement de charge et la ligne dans llx_bank generee |
679 | 679 | * |
@@ -682,7 +682,7 @@ discard block |
||
682 | 682 | */ |
683 | 683 | public function update_fk_bank($id_bank) |
684 | 684 | { |
685 | - // phpcs:enable |
|
685 | + // phpcs:enable |
|
686 | 686 | $sql = "UPDATE " . MAIN_DB_PREFIX . "paiementcharge SET fk_bank = " . ((int) $id_bank) . " WHERE rowid = " . ((int) $this->id); |
687 | 687 | |
688 | 688 | dol_syslog(get_class($this) . "::update_fk_bank", LOG_DEBUG); |
@@ -707,7 +707,7 @@ discard block |
||
707 | 707 | return $this->LibStatut($this->statut, $mode); |
708 | 708 | } |
709 | 709 | |
710 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
710 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
711 | 711 | /** |
712 | 712 | * Return the label of a given status |
713 | 713 | * |
@@ -717,7 +717,7 @@ discard block |
||
717 | 717 | */ |
718 | 718 | public function LibStatut($status, $mode = 0) |
719 | 719 | { |
720 | - // phpcs:enable |
|
720 | + // phpcs:enable |
|
721 | 721 | global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage |
722 | 722 | |
723 | 723 | $langs->load('compta'); |
@@ -439,7 +439,7 @@ discard block |
||
439 | 439 | } |
440 | 440 | } |
441 | 441 | |
442 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
442 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
443 | 443 | /** |
444 | 444 | * Tag social contribution as paid completely |
445 | 445 | * |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | */ |
451 | 451 | public function set_paid($user) |
452 | 452 | { |
453 | - // phpcs:enable |
|
453 | + // phpcs:enable |
|
454 | 454 | dol_syslog(get_class($this) . "::set_paid is deprecated, use setPaid instead", LOG_NOTICE); |
455 | 455 | return $this->setPaid($user); |
456 | 456 | } |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | } |
479 | 479 | } |
480 | 480 | |
481 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
481 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
482 | 482 | /** |
483 | 483 | * Remove tag paid on social contribution |
484 | 484 | * |
@@ -489,7 +489,7 @@ discard block |
||
489 | 489 | */ |
490 | 490 | public function set_unpaid($user) |
491 | 491 | { |
492 | - // phpcs:enable |
|
492 | + // phpcs:enable |
|
493 | 493 | dol_syslog(get_class($this) . "::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE); |
494 | 494 | return $this->setUnpaid($user); |
495 | 495 | } |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | return $this->LibStatut($this->paye, $mode, $alreadypaid); |
530 | 530 | } |
531 | 531 | |
532 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
532 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
533 | 533 | /** |
534 | 534 | * Renvoi le libelle d'un statut donne |
535 | 535 | * |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | */ |
541 | 541 | public function LibStatut($status, $mode = 0, $alreadypaid = -1) |
542 | 542 | { |
543 | - // phpcs:enable |
|
543 | + // phpcs:enable |
|
544 | 544 | global $langs; |
545 | 545 | |
546 | 546 | // Load translation files required by the page |
@@ -654,7 +654,7 @@ discard block |
||
654 | 654 | } |
655 | 655 | |
656 | 656 | |
657 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
657 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
658 | 658 | /** |
659 | 659 | * Update link between vat payment and line in llx_bank generated |
660 | 660 | * |
@@ -663,7 +663,7 @@ discard block |
||
663 | 663 | */ |
664 | 664 | public function update_fk_bank($id_bank) |
665 | 665 | { |
666 | - // phpcs:enable |
|
666 | + // phpcs:enable |
|
667 | 667 | $sql = "UPDATE " . MAIN_DB_PREFIX . "payment_vat SET fk_bank = " . ((int) $id_bank) . " WHERE rowid = " . ((int) $this->id); |
668 | 668 | |
669 | 669 | dol_syslog(get_class($this) . "::update_fk_bank", LOG_DEBUG); |
@@ -688,7 +688,7 @@ discard block |
||
688 | 688 | return $this->LibStatut($this->statut, $mode); |
689 | 689 | } |
690 | 690 | |
691 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
691 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
692 | 692 | /** |
693 | 693 | * Return the label of a given status |
694 | 694 | * |
@@ -698,7 +698,7 @@ discard block |
||
698 | 698 | */ |
699 | 699 | public function LibStatut($status, $mode = 0) |
700 | 700 | { |
701 | - // phpcs:enable |
|
701 | + // phpcs:enable |
|
702 | 702 | global $langs; |
703 | 703 | |
704 | 704 | $langs->load('compta'); |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | return $solde; |
453 | 453 | } |
454 | 454 | |
455 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
455 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
456 | 456 | /** |
457 | 457 | * Total of the VAT from invoices emitted by the thirdparty. |
458 | 458 | * |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | */ |
462 | 462 | public function tva_sum_collectee($year = 0) |
463 | 463 | { |
464 | - // phpcs:enable |
|
464 | + // phpcs:enable |
|
465 | 465 | |
466 | 466 | $sql = "SELECT sum(f.total_tva) as amount"; |
467 | 467 | $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f WHERE f.paye = 1"; |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | } |
487 | 487 | } |
488 | 488 | |
489 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
489 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
490 | 490 | /** |
491 | 491 | * VAT paid |
492 | 492 | * |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | */ |
496 | 496 | public function tva_sum_payee($year = 0) |
497 | 497 | { |
498 | - // phpcs:enable |
|
498 | + // phpcs:enable |
|
499 | 499 | |
500 | 500 | $sql = "SELECT sum(f.total_tva) as total_tva"; |
501 | 501 | $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f"; |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | } |
522 | 522 | |
523 | 523 | |
524 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
524 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
525 | 525 | /** |
526 | 526 | * Total of the VAT paid |
527 | 527 | * |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | */ |
531 | 531 | public function tva_sum_reglee($year = 0) |
532 | 532 | { |
533 | - // phpcs:enable |
|
533 | + // phpcs:enable |
|
534 | 534 | |
535 | 535 | $sql = "SELECT sum(f.amount) as amount"; |
536 | 536 | $sql .= " FROM " . MAIN_DB_PREFIX . "tva as f"; |
@@ -701,7 +701,7 @@ discard block |
||
701 | 701 | } |
702 | 702 | } |
703 | 703 | |
704 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
704 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
705 | 705 | /** |
706 | 706 | * Update link between payment tva and line generate into llx_bank |
707 | 707 | * |
@@ -710,7 +710,7 @@ discard block |
||
710 | 710 | */ |
711 | 711 | public function update_fk_bank($id_bank) |
712 | 712 | { |
713 | - // phpcs:enable |
|
713 | + // phpcs:enable |
|
714 | 714 | $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'tva SET fk_bank = ' . (int) $id_bank; |
715 | 715 | $sql .= ' WHERE rowid = ' . (int) $this->id; |
716 | 716 | $result = $this->db->query($sql); |
@@ -867,7 +867,7 @@ discard block |
||
867 | 867 | return $this->LibStatut($this->paye, $mode, $alreadypaid); |
868 | 868 | } |
869 | 869 | |
870 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
870 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
871 | 871 | /** |
872 | 872 | * Return the label of a given VAT status |
873 | 873 | * |
@@ -878,7 +878,7 @@ discard block |
||
878 | 878 | */ |
879 | 879 | public function LibStatut($status, $mode = 0, $alreadypaid = -1) |
880 | 880 | { |
881 | - // phpcs:enable |
|
881 | + // phpcs:enable |
|
882 | 882 | global $langs; |
883 | 883 | |
884 | 884 | // Load translation files required by the page |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | return $solde; |
364 | 364 | } |
365 | 365 | |
366 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
366 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
367 | 367 | /** |
368 | 368 | * Total de la localtax des factures emises par la societe. |
369 | 369 | * |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | */ |
373 | 373 | public function localtax_sum_collectee($year = 0) |
374 | 374 | { |
375 | - // phpcs:enable |
|
375 | + // phpcs:enable |
|
376 | 376 | $sql = "SELECT sum(f.localtax) as amount"; |
377 | 377 | $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f"; |
378 | 378 | $sql .= " WHERE f.paye = 1"; |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | } |
398 | 398 | } |
399 | 399 | |
400 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
400 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
401 | 401 | /** |
402 | 402 | * Total of localtax paid in invoice |
403 | 403 | * |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | */ |
407 | 407 | public function localtax_sum_payee($year = 0) |
408 | 408 | { |
409 | - // phpcs:enable |
|
409 | + // phpcs:enable |
|
410 | 410 | |
411 | 411 | $sql = "SELECT sum(f.total_localtax) as total_localtax"; |
412 | 412 | $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f"; |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | } |
433 | 433 | |
434 | 434 | |
435 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
435 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
436 | 436 | /** |
437 | 437 | * Total of localtax paid |
438 | 438 | * |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | */ |
442 | 442 | public function localtax_sum_reglee($year = 0) |
443 | 443 | { |
444 | - // phpcs:enable |
|
444 | + // phpcs:enable |
|
445 | 445 | |
446 | 446 | $sql = "SELECT sum(f.amount) as amount"; |
447 | 447 | $sql .= " FROM " . MAIN_DB_PREFIX . "localtax as f"; |
@@ -572,7 +572,7 @@ discard block |
||
572 | 572 | } |
573 | 573 | } |
574 | 574 | |
575 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
575 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
576 | 576 | /** |
577 | 577 | * Update the link between localtax payment and the line into llx_bank |
578 | 578 | * |
@@ -581,7 +581,7 @@ discard block |
||
581 | 581 | */ |
582 | 582 | public function update_fk_bank($id) |
583 | 583 | { |
584 | - // phpcs:enable |
|
584 | + // phpcs:enable |
|
585 | 585 | $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'localtax SET fk_bank = ' . ((int) $id); |
586 | 586 | $sql .= ' WHERE rowid = ' . ((int) $this->id); |
587 | 587 | $result = $this->db->query($sql); |
@@ -636,7 +636,7 @@ discard block |
||
636 | 636 | return $this->LibStatut($this->statut, $mode); |
637 | 637 | } |
638 | 638 | |
639 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
639 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
640 | 640 | /** |
641 | 641 | * Return the label of a given status |
642 | 642 | * |
@@ -646,7 +646,7 @@ discard block |
||
646 | 646 | */ |
647 | 647 | public function LibStatut($status, $mode = 0) |
648 | 648 | { |
649 | - // phpcs:enable |
|
649 | + // phpcs:enable |
|
650 | 650 | //global $langs; |
651 | 651 | |
652 | 652 | return ''; |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | return $this->LibStatut($this->statut, $mode); |
345 | 345 | } |
346 | 346 | |
347 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
347 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
348 | 348 | /** |
349 | 349 | * Return the label of a given status |
350 | 350 | * |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | */ |
355 | 355 | public function LibStatut($status, $mode = 0) |
356 | 356 | { |
357 | - // phpcs:enable |
|
357 | + // phpcs:enable |
|
358 | 358 | global $langs; |
359 | 359 | |
360 | 360 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | } |
237 | 237 | } |
238 | 238 | |
239 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
239 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
240 | 240 | /** |
241 | 241 | * Send email to all users that has asked the withdraw request |
242 | 242 | * |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | */ |
246 | 246 | private function _send_email($fac) |
247 | 247 | { |
248 | - // phpcs:enable |
|
248 | + // phpcs:enable |
|
249 | 249 | global $langs; |
250 | 250 | |
251 | 251 | $userid = 0; |
@@ -182,7 +182,7 @@ |
||
182 | 182 | |
183 | 183 | //var_dump($this->type);exit; |
184 | 184 | |
185 | - $pai->amounts[$facs[$i][0]] = price2num($amountrejected * -1); // The payment must be negative because it is a refund |
|
185 | + $pai->amounts[$facs[$i][0]] = price2num($amountrejected * -1); // The payment must be negative because it is a refund |
|
186 | 186 | |
187 | 187 | $pai->datepaye = $date_rejet; |
188 | 188 | $pai->paiementid = 3; // type of payment: withdrawal |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | return $this->LibStatut($this->statut, $mode); |
153 | 153 | } |
154 | 154 | |
155 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
155 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
156 | 156 | /** |
157 | 157 | * Return status label for a status |
158 | 158 | * |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | */ |
163 | 163 | public function LibStatut($status, $mode = 0) |
164 | 164 | { |
165 | - // phpcs:enable |
|
165 | + // phpcs:enable |
|
166 | 166 | global $langs; |
167 | 167 | |
168 | 168 | if ($mode == 0) { |
@@ -71,8 +71,8 @@ |
||
71 | 71 | |
72 | 72 | const STATUS_DRAFT = 0; |
73 | 73 | const STATUS_NOT_USED = 1; |
74 | - const STATUS_CREDITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
75 | - const STATUS_DEBITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
74 | + const STATUS_CREDITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
75 | + const STATUS_DEBITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
76 | 76 | const STATUS_REJECTED = 3; |
77 | 77 | |
78 | 78 |
@@ -90,8 +90,8 @@ discard block |
||
90 | 90 | '', |
91 | 91 | array( |
92 | 92 | 'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'), |
93 | - 'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'), |
|
94 | - 'login' => array('name' => 'login', 'type' => 'xsd:string'), |
|
93 | + 'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'), |
|
94 | + 'login' => array('name' => 'login', 'type' => 'xsd:string'), |
|
95 | 95 | 'password' => array('name' => 'password', 'type' => 'xsd:string'), |
96 | 96 | 'entity' => array('name' => 'entity', 'type' => 'xsd:string') |
97 | 97 | ) |
@@ -120,12 +120,12 @@ discard block |
||
120 | 120 | 'amount' => array('name' => 'amount', 'type' => 'xsd:double'), |
121 | 121 | 'num_payment' => array('name' => 'num_payment', 'type' => 'xsd:string'), |
122 | 122 | 'thirdparty_id' => array('name' => 'thirdparty_id', 'type' => 'xsd:int'), |
123 | - 'bank_account' => array('name' => 'bank_account', 'type' => 'xsd:int'), |
|
124 | - 'payment_mode_id' => array('name' => 'payment_mode_id', 'type' => 'xsd:int'), |
|
125 | - 'invoice_id' => array('name' => 'invoice_id', 'type' => 'xsd:int'), |
|
126 | - 'int_label' => array('name' => 'int_label', 'type' => 'xsd:string'), |
|
127 | - 'emitter' => array('name' => 'emitter', 'type' => 'xsd:string'), |
|
128 | - 'bank_source' => array('name' => 'bank_source', 'type' => 'xsd:string'), |
|
123 | + 'bank_account' => array('name' => 'bank_account', 'type' => 'xsd:int'), |
|
124 | + 'payment_mode_id' => array('name' => 'payment_mode_id', 'type' => 'xsd:int'), |
|
125 | + 'invoice_id' => array('name' => 'invoice_id', 'type' => 'xsd:int'), |
|
126 | + 'int_label' => array('name' => 'int_label', 'type' => 'xsd:string'), |
|
127 | + 'emitter' => array('name' => 'emitter', 'type' => 'xsd:string'), |
|
128 | + 'bank_source' => array('name' => 'bank_source', 'type' => 'xsd:string'), |
|
129 | 129 | ) |
130 | 130 | ); |
131 | 131 | |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $now = dol_now(); |
166 | 166 | |
167 | 167 | dol_syslog("Function: createPayment login=" . $authentication['login'] . " id=" . $payment->id . |
168 | - ", ref=" . $payment->ref . ", ref_ext=" . $payment->ref_ext); |
|
168 | + ", ref=" . $payment->ref . ", ref_ext=" . $payment->ref_ext); |
|
169 | 169 | |
170 | 170 | if ($authentication['entity']) { |
171 | 171 | $conf->entity = $authentication['entity']; |