@@ -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 | * Return the label of a given status |
| 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; |
| 609 | 609 | |
| 610 | 610 | $langs->load('compta'); |
@@ -891,7 +891,7 @@ discard block |
||
| 891 | 891 | } |
| 892 | 892 | |
| 893 | 893 | |
| 894 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 894 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 895 | 895 | /** |
| 896 | 896 | * Load the third party of object, from id into this->thirdparty |
| 897 | 897 | * |
@@ -900,7 +900,7 @@ discard block |
||
| 900 | 900 | */ |
| 901 | 901 | public function fetch_thirdparty($force_thirdparty_id = 0) |
| 902 | 902 | { |
| 903 | - // phpcs:enable |
|
| 903 | + // phpcs:enable |
|
| 904 | 904 | require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; |
| 905 | 905 | |
| 906 | 906 | if (empty($force_thirdparty_id)) { |
@@ -143,7 +143,7 @@ |
||
| 143 | 143 | $this->note_private = $obj->note; |
| 144 | 144 | $this->type_code = $obj->payment_code; |
| 145 | 145 | $this->type_label = $obj->payment_type; |
| 146 | - $this->fk_paiement = $obj->fk_paiement; |
|
| 146 | + $this->fk_paiement = $obj->fk_paiement; |
|
| 147 | 147 | $this->statut = $obj->statut; |
| 148 | 148 | |
| 149 | 149 | $error = 1; |
@@ -699,7 +699,7 @@ discard block |
||
| 699 | 699 | return $this->fetch_lines(); |
| 700 | 700 | } |
| 701 | 701 | |
| 702 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 702 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 703 | 703 | /** |
| 704 | 704 | * Get lines of template invoices into this->lines |
| 705 | 705 | * |
@@ -707,7 +707,7 @@ discard block |
||
| 707 | 707 | */ |
| 708 | 708 | public function fetch_lines() |
| 709 | 709 | { |
| 710 | - // phpcs:enable |
|
| 710 | + // phpcs:enable |
|
| 711 | 711 | $this->lines = array(); |
| 712 | 712 | |
| 713 | 713 | // Retrieve all extrafield for line |
@@ -1512,7 +1512,7 @@ discard block |
||
| 1512 | 1512 | return $this->LibStatut($this->frequency ? 1 : 0, $this->suspended, $mode, $alreadypaid, empty($this->type) ? 0 : $this->type); |
| 1513 | 1513 | } |
| 1514 | 1514 | |
| 1515 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1515 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1516 | 1516 | /** |
| 1517 | 1517 | * Return label of a status |
| 1518 | 1518 | * |
@@ -1525,7 +1525,7 @@ discard block |
||
| 1525 | 1525 | */ |
| 1526 | 1526 | public function LibStatut($recur, $status, $mode = 0, $alreadypaid = -1, $type = 0) |
| 1527 | 1527 | { |
| 1528 | - // phpcs:enable |
|
| 1528 | + // phpcs:enable |
|
| 1529 | 1529 | global $langs; |
| 1530 | 1530 | $langs->load('bills'); |
| 1531 | 1531 | |
@@ -337,13 +337,13 @@ discard block |
||
| 337 | 337 | $sql .= ", '" . $this->db->idate($now) . "'"; |
| 338 | 338 | $sql .= ", " . ((int) $this->suspended); |
| 339 | 339 | $sql .= ", '" . $this->db->escape($this->libelle) . "'"; |
| 340 | - $sql .= ", " . (!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0'); // amount |
|
| 340 | + $sql .= ", " . (!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0'); // amount |
|
| 341 | 341 | $sql .= ", " . ((int) $user->id); |
| 342 | 342 | $sql .= ", " . (!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL'); |
| 343 | 343 | $sql .= ", " . (!empty($facfourn_src->fk_account) ? ((int) $facfourn_src->fk_account) : 'NULL'); |
| 344 | 344 | $sql .= ", " . ($this->cond_reglement_id > 0 ? (int) $this->cond_reglement_id : 'NULL'); |
| 345 | 345 | $sql .= ", " . ($this->mode_reglement_id > 0 ? (int) $this->mode_reglement_id : 'NULL'); |
| 346 | - $sql .= ", " . ($facfourn_src->date_echeance > 0 ? "'" . $this->db->idate($facfourn_src->date_echeance) . "'" : 'NULL'); // date_lim_reglement |
|
| 346 | + $sql .= ", " . ($facfourn_src->date_echeance > 0 ? "'" . $this->db->idate($facfourn_src->date_echeance) . "'" : 'NULL'); // date_lim_reglement |
|
| 347 | 347 | $sql .= ", " . (!empty($this->note_private) ? "'" . $this->db->escape($this->note_private) . "'" : 'NULL'); |
| 348 | 348 | $sql .= ", " . (!empty($this->note_public) ? "'" . $this->db->escape($this->note_public) . "'" : 'NULL'); |
| 349 | 349 | $sql .= ", " . (!empty($this->model_pdf) ? "'" . $this->db->escape($this->model_pdf) . "'" : 'NULL'); |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | $error = 0; |
| 499 | 499 | |
| 500 | 500 | $sql = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_rec SET"; |
| 501 | - $sql .= " titre = '" . (!empty($this->title) ? $this->db->escape($this->title) : "") . "'," ; |
|
| 501 | + $sql .= " titre = '" . (!empty($this->title) ? $this->db->escape($this->title) : "") . "',"; |
|
| 502 | 502 | $sql .= " ref_supplier = '" . (!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "") . "',"; |
| 503 | 503 | $sql .= " entity = " . (!empty($this->entity) ? ((int) $this->entity) : 1) . ','; |
| 504 | 504 | if (!empty($this->socid) && $this->socid > 0) { |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | $line->product_type = $objp->product_type; |
| 773 | 773 | $line->date_start = $objp->date_start; |
| 774 | 774 | $line->date_end = $objp->date_end; |
| 775 | - $line->info_bits = $objp->info_bits ; |
|
| 775 | + $line->info_bits = $objp->info_bits; |
|
| 776 | 776 | $line->special_code = $objp->special_code; |
| 777 | 777 | $line->rang = $objp->rang; |
| 778 | 778 | $line->fk_unit = $objp->fk_unit; |
@@ -855,7 +855,7 @@ discard block |
||
| 855 | 855 | } |
| 856 | 856 | // End call triggers |
| 857 | 857 | } |
| 858 | - if (! $error) { |
|
| 858 | + if (!$error) { |
|
| 859 | 859 | $this->db->commit(); |
| 860 | 860 | return 1; |
| 861 | 861 | } else { |
@@ -999,7 +999,7 @@ discard block |
||
| 999 | 999 | $sql .= ', fk_user_author'; |
| 1000 | 1000 | $sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc'; |
| 1001 | 1001 | $sql .= ') VALUES ('; |
| 1002 | - $sql .= ' ' . (int) $facid; // source supplier invoice id |
|
| 1002 | + $sql .= ' ' . (int) $facid; // source supplier invoice id |
|
| 1003 | 1003 | $sql .= ', ' . (!empty($fk_product) ? "'" . $this->db->escape($fk_product) . "'" : 'null'); |
| 1004 | 1004 | $sql .= ', ' . (!empty($ref) ? "'" . $this->db->escape($ref) . "'" : 'null'); |
| 1005 | 1005 | $sql .= ', ' . (!empty($label) ? "'" . $this->db->escape($label) . "'" : 'null'); |
@@ -1339,7 +1339,7 @@ discard block |
||
| 1339 | 1339 | $new_fac_fourn->fk_fac_rec_source = $facturerec->id; // We will create $facture from this recurring invoice |
| 1340 | 1340 | |
| 1341 | 1341 | $new_fac_fourn->type = self::TYPE_STANDARD; |
| 1342 | - $new_fac_fourn->statut = self::STATUS_DRAFT; // deprecated |
|
| 1342 | + $new_fac_fourn->statut = self::STATUS_DRAFT; // deprecated |
|
| 1343 | 1343 | $new_fac_fourn->status = self::STATUS_DRAFT; |
| 1344 | 1344 | $new_fac_fourn->date = empty($facturerec->date_when) ? $now : $facturerec->date_when; // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later. |
| 1345 | 1345 | $new_fac_fourn->socid = $facturerec->socid; |
@@ -1348,7 +1348,7 @@ discard block |
||
| 1348 | 1348 | $new_fac_fourn->model_pdf = $facturerec->model_pdf; |
| 1349 | 1349 | $new_fac_fourn->fk_project = $facturerec->fk_project; |
| 1350 | 1350 | $new_fac_fourn->label = $facturerec->label; |
| 1351 | - $new_fac_fourn->libelle = $facturerec->label; // deprecated |
|
| 1351 | + $new_fac_fourn->libelle = $facturerec->label; // deprecated |
|
| 1352 | 1352 | |
| 1353 | 1353 | $invoiceidgenerated = $new_fac_fourn->create($user); |
| 1354 | 1354 | $laststep = "Create invoiceidgenerated $invoiceidgenerated"; |
@@ -1576,7 +1576,7 @@ discard block |
||
| 1576 | 1576 | $statusType = 'status6'; |
| 1577 | 1577 | $labelStatus = $langs->transnoentitiesnoconv('Disabled'); |
| 1578 | 1578 | } else { |
| 1579 | - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1579 | + $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1580 | 1580 | $labelStatus = $langs->transnoentitiesnoconv('Draft'); |
| 1581 | 1581 | } |
| 1582 | 1582 | } |
@@ -1595,7 +1595,7 @@ discard block |
||
| 1595 | 1595 | $statusType = 'status6'; |
| 1596 | 1596 | $labelStatus = $langs->transnoentitiesnoconv('Disabled'); |
| 1597 | 1597 | } else { |
| 1598 | - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1598 | + $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1599 | 1599 | $labelStatus = $langs->transnoentitiesnoconv('Draft'); |
| 1600 | 1600 | } |
| 1601 | 1601 | } |
@@ -1614,7 +1614,7 @@ discard block |
||
| 1614 | 1614 | $statusType = 'status6'; |
| 1615 | 1615 | $labelStatus = $langs->transnoentitiesnoconv('Disabled'); |
| 1616 | 1616 | } else { |
| 1617 | - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1617 | + $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1618 | 1618 | $labelStatus = $langs->transnoentitiesnoconv('Draft'); |
| 1619 | 1619 | } |
| 1620 | 1620 | } |
@@ -1636,7 +1636,7 @@ discard block |
||
| 1636 | 1636 | $statusType = 'status6'; |
| 1637 | 1637 | $labelStatus = $langs->transnoentitiesnoconv('Disabled'); |
| 1638 | 1638 | } else { |
| 1639 | - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1639 | + $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
| 1640 | 1640 | $labelStatus = $langs->transnoentitiesnoconv('Draft'); |
| 1641 | 1641 | } |
| 1642 | 1642 | } |
@@ -2047,8 +2047,8 @@ discard block |
||
| 2047 | 2047 | $error = 0; |
| 2048 | 2048 | $this->db->begin(); |
| 2049 | 2049 | |
| 2050 | - if (! $error) { |
|
| 2051 | - if (! $notrigger) { |
|
| 2050 | + if (!$error) { |
|
| 2051 | + if (!$notrigger) { |
|
| 2052 | 2052 | // Call triggers |
| 2053 | 2053 | $result = $this->call_trigger('LINESUPPLIERBILLREC_DELETE', $user); |
| 2054 | 2054 | if ($result < 0) { |
@@ -2058,14 +2058,14 @@ discard block |
||
| 2058 | 2058 | } |
| 2059 | 2059 | } |
| 2060 | 2060 | |
| 2061 | - if (! $error) { |
|
| 2061 | + if (!$error) { |
|
| 2062 | 2062 | $result = $this->deleteExtraFields(); |
| 2063 | 2063 | if ($result < 0) { |
| 2064 | 2064 | $error++; |
| 2065 | 2065 | } |
| 2066 | 2066 | } |
| 2067 | 2067 | |
| 2068 | - if (! $error) { |
|
| 2068 | + if (!$error) { |
|
| 2069 | 2069 | $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . (int) $this->id; |
| 2070 | 2070 | |
| 2071 | 2071 | $res = $this->db->query($sql); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 164 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 165 | 165 | /** |
| 166 | 166 | * Create a supplier category |
| 167 | 167 | * |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | */ |
| 172 | 172 | public function CreateCategory($user, $name) |
| 173 | 173 | { |
| 174 | - // phpcs:enable |
|
| 174 | + // phpcs:enable |
|
| 175 | 175 | $sql = "INSERT INTO " . MAIN_DB_PREFIX . "categorie (label,visible,type)"; |
| 176 | 176 | $sql .= " VALUES "; |
| 177 | 177 | $sql .= " ('" . $this->db->escape($name) . "',1,1)"; |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 191 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 192 | 192 | /** |
| 193 | 193 | * Return the suppliers list |
| 194 | 194 | * |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | */ |
| 197 | 197 | public function ListArray() |
| 198 | 198 | { |
| 199 | - // phpcs:enable |
|
| 199 | + // phpcs:enable |
|
| 200 | 200 | global $conf; |
| 201 | 201 | global $user; |
| 202 | 202 | |
@@ -568,7 +568,7 @@ discard block |
||
| 568 | 568 | return $this->LibStatut($this->status, $mode); |
| 569 | 569 | } |
| 570 | 570 | |
| 571 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 571 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 572 | 572 | /** |
| 573 | 573 | * Return label of a status |
| 574 | 574 | * |
@@ -578,7 +578,7 @@ discard block |
||
| 578 | 578 | */ |
| 579 | 579 | public function LibStatut($status, $mode = 0) |
| 580 | 580 | { |
| 581 | - // phpcs:enable |
|
| 581 | + // phpcs:enable |
|
| 582 | 582 | global $langs; |
| 583 | 583 | $langs->load('orders'); |
| 584 | 584 | |
@@ -1012,7 +1012,7 @@ discard block |
||
| 1012 | 1012 | } |
| 1013 | 1013 | |
| 1014 | 1014 | |
| 1015 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1015 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1016 | 1016 | /** |
| 1017 | 1017 | * Load this->lines |
| 1018 | 1018 | * |
@@ -1020,7 +1020,7 @@ discard block |
||
| 1020 | 1020 | */ |
| 1021 | 1021 | public function fetch_lines() |
| 1022 | 1022 | { |
| 1023 | - // phpcs:enable |
|
| 1023 | + // phpcs:enable |
|
| 1024 | 1024 | $this->lines = array(); |
| 1025 | 1025 | |
| 1026 | 1026 | $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description as line_desc, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx'; |
@@ -1307,7 +1307,7 @@ discard block |
||
| 1307 | 1307 | } |
| 1308 | 1308 | } |
| 1309 | 1309 | |
| 1310 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1310 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1311 | 1311 | /** |
| 1312 | 1312 | * Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount) |
| 1313 | 1313 | * |
@@ -1316,7 +1316,7 @@ discard block |
||
| 1316 | 1316 | */ |
| 1317 | 1317 | public function insert_discount($idremise) |
| 1318 | 1318 | { |
| 1319 | - // phpcs:enable |
|
| 1319 | + // phpcs:enable |
|
| 1320 | 1320 | global $conf, $langs; |
| 1321 | 1321 | |
| 1322 | 1322 | include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'; |
@@ -1542,7 +1542,7 @@ discard block |
||
| 1542 | 1542 | } |
| 1543 | 1543 | |
| 1544 | 1544 | |
| 1545 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1545 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1546 | 1546 | /** |
| 1547 | 1547 | * Tag invoice as a paid invoice |
| 1548 | 1548 | * |
@@ -1555,7 +1555,7 @@ discard block |
||
| 1555 | 1555 | */ |
| 1556 | 1556 | public function set_paid($user, $close_code = '', $close_note = '') |
| 1557 | 1557 | { |
| 1558 | - // phpcs:enable |
|
| 1558 | + // phpcs:enable |
|
| 1559 | 1559 | dol_syslog(get_class($this) . "::set_paid is deprecated, use setPaid instead", LOG_NOTICE); |
| 1560 | 1560 | return $this->setPaid($user, $close_code, $close_note); |
| 1561 | 1561 | } |
@@ -1620,7 +1620,7 @@ discard block |
||
| 1620 | 1620 | } |
| 1621 | 1621 | } |
| 1622 | 1622 | |
| 1623 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1623 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1624 | 1624 | /** |
| 1625 | 1625 | * Tag the invoice as not fully paid + trigger call BILL_UNPAYED |
| 1626 | 1626 | * Function used when a direct debit payment is refused, |
@@ -1633,7 +1633,7 @@ discard block |
||
| 1633 | 1633 | */ |
| 1634 | 1634 | public function set_unpaid($user) |
| 1635 | 1635 | { |
| 1636 | - // phpcs:enable |
|
| 1636 | + // phpcs:enable |
|
| 1637 | 1637 | dol_syslog(get_class($this) . "::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE); |
| 1638 | 1638 | return $this->setUnpaid($user); |
| 1639 | 1639 | } |
@@ -2568,7 +2568,7 @@ discard block |
||
| 2568 | 2568 | } |
| 2569 | 2569 | } |
| 2570 | 2570 | |
| 2571 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2571 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2572 | 2572 | /** |
| 2573 | 2573 | * Return list of replaceable invoices |
| 2574 | 2574 | * Status valid or abandoned for other reason + not paid + no payment + not already replaced |
@@ -2579,7 +2579,7 @@ discard block |
||
| 2579 | 2579 | */ |
| 2580 | 2580 | public function list_replacable_supplier_invoices($socid = 0) |
| 2581 | 2581 | { |
| 2582 | - // phpcs:enable |
|
| 2582 | + // phpcs:enable |
|
| 2583 | 2583 | global $conf; |
| 2584 | 2584 | |
| 2585 | 2585 | $return = array(); |
@@ -2617,7 +2617,7 @@ discard block |
||
| 2617 | 2617 | } |
| 2618 | 2618 | } |
| 2619 | 2619 | |
| 2620 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2620 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2621 | 2621 | /** |
| 2622 | 2622 | * Return list of qualifying invoices for correction by credit note |
| 2623 | 2623 | * Invoices that respect the following rules are returned: |
@@ -2629,7 +2629,7 @@ discard block |
||
| 2629 | 2629 | */ |
| 2630 | 2630 | public function list_qualified_avoir_supplier_invoices($socid = 0) |
| 2631 | 2631 | { |
| 2632 | - // phpcs:enable |
|
| 2632 | + // phpcs:enable |
|
| 2633 | 2633 | global $conf; |
| 2634 | 2634 | |
| 2635 | 2635 | $return = array(); |
@@ -2671,7 +2671,7 @@ discard block |
||
| 2671 | 2671 | } |
| 2672 | 2672 | } |
| 2673 | 2673 | |
| 2674 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2674 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2675 | 2675 | /** |
| 2676 | 2676 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
| 2677 | 2677 | * |
@@ -2680,7 +2680,7 @@ discard block |
||
| 2680 | 2680 | */ |
| 2681 | 2681 | public function load_board($user) |
| 2682 | 2682 | { |
| 2683 | - // phpcs:enable |
|
| 2683 | + // phpcs:enable |
|
| 2684 | 2684 | global $conf, $langs; |
| 2685 | 2685 | |
| 2686 | 2686 | $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut as status, ff.total_ht, ff.total_ttc'; |
@@ -4431,7 +4431,7 @@ discard block |
||
| 4431 | 4431 | } |
| 4432 | 4432 | } |
| 4433 | 4433 | |
| 4434 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 4434 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 4435 | 4435 | /** |
| 4436 | 4436 | * Mise a jour de l'objet ligne de commande en base |
| 4437 | 4437 | * |
@@ -4439,7 +4439,7 @@ discard block |
||
| 4439 | 4439 | */ |
| 4440 | 4440 | public function update_total() |
| 4441 | 4441 | { |
| 4442 | - // phpcs:enable |
|
| 4442 | + // phpcs:enable |
|
| 4443 | 4443 | $this->db->begin(); |
| 4444 | 4444 | |
| 4445 | 4445 | // Mise a jour ligne en base |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | /** |
| 218 | 218 | * @var int ID |
| 219 | 219 | */ |
| 220 | - public $fk_account; // default bank account |
|
| 220 | + public $fk_account; // default bank account |
|
| 221 | 221 | |
| 222 | 222 | /** |
| 223 | 223 | * @var int Transport mode id |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | $this->location_incoterms = $_facrec->location_incoterms; |
| 445 | 445 | |
| 446 | 446 | // Clean parameters |
| 447 | - if (! $this->type) { |
|
| 447 | + if (!$this->type) { |
|
| 448 | 448 | $this->type = self::TYPE_STANDARD; |
| 449 | 449 | } |
| 450 | 450 | if (!empty(GETPOST('ref_supplier'))) { |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | |
| 459 | 459 | $this->array_options = $_facrec->array_options; |
| 460 | 460 | |
| 461 | - if (! $this->mode_reglement_id) { |
|
| 461 | + if (!$this->mode_reglement_id) { |
|
| 462 | 462 | $this->mode_reglement_id = 0; |
| 463 | 463 | } |
| 464 | 464 | $this->status = self::STATUS_DRAFT; |
@@ -710,7 +710,7 @@ discard block |
||
| 710 | 710 | /* |
| 711 | 711 | * Insert lines of template invoices |
| 712 | 712 | */ |
| 713 | - if (! $error && $this->fac_rec > 0) { |
|
| 713 | + if (!$error && $this->fac_rec > 0) { |
|
| 714 | 714 | foreach ($_facrec->lines as $i => $val) { |
| 715 | 715 | if ($_facrec->lines[$i]->fk_product) { |
| 716 | 716 | $prod = new Product($this->db); |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | $buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice; |
| 738 | 738 | |
| 739 | 739 | // If buyprice not defined from template invoice, we try to guess the best value |
| 740 | - if (! $buyprice && $_facrec->lines[$i]->fk_product > 0) { |
|
| 740 | + if (!$buyprice && $_facrec->lines[$i]->fk_product > 0) { |
|
| 741 | 741 | require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php'; |
| 742 | 742 | $producttmp = new ProductFournisseur($this->db); |
| 743 | 743 | $producttmp->fetch($_facrec->lines[$i]->fk_product); |
@@ -986,7 +986,7 @@ discard block |
||
| 986 | 986 | |
| 987 | 987 | $this->extraparams = isset($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array(); |
| 988 | 988 | |
| 989 | - $this->socid = $obj->socid; |
|
| 989 | + $this->socid = $obj->socid; |
|
| 990 | 990 | |
| 991 | 991 | // Retrieve all extrafield |
| 992 | 992 | // fetch optionals attributes and labels |
@@ -2261,7 +2261,7 @@ discard block |
||
| 2261 | 2261 | // Multicurrency |
| 2262 | 2262 | $supplierinvoiceline->fk_multicurrency = $this->fk_multicurrency; |
| 2263 | 2263 | $supplierinvoiceline->multicurrency_code = $this->multicurrency_code; |
| 2264 | - $supplierinvoiceline->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise |
|
| 2264 | + $supplierinvoiceline->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise |
|
| 2265 | 2265 | |
| 2266 | 2266 | $supplierinvoiceline->multicurrency_total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative |
| 2267 | 2267 | $supplierinvoiceline->multicurrency_total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_tva) : $multicurrency_total_tva); // For credit note and if qty is negative, total is negative |
@@ -2712,7 +2712,7 @@ discard block |
||
| 2712 | 2712 | |
| 2713 | 2713 | while ($obj = $this->db->fetch_object($resql)) { |
| 2714 | 2714 | $facturestatic->date_echeance = $this->db->jdate($obj->datefin); |
| 2715 | - $facturestatic->statut = $obj->status; // For backward compatibility |
|
| 2715 | + $facturestatic->statut = $obj->status; // For backward compatibility |
|
| 2716 | 2716 | $facturestatic->status = $obj->status; |
| 2717 | 2717 | |
| 2718 | 2718 | $response->nbtodo++; |
@@ -3144,7 +3144,7 @@ discard block |
||
| 3144 | 3144 | // Load source object |
| 3145 | 3145 | $object->fetch($fromid); |
| 3146 | 3146 | $object->id = 0; |
| 3147 | - $object->statut = self::STATUS_DRAFT; // For backward compatibility |
|
| 3147 | + $object->statut = self::STATUS_DRAFT; // For backward compatibility |
|
| 3148 | 3148 | $object->status = self::STATUS_DRAFT; |
| 3149 | 3149 | |
| 3150 | 3150 | $object->fetch_thirdparty(); // We need it to recalculate VAT localtaxes according to main sale taxes and vendor |
@@ -3444,14 +3444,14 @@ discard block |
||
| 3444 | 3444 | if (!empty($paymentmode) && $paymentmode != 'all') { |
| 3445 | 3445 | $sql .= ", " . MAIN_DB_PREFIX . "c_paiement as cp"; |
| 3446 | 3446 | } |
| 3447 | - $sql .= " WHERE f.paye = 0"; // Only unpaid |
|
| 3448 | - $sql .= " AND f.fk_statut = " . self::STATUS_VALIDATED; // Only validated status |
|
| 3447 | + $sql .= " WHERE f.paye = 0"; // Only unpaid |
|
| 3448 | + $sql .= " AND f.fk_statut = " . self::STATUS_VALIDATED; // Only validated status |
|
| 3449 | 3449 | if ($datetouse == 'invoicedate') { |
| 3450 | 3450 | $sql .= " AND f.datef = '" . $this->db->idate($tmpidate, 'gmt') . "'"; |
| 3451 | 3451 | } else { |
| 3452 | 3452 | $sql .= " AND f.date_lim_reglement = '" . $this->db->idate($tmpidate, 'gmt') . "'"; |
| 3453 | 3453 | } |
| 3454 | - $sql .= " AND f.entity IN (" . getEntity('supplier_invoice', 0) . ")"; // One batch process only one company (no sharing) |
|
| 3454 | + $sql .= " AND f.entity IN (" . getEntity('supplier_invoice', 0) . ")"; // One batch process only one company (no sharing) |
|
| 3455 | 3455 | if (!empty($paymentmode) && $paymentmode != 'all') { |
| 3456 | 3456 | $sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '" . $this->db->escape($paymentmode) . "'"; |
| 3457 | 3457 | } |
@@ -3671,7 +3671,7 @@ discard block |
||
| 3671 | 3671 | $actioncomm->create($user); |
| 3672 | 3672 | } |
| 3673 | 3673 | |
| 3674 | - $this->db->commit(); // We always commit |
|
| 3674 | + $this->db->commit(); // We always commit |
|
| 3675 | 3675 | } |
| 3676 | 3676 | |
| 3677 | 3677 | if ($errormesg) { |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | ); |
| 713 | 713 | } |
| 714 | 714 | |
| 715 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 715 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 716 | 716 | /** |
| 717 | 717 | * Clean sensible object datas |
| 718 | 718 | * |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | */ |
| 722 | 722 | protected function _cleanObjectDatas($object) |
| 723 | 723 | { |
| 724 | - // phpcs:enable |
|
| 724 | + // phpcs:enable |
|
| 725 | 725 | $object = parent::_cleanObjectDatas($object); |
| 726 | 726 | |
| 727 | 727 | unset($object->rowid); |
@@ -18,9 +18,9 @@ discard block |
||
| 18 | 18 | * along with this program. If not, see <https://www.gnu.org/licenses/>. |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | - use Luracast\Restler\RestException; |
|
| 21 | + use Luracast\Restler\RestException; |
|
| 22 | 22 | |
| 23 | - require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php'; |
|
| 23 | + require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php'; |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * API class for contracts |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | |
| 647 | 647 | |
| 648 | 648 | |
| 649 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 649 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 650 | 650 | /** |
| 651 | 651 | * Clean sensible object datas |
| 652 | 652 | * |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | */ |
| 656 | 656 | protected function _cleanObjectDatas($object) |
| 657 | 657 | { |
| 658 | - // phpcs:enable |
|
| 658 | + // phpcs:enable |
|
| 659 | 659 | $object = parent::_cleanObjectDatas($object); |
| 660 | 660 | |
| 661 | 661 | unset($object->address); |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | } |
| 364 | 364 | } |
| 365 | 365 | |
| 366 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 366 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 367 | 367 | /** |
| 368 | 368 | * Activate a contract line |
| 369 | 369 | * |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | */ |
| 377 | 377 | public function active_line($user, $line_id, $date_start, $date_end = '', $comment = '') |
| 378 | 378 | { |
| 379 | - // phpcs:enable |
|
| 379 | + // phpcs:enable |
|
| 380 | 380 | $result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date_start, $date_end, $comment); |
| 381 | 381 | if ($result < 0) { |
| 382 | 382 | $this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error; |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | |
| 389 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 389 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 390 | 390 | /** |
| 391 | 391 | * Close a contract line |
| 392 | 392 | * |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | */ |
| 399 | 399 | public function close_line($user, $line_id, $date_end, $comment = '') |
| 400 | 400 | { |
| 401 | - // phpcs:enable |
|
| 401 | + // phpcs:enable |
|
| 402 | 402 | $result = $this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment); |
| 403 | 403 | if ($result < 0) { |
| 404 | 404 | $this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error; |
@@ -820,7 +820,7 @@ discard block |
||
| 820 | 820 | } |
| 821 | 821 | } |
| 822 | 822 | |
| 823 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 823 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 824 | 824 | /** |
| 825 | 825 | * Load lines array into this->lines. |
| 826 | 826 | * This set also nbofserviceswait, nbofservicesopened, nbofservicesexpired and nbofservicesclosed |
@@ -832,7 +832,7 @@ discard block |
||
| 832 | 832 | */ |
| 833 | 833 | public function fetch_lines($only_services = 0, $loadalsotranslation = 0, $noextrafields = 0) |
| 834 | 834 | { |
| 835 | - // phpcs:enable |
|
| 835 | + // phpcs:enable |
|
| 836 | 836 | $this->nbofservices = 0; |
| 837 | 837 | $this->nbofserviceswait = 0; |
| 838 | 838 | $this->nbofservicesopened = 0; |
@@ -1963,7 +1963,7 @@ discard block |
||
| 1963 | 1963 | } |
| 1964 | 1964 | |
| 1965 | 1965 | |
| 1966 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1966 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1967 | 1967 | /** |
| 1968 | 1968 | * Update statut of contract according to services |
| 1969 | 1969 | * |
@@ -1973,7 +1973,7 @@ discard block |
||
| 1973 | 1973 | */ |
| 1974 | 1974 | public function update_statut($user) |
| 1975 | 1975 | { |
| 1976 | - // phpcs:enable |
|
| 1976 | + // phpcs:enable |
|
| 1977 | 1977 | dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); |
| 1978 | 1978 | |
| 1979 | 1979 | // If draft, we keep it (should not happen) |
@@ -2005,7 +2005,7 @@ discard block |
||
| 2005 | 2005 | return $this->LibStatut($this->statut, $mode); |
| 2006 | 2006 | } |
| 2007 | 2007 | |
| 2008 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2008 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2009 | 2009 | /** |
| 2010 | 2010 | * Return the label of a given contrat status |
| 2011 | 2011 | * |
@@ -2015,7 +2015,7 @@ discard block |
||
| 2015 | 2015 | */ |
| 2016 | 2016 | public function LibStatut($status, $mode) |
| 2017 | 2017 | { |
| 2018 | - // phpcs:enable |
|
| 2018 | + // phpcs:enable |
|
| 2019 | 2019 | global $langs; |
| 2020 | 2020 | |
| 2021 | 2021 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
@@ -2225,7 +2225,7 @@ discard block |
||
| 2225 | 2225 | } |
| 2226 | 2226 | } |
| 2227 | 2227 | |
| 2228 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2228 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2229 | 2229 | /** |
| 2230 | 2230 | * Return list of line rowid |
| 2231 | 2231 | * |
@@ -2234,7 +2234,7 @@ discard block |
||
| 2234 | 2234 | */ |
| 2235 | 2235 | public function array_detail($status = -1) |
| 2236 | 2236 | { |
| 2237 | - // phpcs:enable |
|
| 2237 | + // phpcs:enable |
|
| 2238 | 2238 | $tab = array(); |
| 2239 | 2239 | |
| 2240 | 2240 | $sql = "SELECT cd.rowid"; |
@@ -2306,7 +2306,7 @@ discard block |
||
| 2306 | 2306 | } |
| 2307 | 2307 | |
| 2308 | 2308 | |
| 2309 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2309 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 2310 | 2310 | /** |
| 2311 | 2311 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
| 2312 | 2312 | * |
@@ -2316,7 +2316,7 @@ discard block |
||
| 2316 | 2316 | */ |
| 2317 | 2317 | public function load_board($user, $mode) |
| 2318 | 2318 | { |
| 2319 | - // phpcs:enable |
|
| 2319 | + // phpcs:enable |
|
| 2320 | 2320 | global $conf, $langs; |
| 2321 | 2321 | |
| 2322 | 2322 | $this->from = " FROM " . MAIN_DB_PREFIX . "contrat as c"; |
@@ -3199,7 +3199,7 @@ discard block |
||
| 3199 | 3199 | return $this->LibStatut($this->statut, $mode, ((!empty($this->date_end)) ? ($this->date_end < dol_now() ? 1 : 0) : -1)); |
| 3200 | 3200 | } |
| 3201 | 3201 | |
| 3202 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3202 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3203 | 3203 | /** |
| 3204 | 3204 | * Return label of a contract line status |
| 3205 | 3205 | * |
@@ -3211,7 +3211,7 @@ discard block |
||
| 3211 | 3211 | */ |
| 3212 | 3212 | public static function LibStatut($status, $mode, $expired = -1, $moreatt = '') |
| 3213 | 3213 | { |
| 3214 | - // phpcs:enable |
|
| 3214 | + // phpcs:enable |
|
| 3215 | 3215 | global $langs; |
| 3216 | 3216 | $langs->load("contracts"); |
| 3217 | 3217 | |
@@ -3646,7 +3646,7 @@ discard block |
||
| 3646 | 3646 | } |
| 3647 | 3647 | |
| 3648 | 3648 | |
| 3649 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3649 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3650 | 3650 | /** |
| 3651 | 3651 | * Update in database the fields total_xxx of lines |
| 3652 | 3652 | * Used by migration process |
@@ -3655,7 +3655,7 @@ discard block |
||
| 3655 | 3655 | */ |
| 3656 | 3656 | public function update_total() |
| 3657 | 3657 | { |
| 3658 | - // phpcs:enable |
|
| 3658 | + // phpcs:enable |
|
| 3659 | 3659 | $this->db->begin(); |
| 3660 | 3660 | |
| 3661 | 3661 | // Mise a jour ligne en base |
@@ -3773,7 +3773,7 @@ discard block |
||
| 3773 | 3773 | } |
| 3774 | 3774 | } |
| 3775 | 3775 | |
| 3776 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3776 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3777 | 3777 | /** |
| 3778 | 3778 | * Activate a contract line |
| 3779 | 3779 | * |
@@ -3785,7 +3785,7 @@ discard block |
||
| 3785 | 3785 | */ |
| 3786 | 3786 | public function active_line($user, $date, $date_end = '', $comment = '') |
| 3787 | 3787 | { |
| 3788 | - // phpcs:enable |
|
| 3788 | + // phpcs:enable |
|
| 3789 | 3789 | $error = 0; |
| 3790 | 3790 | |
| 3791 | 3791 | $this->db->begin(); |
@@ -3831,7 +3831,7 @@ discard block |
||
| 3831 | 3831 | } |
| 3832 | 3832 | } |
| 3833 | 3833 | |
| 3834 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3834 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 3835 | 3835 | /** |
| 3836 | 3836 | * Close a contract line |
| 3837 | 3837 | * |
@@ -3843,7 +3843,7 @@ discard block |
||
| 3843 | 3843 | */ |
| 3844 | 3844 | public function close_line($user, $date_end_real, $comment = '', $notrigger = 0) |
| 3845 | 3845 | { |
| 3846 | - // phpcs:enable |
|
| 3846 | + // phpcs:enable |
|
| 3847 | 3847 | $this->date_cloture = $date_end_real; |
| 3848 | 3848 | $this->date_end_real = $date_end_real; |
| 3849 | 3849 | $this->user_closing_id = $user->id; |
@@ -286,12 +286,12 @@ discard block |
||
| 286 | 286 | /* |
| 287 | 287 | * No signature |
| 288 | 288 | */ |
| 289 | - const STATUS_NO_SIGNATURE = 0; |
|
| 289 | + const STATUS_NO_SIGNATURE = 0; |
|
| 290 | 290 | |
| 291 | 291 | /* |
| 292 | 292 | * Signed by sender |
| 293 | 293 | */ |
| 294 | - const STATUS_SIGNED_SENDER = 1; |
|
| 294 | + const STATUS_SIGNED_SENDER = 1; |
|
| 295 | 295 | |
| 296 | 296 | /* |
| 297 | 297 | * Signed by receiver |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | /* |
| 302 | 302 | * Signed by all |
| 303 | 303 | */ |
| 304 | - const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract) |
|
| 304 | + const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract) |
|
| 305 | 305 | |
| 306 | 306 | |
| 307 | 307 | /** |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | if ($contratline->statut != ContratLigne::STATUS_OPEN) { |
| 438 | 438 | $contratline->context = $this->context; |
| 439 | 439 | |
| 440 | - $result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment); // This call trigger LINECONTRACT_ACTIVATE |
|
| 440 | + $result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment); // This call trigger LINECONTRACT_ACTIVATE |
|
| 441 | 441 | if ($result < 0) { |
| 442 | 442 | $error++; |
| 443 | 443 | $this->error = $contratline->error; |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | // Close lines not already closed |
| 488 | 488 | if ($contratline->statut != ContratLigne::STATUS_CLOSED) { |
| 489 | 489 | $contratline->date_end_real = $now; |
| 490 | - $contratline->date_cloture = $now; // For backward compatibility |
|
| 490 | + $contratline->date_cloture = $now; // For backward compatibility |
|
| 491 | 491 | $contratline->user_closing_id = $user->id; |
| 492 | 492 | $contratline->statut = ContratLigne::STATUS_CLOSED; |
| 493 | 493 | $result = $contratline->close_line($user, $now, $comment, $notrigger); |
@@ -942,7 +942,7 @@ discard block |
||
| 942 | 942 | //$line->date_fin_prevue = $this->db->jdate($objp->date_fin_validite); |
| 943 | 943 | //$line->date_fin_reel = $this->db->jdate($objp->date_cloture); |
| 944 | 944 | |
| 945 | - $line->rang = $objp->rang; |
|
| 945 | + $line->rang = $objp->rang; |
|
| 946 | 946 | |
| 947 | 947 | // Retrieve all extrafields for contract line |
| 948 | 948 | // fetch optionals attributes and labels |
@@ -1454,7 +1454,7 @@ discard block |
||
| 1454 | 1454 | } |
| 1455 | 1455 | |
| 1456 | 1456 | if (!$error) { |
| 1457 | - $result = $this->insertExtraFields(); // This delete and reinsert extrafields |
|
| 1457 | + $result = $this->insertExtraFields(); // This delete and reinsert extrafields |
|
| 1458 | 1458 | if ($result < 0) { |
| 1459 | 1459 | $error++; |
| 1460 | 1460 | } |
@@ -2558,7 +2558,7 @@ discard block |
||
| 2558 | 2558 | global $user; |
| 2559 | 2559 | |
| 2560 | 2560 | $ticket = new Ticket($this->db); |
| 2561 | - $nbTicket = $ticket->fetchAll($user, 'ASC', 't.datec', '', 0, '', array('t.fk_contract' => $this->id)); |
|
| 2561 | + $nbTicket = $ticket->fetchAll($user, 'ASC', 't.datec', '', 0, '', array('t.fk_contract' => $this->id)); |
|
| 2562 | 2562 | |
| 2563 | 2563 | return ($nbTicket < 0 ? $nbTicket : $ticket->lines); |
| 2564 | 2564 | } |
@@ -2580,7 +2580,7 @@ discard block |
||
| 2580 | 2580 | global $conf, $langs; |
| 2581 | 2581 | |
| 2582 | 2582 | if (!dol_strlen($modele)) { |
| 2583 | - $modele = ''; // No doc template/generation by default |
|
| 2583 | + $modele = ''; // No doc template/generation by default |
|
| 2584 | 2584 | |
| 2585 | 2585 | if (!empty($this->model_pdf)) { |
| 2586 | 2586 | $modele = $this->model_pdf; |
@@ -2806,7 +2806,7 @@ discard block |
||
| 2806 | 2806 | |
| 2807 | 2807 | // Load contract |
| 2808 | 2808 | $object = new Contrat($this->db); |
| 2809 | - $object->fetch($obj->rowid); // fetch also lines |
|
| 2809 | + $object->fetch($obj->rowid); // fetch also lines |
|
| 2810 | 2810 | //$object->fetch_thirdparty(); |
| 2811 | 2811 | |
| 2812 | 2812 | if ($object->id <= 0) { |
@@ -2853,7 +2853,7 @@ discard block |
||
| 2853 | 2853 | if ($expirationdate && $expirationdate < $enddatetoscan) { |
| 2854 | 2854 | dol_syslog("Define the newdate of end of services from expirationdate=" . $expirationdate); |
| 2855 | 2855 | $newdate = $expirationdate; |
| 2856 | - $protecti = 0; //$protecti is to avoid infinite loop |
|
| 2856 | + $protecti = 0; //$protecti is to avoid infinite loop |
|
| 2857 | 2857 | while ($newdate < $enddatetoscan && $protecti < 1000) { |
| 2858 | 2858 | $newdate = dol_time_plus_duree($newdate, $duration_value, $duration_unit); |
| 2859 | 2859 | $protecti++; |
@@ -2881,20 +2881,20 @@ discard block |
||
| 2881 | 2881 | |
| 2882 | 2882 | // Create an event |
| 2883 | 2883 | $actioncomm = new ActionComm($this->db); |
| 2884 | - $actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...) |
|
| 2884 | + $actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...) |
|
| 2885 | 2885 | $actioncomm->code = 'AC_' . $actioncode; |
| 2886 | 2886 | $actioncomm->label = $label; |
| 2887 | 2887 | $actioncomm->datep = $now; |
| 2888 | 2888 | $actioncomm->datef = $now; |
| 2889 | - $actioncomm->percentage = -1; // Not applicable |
|
| 2889 | + $actioncomm->percentage = -1; // Not applicable |
|
| 2890 | 2890 | $actioncomm->socid = $object->socid; |
| 2891 | - $actioncomm->authorid = $user->id; // User saving action |
|
| 2892 | - $actioncomm->userownerid = $user->id; // Owner of action |
|
| 2891 | + $actioncomm->authorid = $user->id; // User saving action |
|
| 2892 | + $actioncomm->userownerid = $user->id; // Owner of action |
|
| 2893 | 2893 | $actioncomm->fk_element = $object->id; |
| 2894 | 2894 | $actioncomm->elementtype = 'contract'; |
| 2895 | 2895 | $actioncomm->note_private = $comment; |
| 2896 | 2896 | |
| 2897 | - $ret = $actioncomm->create($user); // User creating action |
|
| 2897 | + $ret = $actioncomm->create($user); // User creating action |
|
| 2898 | 2898 | } else { |
| 2899 | 2899 | $contracterror[$object->id] = $object->ref; |
| 2900 | 2900 | |
@@ -2903,7 +2903,7 @@ discard block |
||
| 2903 | 2903 | $this->error = $this->db->lasterror(); |
| 2904 | 2904 | } |
| 2905 | 2905 | |
| 2906 | - if (! $errorforlocaltransaction) { |
|
| 2906 | + if (!$errorforlocaltransaction) { |
|
| 2907 | 2907 | $this->db->commit(); |
| 2908 | 2908 | } else { |
| 2909 | 2909 | $this->db->rollback(); |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | return $this->_cleanObjectDatas($multicurrency); |
| 340 | 340 | } |
| 341 | 341 | |
| 342 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 342 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 343 | 343 | /** |
| 344 | 344 | * Clean sensible object datas |
| 345 | 345 | * |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | */ |
| 349 | 349 | protected function _cleanObjectDatas($object) |
| 350 | 350 | { |
| 351 | - // phpcs:enable |
|
| 351 | + // phpcs:enable |
|
| 352 | 352 | $object = parent::_cleanObjectDatas($object); |
| 353 | 353 | |
| 354 | 354 | // Clear all fields out of interest |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | return $object; |
| 366 | 366 | } |
| 367 | 367 | |
| 368 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 368 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 369 | 369 | /** |
| 370 | 370 | * Clean sensible MultiCurrencyRate object datas |
| 371 | 371 | * |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | */ |
| 375 | 375 | protected function _cleanObjectDatasRate($object) |
| 376 | 376 | { |
| 377 | - // phpcs:enable |
|
| 377 | + // phpcs:enable |
|
| 378 | 378 | $object = parent::_cleanObjectDatas($object); |
| 379 | 379 | |
| 380 | 380 | // Clear all fields out of interest |