@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | } |
| 428 | 428 | |
| 429 | 429 | |
| 430 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 430 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 431 | 431 | /** |
| 432 | 432 | * Delete bank line records |
| 433 | 433 | * |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | */ |
| 437 | 437 | public function delete_urls(User $user = null) |
| 438 | 438 | { |
| 439 | - // phpcs:enable |
|
| 439 | + // phpcs:enable |
|
| 440 | 440 | $nbko = 0; |
| 441 | 441 | |
| 442 | 442 | if ($this->rappro) { |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | |
| 523 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 523 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 524 | 524 | /** |
| 525 | 525 | * Update conciliation field |
| 526 | 526 | * |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | */ |
| 532 | 532 | public function update_conciliation(User $user, $cat, $conciliated = 1) |
| 533 | 533 | { |
| 534 | - // phpcs:enable |
|
| 534 | + // phpcs:enable |
|
| 535 | 535 | global $conf, $langs; |
| 536 | 536 | |
| 537 | 537 | $this->db->begin(); |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | } |
| 583 | 583 | |
| 584 | 584 | |
| 585 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 585 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 586 | 586 | /** |
| 587 | 587 | * Increase/decrease value date of a rowid |
| 588 | 588 | * |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | */ |
| 593 | 593 | public function datev_change($rowid, $sign = 1) |
| 594 | 594 | { |
| 595 | - // phpcs:enable |
|
| 595 | + // phpcs:enable |
|
| 596 | 596 | $sql = "SELECT datev FROM " . MAIN_DB_PREFIX . "bank WHERE rowid = " . ((int) $rowid); |
| 597 | 597 | $resql = $this->db->query($sql); |
| 598 | 598 | if ($resql) { |
@@ -618,7 +618,7 @@ discard block |
||
| 618 | 618 | return 0; |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 621 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 622 | 622 | /** |
| 623 | 623 | * Increase value date of a rowid |
| 624 | 624 | * |
@@ -627,11 +627,11 @@ discard block |
||
| 627 | 627 | */ |
| 628 | 628 | public function datev_next($id) |
| 629 | 629 | { |
| 630 | - // phpcs:enable |
|
| 630 | + // phpcs:enable |
|
| 631 | 631 | return $this->datev_change($id, 1); |
| 632 | 632 | } |
| 633 | 633 | |
| 634 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 634 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 635 | 635 | /** |
| 636 | 636 | * Decrease value date of a rowid |
| 637 | 637 | * |
@@ -640,12 +640,12 @@ discard block |
||
| 640 | 640 | */ |
| 641 | 641 | public function datev_previous($id) |
| 642 | 642 | { |
| 643 | - // phpcs:enable |
|
| 643 | + // phpcs:enable |
|
| 644 | 644 | return $this->datev_change($id, -1); |
| 645 | 645 | } |
| 646 | 646 | |
| 647 | 647 | |
| 648 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 648 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 649 | 649 | /** |
| 650 | 650 | * Increase/decrease operation date of a rowid |
| 651 | 651 | * |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | */ |
| 656 | 656 | public function dateo_change($rowid, $sign = 1) |
| 657 | 657 | { |
| 658 | - // phpcs:enable |
|
| 658 | + // phpcs:enable |
|
| 659 | 659 | $sql = "SELECT dateo FROM " . MAIN_DB_PREFIX . "bank WHERE rowid = " . ((int) $rowid); |
| 660 | 660 | $resql = $this->db->query($sql); |
| 661 | 661 | if ($resql) { |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | return 0; |
| 682 | 682 | } |
| 683 | 683 | |
| 684 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 684 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 685 | 685 | /** |
| 686 | 686 | * Increase operation date of a rowid |
| 687 | 687 | * |
@@ -690,11 +690,11 @@ discard block |
||
| 690 | 690 | */ |
| 691 | 691 | public function dateo_next($id) |
| 692 | 692 | { |
| 693 | - // phpcs:enable |
|
| 693 | + // phpcs:enable |
|
| 694 | 694 | return $this->dateo_change($id, 1); |
| 695 | 695 | } |
| 696 | 696 | |
| 697 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 697 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 698 | 698 | /** |
| 699 | 699 | * Decrease operation date of a rowid |
| 700 | 700 | * |
@@ -703,7 +703,7 @@ discard block |
||
| 703 | 703 | */ |
| 704 | 704 | public function dateo_previous($id) |
| 705 | 705 | { |
| 706 | - // phpcs:enable |
|
| 706 | + // phpcs:enable |
|
| 707 | 707 | return $this->dateo_change($id, -1); |
| 708 | 708 | } |
| 709 | 709 | |
@@ -822,7 +822,7 @@ discard block |
||
| 822 | 822 | return $this->LibStatut($this->status, $mode); |
| 823 | 823 | } |
| 824 | 824 | |
| 825 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 825 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 826 | 826 | /** |
| 827 | 827 | * Return the label of a given status |
| 828 | 828 | * |
@@ -832,7 +832,7 @@ discard block |
||
| 832 | 832 | */ |
| 833 | 833 | public function LibStatut($status, $mode = 0) |
| 834 | 834 | { |
| 835 | - // phpcs:enable |
|
| 835 | + // phpcs:enable |
|
| 836 | 836 | return ''; |
| 837 | 837 | } |
| 838 | 838 | |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | } |
| 448 | 448 | |
| 449 | 449 | |
| 450 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 450 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 451 | 451 | /** |
| 452 | 452 | * Add a link between bank line record and its source |
| 453 | 453 | * |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | */ |
| 461 | 461 | public function add_url_line($line_id, $url_id, $url, $label, $type) |
| 462 | 462 | { |
| 463 | - // phpcs:enable |
|
| 463 | + // phpcs:enable |
|
| 464 | 464 | $sql = "INSERT INTO " . MAIN_DB_PREFIX . "bank_url ("; |
| 465 | 465 | $sql .= "fk_bank"; |
| 466 | 466 | $sql .= ", url_id"; |
@@ -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 | * TODO Move this into AccountLine |
| 491 | 491 | * Return array with links from llx_bank_url |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | */ |
| 498 | 498 | public function get_url($fk_bank = 0, $url_id = 0, $type = '') |
| 499 | 499 | { |
| 500 | - // phpcs:enable |
|
| 500 | + // phpcs:enable |
|
| 501 | 501 | $lines = array(); |
| 502 | 502 | |
| 503 | 503 | // Check parameters |
@@ -948,7 +948,7 @@ discard block |
||
| 948 | 948 | } |
| 949 | 949 | |
| 950 | 950 | |
| 951 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 951 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 952 | 952 | /** |
| 953 | 953 | * Update BBAN (RIB) account fields |
| 954 | 954 | * |
@@ -957,7 +957,7 @@ discard block |
||
| 957 | 957 | */ |
| 958 | 958 | public function update_bban(User $user = null) |
| 959 | 959 | { |
| 960 | - // phpcs:enable |
|
| 960 | + // phpcs:enable |
|
| 961 | 961 | global $conf, $langs; |
| 962 | 962 | |
| 963 | 963 | // Load library to get BAN control function |
@@ -1193,7 +1193,7 @@ discard block |
||
| 1193 | 1193 | return $this->LibStatut($this->clos, $mode); |
| 1194 | 1194 | } |
| 1195 | 1195 | |
| 1196 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1196 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1197 | 1197 | /** |
| 1198 | 1198 | * Return label of given object status |
| 1199 | 1199 | * |
@@ -1203,7 +1203,7 @@ discard block |
||
| 1203 | 1203 | */ |
| 1204 | 1204 | public function LibStatut($status, $mode = 0) |
| 1205 | 1205 | { |
| 1206 | - // phpcs:enable |
|
| 1206 | + // phpcs:enable |
|
| 1207 | 1207 | global $langs; |
| 1208 | 1208 | $langs->load('banks'); |
| 1209 | 1209 | |
@@ -1221,7 +1221,7 @@ discard block |
||
| 1221 | 1221 | } |
| 1222 | 1222 | |
| 1223 | 1223 | |
| 1224 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1224 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1225 | 1225 | /** |
| 1226 | 1226 | * Indicates if an account can be deleted or not (without movements) |
| 1227 | 1227 | * |
@@ -1229,7 +1229,7 @@ discard block |
||
| 1229 | 1229 | */ |
| 1230 | 1230 | public function can_be_deleted() |
| 1231 | 1231 | { |
| 1232 | - // phpcs:enable |
|
| 1232 | + // phpcs:enable |
|
| 1233 | 1233 | $can_be_deleted = false; |
| 1234 | 1234 | |
| 1235 | 1235 | $sql = "SELECT COUNT(rowid) as nb"; |
@@ -1293,7 +1293,7 @@ discard block |
||
| 1293 | 1293 | return (float) price2num($solde, 'MU'); |
| 1294 | 1294 | } |
| 1295 | 1295 | |
| 1296 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1296 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1297 | 1297 | /** |
| 1298 | 1298 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
| 1299 | 1299 | * |
@@ -1303,7 +1303,7 @@ discard block |
||
| 1303 | 1303 | */ |
| 1304 | 1304 | public function load_board(User $user, $filteraccountid = 0) |
| 1305 | 1305 | { |
| 1306 | - // phpcs:enable |
|
| 1306 | + // phpcs:enable |
|
| 1307 | 1307 | global $conf, $langs; |
| 1308 | 1308 | |
| 1309 | 1309 | if ($user->socid) { |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | return $this->LibStatut($this->status, $mode); |
| 437 | 437 | } |
| 438 | 438 | |
| 439 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 439 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 440 | 440 | /** |
| 441 | 441 | * Return the status |
| 442 | 442 | * |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | */ |
| 447 | 447 | public function LibStatut($status, $mode = 0) |
| 448 | 448 | { |
| 449 | - // phpcs:enable |
|
| 449 | + // phpcs:enable |
|
| 450 | 450 | return ''; |
| 451 | 451 | } |
| 452 | 452 | |
@@ -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 | |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | } |
| 625 | 625 | } |
| 626 | 626 | |
| 627 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 627 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 628 | 628 | /** |
| 629 | 629 | * Update DB line fields total_xxx |
| 630 | 630 | * Used by migration |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | */ |
| 634 | 634 | public function update_total() |
| 635 | 635 | { |
| 636 | - // phpcs:enable |
|
| 636 | + // phpcs:enable |
|
| 637 | 637 | $this->db->begin(); |
| 638 | 638 | |
| 639 | 639 | // Clean parameters |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | } |
| 608 | 608 | } |
| 609 | 609 | |
| 610 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 610 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 611 | 611 | /** |
| 612 | 612 | * Set draft status |
| 613 | 613 | * |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | */ |
| 618 | 618 | public function setDraft($user, $idwarehouse = -1) |
| 619 | 619 | { |
| 620 | - //phpcs:enable |
|
| 620 | + //phpcs:enable |
|
| 621 | 621 | global $conf, $langs; |
| 622 | 622 | |
| 623 | 623 | $error = 0; |
@@ -697,7 +697,7 @@ discard block |
||
| 697 | 697 | } |
| 698 | 698 | |
| 699 | 699 | |
| 700 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 700 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 701 | 701 | /** |
| 702 | 702 | * Tag the order as validated (opened) |
| 703 | 703 | * Function used when order is reopend after being closed. |
@@ -707,7 +707,7 @@ discard block |
||
| 707 | 707 | */ |
| 708 | 708 | public function set_reopen($user) |
| 709 | 709 | { |
| 710 | - // phpcs:enable |
|
| 710 | + // phpcs:enable |
|
| 711 | 711 | $error = 0; |
| 712 | 712 | |
| 713 | 713 | if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED) { |
@@ -1737,7 +1737,7 @@ discard block |
||
| 1737 | 1737 | } |
| 1738 | 1738 | |
| 1739 | 1739 | |
| 1740 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1740 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1741 | 1741 | /** |
| 1742 | 1742 | * Add line into array |
| 1743 | 1743 | * $this->client must be loaded |
@@ -1753,7 +1753,7 @@ discard block |
||
| 1753 | 1753 | */ |
| 1754 | 1754 | public function add_product($idproduct, $qty, $remise_percent = 0.0, $date_start = '', $date_end = '') |
| 1755 | 1755 | { |
| 1756 | - // phpcs:enable |
|
| 1756 | + // phpcs:enable |
|
| 1757 | 1757 | global $conf, $mysoc; |
| 1758 | 1758 | |
| 1759 | 1759 | if (!$qty) { |
@@ -1989,7 +1989,7 @@ discard block |
||
| 1989 | 1989 | } |
| 1990 | 1990 | |
| 1991 | 1991 | |
| 1992 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1992 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1993 | 1993 | /** |
| 1994 | 1994 | * Add line of fixed discount in the order in DB |
| 1995 | 1995 | * |
@@ -1998,7 +1998,7 @@ discard block |
||
| 1998 | 1998 | */ |
| 1999 | 1999 | public function insert_discount($idremise) |
| 2000 | 2000 | { |
| 2001 | - // phpcs:enable |
|
| 2001 | + // phpcs:enable |
|
| 2002 | 2002 | global $langs; |
| 2003 | 2003 | |
| 2004 | 2004 | include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'; |
@@ -2058,7 +2058,7 @@ discard block |
||
| 2058 | 2058 | } |
| 2059 | 2059 | |
| 2060 | 2060 | |
| 2061 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2061 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2062 | 2062 | /** |
| 2063 | 2063 | * Load array lines |
| 2064 | 2064 | * |
@@ -2068,7 +2068,7 @@ discard block |
||
| 2068 | 2068 | */ |
| 2069 | 2069 | public function fetch_lines($only_product = 0, $loadalsotranslation = 0) |
| 2070 | 2070 | { |
| 2071 | - // phpcs:enable |
|
| 2071 | + // phpcs:enable |
|
| 2072 | 2072 | global $langs, $conf; |
| 2073 | 2073 | |
| 2074 | 2074 | $this->lines = array(); |
@@ -2335,7 +2335,7 @@ discard block |
||
| 2335 | 2335 | return 0; |
| 2336 | 2336 | } |
| 2337 | 2337 | |
| 2338 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2338 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2339 | 2339 | /** |
| 2340 | 2340 | * Return a array with the pending stock by product |
| 2341 | 2341 | * |
@@ -2426,7 +2426,7 @@ discard block |
||
| 2426 | 2426 | } |
| 2427 | 2427 | } |
| 2428 | 2428 | |
| 2429 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2429 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2430 | 2430 | /** |
| 2431 | 2431 | * Applique une remise relative |
| 2432 | 2432 | * |
@@ -2439,7 +2439,7 @@ discard block |
||
| 2439 | 2439 | */ |
| 2440 | 2440 | public function set_remise($user, $remise, $notrigger = 0) |
| 2441 | 2441 | { |
| 2442 | - // phpcs:enable |
|
| 2442 | + // phpcs:enable |
|
| 2443 | 2443 | dol_syslog(get_class($this) . "::set_remise is deprecated, use setDiscount instead", LOG_NOTICE); |
| 2444 | 2444 | // @phan-suppress-next-line PhanDeprecatedFunction |
| 2445 | 2445 | return $this->setDiscount($user, $remise, $notrigger); |
@@ -2507,7 +2507,7 @@ discard block |
||
| 2507 | 2507 | } |
| 2508 | 2508 | |
| 2509 | 2509 | |
| 2510 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2510 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2511 | 2511 | /** |
| 2512 | 2512 | * Set a fixed amount discount |
| 2513 | 2513 | * |
@@ -2574,7 +2574,7 @@ discard block |
||
| 2574 | 2574 | } |
| 2575 | 2575 | */ |
| 2576 | 2576 | |
| 2577 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2577 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2578 | 2578 | /** |
| 2579 | 2579 | * Set the order date |
| 2580 | 2580 | * |
@@ -2585,7 +2585,7 @@ discard block |
||
| 2585 | 2585 | */ |
| 2586 | 2586 | public function set_date($user, $date, $notrigger = 0) |
| 2587 | 2587 | { |
| 2588 | - // phpcs:enable |
|
| 2588 | + // phpcs:enable |
|
| 2589 | 2589 | if ($user->hasRight('commande', 'creer')) { |
| 2590 | 2590 | $error = 0; |
| 2591 | 2591 | |
@@ -2632,7 +2632,7 @@ discard block |
||
| 2632 | 2632 | } |
| 2633 | 2633 | } |
| 2634 | 2634 | |
| 2635 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2635 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2636 | 2636 | /** |
| 2637 | 2637 | * Set delivery date |
| 2638 | 2638 | * |
@@ -2644,7 +2644,7 @@ discard block |
||
| 2644 | 2644 | */ |
| 2645 | 2645 | public function set_date_livraison($user, $delivery_date, $notrigger = 0) |
| 2646 | 2646 | { |
| 2647 | - // phpcs:enable |
|
| 2647 | + // phpcs:enable |
|
| 2648 | 2648 | return $this->setDeliveryDate($user, $delivery_date, $notrigger); |
| 2649 | 2649 | } |
| 2650 | 2650 | |
@@ -2704,7 +2704,7 @@ discard block |
||
| 2704 | 2704 | } |
| 2705 | 2705 | } |
| 2706 | 2706 | |
| 2707 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2707 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2708 | 2708 | /** |
| 2709 | 2709 | * Return list of orders (eventuelly filtered on a user) into an array |
| 2710 | 2710 | * |
@@ -2720,7 +2720,7 @@ discard block |
||
| 2720 | 2720 | */ |
| 2721 | 2721 | public function liste_array($shortlist = 0, $draft = 0, $excluser = null, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'c.date_commande', $sortorder = 'DESC') |
| 2722 | 2722 | { |
| 2723 | - // phpcs:enable |
|
| 2723 | + // phpcs:enable |
|
| 2724 | 2724 | global $user; |
| 2725 | 2725 | |
| 2726 | 2726 | $ga = array(); |
@@ -2840,7 +2840,7 @@ discard block |
||
| 2840 | 2840 | } |
| 2841 | 2841 | } |
| 2842 | 2842 | |
| 2843 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2843 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2844 | 2844 | /** |
| 2845 | 2845 | * Update order demand_reason |
| 2846 | 2846 | * |
@@ -2850,7 +2850,7 @@ discard block |
||
| 2850 | 2850 | */ |
| 2851 | 2851 | public function demand_reason($demand_reason_id, $notrigger = 0) |
| 2852 | 2852 | { |
| 2853 | - // phpcs:enable |
|
| 2853 | + // phpcs:enable |
|
| 2854 | 2854 | global $user; |
| 2855 | 2855 | |
| 2856 | 2856 | dol_syslog('Commande::demand_reason(' . $demand_reason_id . ')'); |
@@ -2904,7 +2904,7 @@ discard block |
||
| 2904 | 2904 | } |
| 2905 | 2905 | } |
| 2906 | 2906 | |
| 2907 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2907 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2908 | 2908 | /** |
| 2909 | 2909 | * Set customer ref |
| 2910 | 2910 | * |
@@ -2915,7 +2915,7 @@ discard block |
||
| 2915 | 2915 | */ |
| 2916 | 2916 | public function set_ref_client($user, $ref_client, $notrigger = 0) |
| 2917 | 2917 | { |
| 2918 | - // phpcs:enable |
|
| 2918 | + // phpcs:enable |
|
| 2919 | 2919 | if ($user->hasRight('commande', 'creer')) { |
| 2920 | 2920 | $error = 0; |
| 2921 | 2921 | |
@@ -3546,7 +3546,7 @@ discard block |
||
| 3546 | 3546 | } |
| 3547 | 3547 | |
| 3548 | 3548 | |
| 3549 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3549 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3550 | 3550 | /** |
| 3551 | 3551 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
| 3552 | 3552 | * |
@@ -3556,7 +3556,7 @@ discard block |
||
| 3556 | 3556 | */ |
| 3557 | 3557 | public function load_board($user, $mode) |
| 3558 | 3558 | { |
| 3559 | - // phpcs:enable |
|
| 3559 | + // phpcs:enable |
|
| 3560 | 3560 | global $conf, $langs; |
| 3561 | 3561 | |
| 3562 | 3562 | $clause = " WHERE"; |
@@ -3665,7 +3665,7 @@ discard block |
||
| 3665 | 3665 | return $this->LibStatut($this->statut, $this->billed, $mode); |
| 3666 | 3666 | } |
| 3667 | 3667 | |
| 3668 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3668 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3669 | 3669 | /** |
| 3670 | 3670 | * Return label of status |
| 3671 | 3671 | * |
@@ -3677,7 +3677,7 @@ discard block |
||
| 3677 | 3677 | */ |
| 3678 | 3678 | public function LibStatut($status, $billed, $mode, $donotshowbilled = 0) |
| 3679 | 3679 | { |
| 3680 | - // phpcs:enable |
|
| 3680 | + // phpcs:enable |
|
| 3681 | 3681 | global $langs, $hookmanager; |
| 3682 | 3682 | |
| 3683 | 3683 | $billedtext = ''; |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | return $this->LibStatut((isset($this->statut) ? $this->statut : $this->status), $mode); |
| 835 | 835 | } |
| 836 | 836 | |
| 837 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 837 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 838 | 838 | /** |
| 839 | 839 | * Returns the label of a status |
| 840 | 840 | * |
@@ -844,7 +844,7 @@ discard block |
||
| 844 | 844 | */ |
| 845 | 845 | public function LibStatut($status, $mode = 0) |
| 846 | 846 | { |
| 847 | - // phpcs:enable |
|
| 847 | + // phpcs:enable |
|
| 848 | 848 | // Init/load array of translation of status |
| 849 | 849 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
| 850 | 850 | global $langs; |
@@ -1198,7 +1198,7 @@ discard block |
||
| 1198 | 1198 | } |
| 1199 | 1199 | } |
| 1200 | 1200 | |
| 1201 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1201 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1202 | 1202 | /** |
| 1203 | 1203 | * Defines a delivery date of intervention |
| 1204 | 1204 | * |
@@ -1208,7 +1208,7 @@ discard block |
||
| 1208 | 1208 | */ |
| 1209 | 1209 | public function set_date_delivery($user, $date_delivery) |
| 1210 | 1210 | { |
| 1211 | - // phpcs:enable |
|
| 1211 | + // phpcs:enable |
|
| 1212 | 1212 | if ($user->hasRight('ficheinter', 'creer')) { |
| 1213 | 1213 | $sql = "UPDATE " . MAIN_DB_PREFIX . "fichinter "; |
| 1214 | 1214 | $sql .= " SET datei = '" . $this->db->idate($date_delivery) . "'"; |
@@ -1228,7 +1228,7 @@ discard block |
||
| 1228 | 1228 | return 0; |
| 1229 | 1229 | } |
| 1230 | 1230 | |
| 1231 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1231 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1232 | 1232 | /** |
| 1233 | 1233 | * Define the label of the intervention |
| 1234 | 1234 | * |
@@ -1238,7 +1238,7 @@ discard block |
||
| 1238 | 1238 | */ |
| 1239 | 1239 | public function set_description($user, $description) |
| 1240 | 1240 | { |
| 1241 | - // phpcs:enable |
|
| 1241 | + // phpcs:enable |
|
| 1242 | 1242 | if ($user->hasRight('ficheinter', 'creer')) { |
| 1243 | 1243 | $sql = "UPDATE " . MAIN_DB_PREFIX . "fichinter "; |
| 1244 | 1244 | $sql .= " SET description = '" . $this->db->escape($description) . "',"; |
@@ -1259,7 +1259,7 @@ discard block |
||
| 1259 | 1259 | } |
| 1260 | 1260 | |
| 1261 | 1261 | |
| 1262 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1262 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1263 | 1263 | /** |
| 1264 | 1264 | * Link intervention to a contract |
| 1265 | 1265 | * |
@@ -1269,7 +1269,7 @@ discard block |
||
| 1269 | 1269 | */ |
| 1270 | 1270 | public function set_contrat($user, $contractid) |
| 1271 | 1271 | { |
| 1272 | - // phpcs:enable |
|
| 1272 | + // phpcs:enable |
|
| 1273 | 1273 | if ($user->hasRight('ficheinter', 'creer')) { |
| 1274 | 1274 | $sql = "UPDATE " . MAIN_DB_PREFIX . "fichinter "; |
| 1275 | 1275 | $sql .= " SET fk_contrat = " . ((int) $contractid); |
@@ -1466,7 +1466,7 @@ discard block |
||
| 1466 | 1466 | return 1; |
| 1467 | 1467 | } |
| 1468 | 1468 | |
| 1469 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1469 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1470 | 1470 | /** |
| 1471 | 1471 | * Load array lines ->lines |
| 1472 | 1472 | * |
@@ -1474,7 +1474,7 @@ discard block |
||
| 1474 | 1474 | */ |
| 1475 | 1475 | public function fetch_lines() |
| 1476 | 1476 | { |
| 1477 | - // phpcs:enable |
|
| 1477 | + // phpcs:enable |
|
| 1478 | 1478 | $this->lines = array(); |
| 1479 | 1479 | |
| 1480 | 1480 | $sql = "SELECT rowid, fk_fichinter, description, duree, date, rang"; |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | } |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 286 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 287 | 287 | /** |
| 288 | 288 | * Update total duration into llx_fichinter |
| 289 | 289 | * |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | public function update_total() |
| 293 | 293 | { |
| 294 | - // phpcs:enable |
|
| 294 | + // phpcs:enable |
|
| 295 | 295 | global $conf; |
| 296 | 296 | |
| 297 | 297 | $this->db->begin(); |
@@ -1202,14 +1202,14 @@ discard block |
||
| 1202 | 1202 | id="db_pass" autocomplete="off" |
| 1203 | 1203 | name="db_pass" |
| 1204 | 1204 | value="<?php |
| 1205 | - // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1. |
|
| 1206 | - // @phan-suppress-next-line PhanParamSuspiciousOrder |
|
| 1207 | - $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*')); |
|
| 1208 | - if (!empty($dolibarr_main_prod) && empty($_SESSION['dol_save_pass'])) { // So value can't be found if install page still accessible |
|
| 1205 | + // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1. |
|
| 1206 | + // @phan-suppress-next-line PhanParamSuspiciousOrder |
|
| 1207 | + $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*')); |
|
| 1208 | + if (!empty($dolibarr_main_prod) && empty($_SESSION['dol_save_pass'])) { // So value can't be found if install page still accessible |
|
| 1209 | 1209 | $autofill = ''; |
| 1210 | - } |
|
| 1211 | - print dol_escape_htmltag($autofill); |
|
| 1212 | - ?>" |
|
| 1210 | + } |
|
| 1211 | + print dol_escape_htmltag($autofill); |
|
| 1212 | + ?>" |
|
| 1213 | 1213 | <?php if ($force_install_noedit == 2 && $force_install_databasepass !== null) { |
| 1214 | 1214 | print ' disabled'; |
| 1215 | 1215 | } ?> |
@@ -1291,23 +1291,23 @@ discard block |
||
| 1291 | 1291 | name="db_pass_root" |
| 1292 | 1292 | class="needroot text-security" |
| 1293 | 1293 | value="<?php |
| 1294 | - // If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1. |
|
| 1295 | - // @phan-suppress-next-line PhanParamSuspiciousOrder |
|
| 1296 | - $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : '')); |
|
| 1297 | - if (!empty($dolibarr_main_prod)) { |
|
| 1294 | + // If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1. |
|
| 1295 | + // @phan-suppress-next-line PhanParamSuspiciousOrder |
|
| 1296 | + $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : '')); |
|
| 1297 | + if (!empty($dolibarr_main_prod)) { |
|
| 1298 | 1298 | $autofill = ''; |
| 1299 | - } |
|
| 1300 | - // Do not autofill password if instance is a production instance |
|
| 1301 | - if ( |
|
| 1302 | - !empty($_SERVER["SERVER_NAME"]) && !in_array( |
|
| 1303 | - $_SERVER["SERVER_NAME"], |
|
| 1304 | - ['127.0.0.1', 'localhost', 'localhostgit'] |
|
| 1305 | - ) |
|
| 1306 | - ) { |
|
| 1299 | + } |
|
| 1300 | + // Do not autofill password if instance is a production instance |
|
| 1301 | + if ( |
|
| 1302 | + !empty($_SERVER["SERVER_NAME"]) && !in_array( |
|
| 1303 | + $_SERVER["SERVER_NAME"], |
|
| 1304 | + ['127.0.0.1', 'localhost', 'localhostgit'] |
|
| 1305 | + ) |
|
| 1306 | + ) { |
|
| 1307 | 1307 | $autofill = ''; |
| 1308 | - } // Do not autofill password for remote access |
|
| 1309 | - print dol_escape_htmltag($autofill); |
|
| 1310 | - ?>" |
|
| 1308 | + } // Do not autofill password for remote access |
|
| 1309 | + print dol_escape_htmltag($autofill); |
|
| 1310 | + ?>" |
|
| 1311 | 1311 | <?php if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) { |
| 1312 | 1312 | print ' disabled'; /* May be removed by javascript*/ |
| 1313 | 1313 | } ?> |