@@ -194,9 +194,9 @@ discard block |
||
194 | 194 | public $fin_validite; // code |
195 | 195 | public $user_author_id; // label |
196 | 196 | /** |
197 | - * @deprecated |
|
198 | - * @see $total_ht |
|
199 | - */ |
|
197 | + * @deprecated |
|
198 | + * @see $total_ht |
|
199 | + */ |
|
200 | 200 | public $price; // label doc |
201 | 201 | /** |
202 | 202 | * @deprecated |
@@ -204,9 +204,9 @@ discard block |
||
204 | 204 | */ |
205 | 205 | public $tva; // code |
206 | 206 | /** |
207 | - * @deprecated |
|
208 | - * @see $total_ttc |
|
209 | - */ |
|
207 | + * @deprecated |
|
208 | + * @see $total_ttc |
|
209 | + */ |
|
210 | 210 | public $total; // label |
211 | 211 | public $cond_reglement_code; |
212 | 212 | public $cond_reglement; |
@@ -226,14 +226,14 @@ discard block |
||
226 | 226 | */ |
227 | 227 | public $availability_id; // id |
228 | 228 | /** |
229 | - * @var int availability ID |
|
230 | - * @deprecated |
|
231 | - * @see $availability_id |
|
232 | - */ |
|
229 | + * @var int availability ID |
|
230 | + * @deprecated |
|
231 | + * @see $availability_id |
|
232 | + */ |
|
233 | 233 | public $fk_availability; // code |
234 | 234 | /** |
235 | - * @var string availability code |
|
236 | - */ |
|
235 | + * @var string availability code |
|
236 | + */ |
|
237 | 237 | public $availability_code; // label |
238 | 238 | /** |
239 | 239 | * @var string availability label |
@@ -338,8 +338,8 @@ discard block |
||
338 | 338 | 'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 900), |
339 | 339 | ); |
340 | 340 | /** |
341 | - * {@inheritdoc} |
|
342 | - */ |
|
341 | + * {@inheritdoc} |
|
342 | + */ |
|
343 | 343 | protected $table_ref_field = 'ref'; // Todo rename into STATUS_CLOSE ? |
344 | 344 | |
345 | 345 | /** |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | } |
666 | 666 | } |
667 | 667 | |
668 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
668 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
669 | 669 | /** |
670 | 670 | * Update DB line fields total_xxx |
671 | 671 | * Used by migration |
@@ -674,7 +674,7 @@ discard block |
||
674 | 674 | */ |
675 | 675 | public function update_total() |
676 | 676 | { |
677 | - // phpcs:enable |
|
677 | + // phpcs:enable |
|
678 | 678 | $this->db->begin(); |
679 | 679 | |
680 | 680 | // Mise a jour ligne en base |
@@ -776,7 +776,7 @@ discard block |
||
776 | 776 | } |
777 | 777 | } |
778 | 778 | |
779 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
779 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
780 | 780 | /** |
781 | 781 | * Mise a jour de l'objet ligne de commande en base |
782 | 782 | * |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | */ |
785 | 785 | public function update_total() |
786 | 786 | { |
787 | - // phpcs:enable |
|
787 | + // phpcs:enable |
|
788 | 788 | $this->db->begin(); |
789 | 789 | |
790 | 790 | // Mise a jour ligne en base |
@@ -1015,7 +1015,7 @@ discard block |
||
1015 | 1015 | } |
1016 | 1016 | |
1017 | 1017 | |
1018 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1018 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1019 | 1019 | /** |
1020 | 1020 | * Load this->lines |
1021 | 1021 | * |
@@ -1023,7 +1023,7 @@ discard block |
||
1023 | 1023 | */ |
1024 | 1024 | public function fetch_lines() |
1025 | 1025 | { |
1026 | - // phpcs:enable |
|
1026 | + // phpcs:enable |
|
1027 | 1027 | $this->lines = array(); |
1028 | 1028 | |
1029 | 1029 | $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'; |
@@ -1310,7 +1310,7 @@ discard block |
||
1310 | 1310 | } |
1311 | 1311 | } |
1312 | 1312 | |
1313 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1313 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1314 | 1314 | /** |
1315 | 1315 | * Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount) |
1316 | 1316 | * |
@@ -1319,7 +1319,7 @@ discard block |
||
1319 | 1319 | */ |
1320 | 1320 | public function insert_discount($idremise) |
1321 | 1321 | { |
1322 | - // phpcs:enable |
|
1322 | + // phpcs:enable |
|
1323 | 1323 | global $conf, $langs; |
1324 | 1324 | |
1325 | 1325 | include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'; |
@@ -1545,7 +1545,7 @@ discard block |
||
1545 | 1545 | } |
1546 | 1546 | |
1547 | 1547 | |
1548 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1548 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1549 | 1549 | /** |
1550 | 1550 | * Tag invoice as a paid invoice |
1551 | 1551 | * |
@@ -1558,7 +1558,7 @@ discard block |
||
1558 | 1558 | */ |
1559 | 1559 | public function set_paid($user, $close_code = '', $close_note = '') |
1560 | 1560 | { |
1561 | - // phpcs:enable |
|
1561 | + // phpcs:enable |
|
1562 | 1562 | dol_syslog(get_class($this) . "::set_paid is deprecated, use setPaid instead", LOG_NOTICE); |
1563 | 1563 | return $this->setPaid($user, $close_code, $close_note); |
1564 | 1564 | } |
@@ -1623,7 +1623,7 @@ discard block |
||
1623 | 1623 | } |
1624 | 1624 | } |
1625 | 1625 | |
1626 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1626 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1627 | 1627 | /** |
1628 | 1628 | * Tag the invoice as not fully paid + trigger call BILL_UNPAYED |
1629 | 1629 | * Function used when a direct debit payment is refused, |
@@ -1636,7 +1636,7 @@ discard block |
||
1636 | 1636 | */ |
1637 | 1637 | public function set_unpaid($user) |
1638 | 1638 | { |
1639 | - // phpcs:enable |
|
1639 | + // phpcs:enable |
|
1640 | 1640 | dol_syslog(get_class($this) . "::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE); |
1641 | 1641 | return $this->setUnpaid($user); |
1642 | 1642 | } |
@@ -2571,7 +2571,7 @@ discard block |
||
2571 | 2571 | } |
2572 | 2572 | } |
2573 | 2573 | |
2574 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2574 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2575 | 2575 | /** |
2576 | 2576 | * Return list of replaceable invoices |
2577 | 2577 | * Status valid or abandoned for other reason + not paid + no payment + not already replaced |
@@ -2582,7 +2582,7 @@ discard block |
||
2582 | 2582 | */ |
2583 | 2583 | public function list_replacable_supplier_invoices($socid = 0) |
2584 | 2584 | { |
2585 | - // phpcs:enable |
|
2585 | + // phpcs:enable |
|
2586 | 2586 | global $conf; |
2587 | 2587 | |
2588 | 2588 | $return = array(); |
@@ -2620,7 +2620,7 @@ discard block |
||
2620 | 2620 | } |
2621 | 2621 | } |
2622 | 2622 | |
2623 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2623 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2624 | 2624 | /** |
2625 | 2625 | * Return list of qualifying invoices for correction by credit note |
2626 | 2626 | * Invoices that respect the following rules are returned: |
@@ -2632,7 +2632,7 @@ discard block |
||
2632 | 2632 | */ |
2633 | 2633 | public function list_qualified_avoir_supplier_invoices($socid = 0) |
2634 | 2634 | { |
2635 | - // phpcs:enable |
|
2635 | + // phpcs:enable |
|
2636 | 2636 | global $conf; |
2637 | 2637 | |
2638 | 2638 | $return = array(); |
@@ -2674,7 +2674,7 @@ discard block |
||
2674 | 2674 | } |
2675 | 2675 | } |
2676 | 2676 | |
2677 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2677 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2678 | 2678 | /** |
2679 | 2679 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
2680 | 2680 | * |
@@ -2683,7 +2683,7 @@ discard block |
||
2683 | 2683 | */ |
2684 | 2684 | public function load_board($user) |
2685 | 2685 | { |
2686 | - // phpcs:enable |
|
2686 | + // phpcs:enable |
|
2687 | 2687 | global $conf, $langs; |
2688 | 2688 | |
2689 | 2689 | $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut as status, ff.total_ht, ff.total_ttc'; |
@@ -643,15 +643,15 @@ discard block |
||
643 | 643 | */ |
644 | 644 | |
645 | 645 | /** |
646 | - * Close a shipment (Classify it as "Delivered") |
|
647 | - * |
|
648 | - * @param int $id Expedition ID |
|
649 | - * @param int $notrigger Disabled triggers |
|
650 | - * |
|
651 | - * @url POST {id}/close |
|
652 | - * |
|
653 | - * @return object |
|
654 | - */ |
|
646 | + * Close a shipment (Classify it as "Delivered") |
|
647 | + * |
|
648 | + * @param int $id Expedition ID |
|
649 | + * @param int $notrigger Disabled triggers |
|
650 | + * |
|
651 | + * @url POST {id}/close |
|
652 | + * |
|
653 | + * @return object |
|
654 | + */ |
|
655 | 655 | public function close($id, $notrigger = 0) |
656 | 656 | { |
657 | 657 | if (!DolibarrApiAccess::$user->hasRight('expedition', 'creer')) { |
@@ -683,7 +683,7 @@ discard block |
||
683 | 683 | return $this->_cleanObjectDatas($this->shipment); |
684 | 684 | } |
685 | 685 | |
686 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
686 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
687 | 687 | /** |
688 | 688 | * Clean sensible object datas |
689 | 689 | * |
@@ -692,7 +692,7 @@ discard block |
||
692 | 692 | */ |
693 | 693 | protected function _cleanObjectDatas($object) |
694 | 694 | { |
695 | - // phpcs:enable |
|
695 | + // phpcs:enable |
|
696 | 696 | $object = parent::_cleanObjectDatas($object); |
697 | 697 | |
698 | 698 | unset($object->canvas); |
@@ -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(); |
@@ -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"; |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | } |
666 | 666 | } |
667 | 667 | |
668 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
668 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
669 | 669 | /** |
670 | 670 | * Update DB line fields total_xxx |
671 | 671 | * Used by migration |
@@ -674,7 +674,7 @@ discard block |
||
674 | 674 | */ |
675 | 675 | public function update_total() |
676 | 676 | { |
677 | - // phpcs:enable |
|
677 | + // phpcs:enable |
|
678 | 678 | $this->db->begin(); |
679 | 679 | |
680 | 680 | // Mise a jour ligne en base |
@@ -22,11 +22,11 @@ |
||
22 | 22 | |
23 | 23 | use DoliDB; |
24 | 24 | |
25 | - /** |
|
26 | - * \file htdocs/webportal/class/controller.class.php |
|
27 | - * \ingroup webportal |
|
28 | - * \brief File of controller class for WebPortal |
|
29 | - */ |
|
25 | + /** |
|
26 | + * \file htdocs/webportal/class/controller.class.php |
|
27 | + * \ingroup webportal |
|
28 | + * \brief File of controller class for WebPortal |
|
29 | + */ |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * Class to manage pages |