diff --git a/ChangeLog b/ChangeLog index d609b7a347a..b31ef5abbfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,17 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 10.0.0 compared to 9.0.0 ***** +For Users: + +For Developers: + + +WARNING: + +Following changes may create regressions for some external modules, but were necessary to make Dolibarr better: +* GetUrlTrackingStatus were renamed into getUrlTrackingStatus + ***** ChangeLog for 9.0.0 compared to 8.0.0 ***** For Users: diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index 73de53f7904..df7e97cc622 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -644,7 +644,7 @@ class pdf_merou extends ModelePdfExpedition if (! empty($object->tracking_number)) { - $object->GetUrlTrackingStatus($object->tracking_number); + $object->getUrlTrackingStatus($object->tracking_number); if (! empty($object->tracking_url)) { if ($object->shipping_method_id > 0) diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index f05c9dc31e7..3548b2c2473 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -372,7 +372,7 @@ class pdf_rouget extends ModelePdfExpedition // Tracking number if (! empty($object->tracking_number)) { - $object->GetUrlTrackingStatus($object->tracking_number); + $object->getUrlTrackingStatus($object->tracking_number); if (! empty($object->tracking_url)) { if ($object->shipping_method_id > 0) diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php index 85724a8b42a..592171ed6f0 100644 --- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php +++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php @@ -305,7 +305,7 @@ class pdf_squille extends ModelePdfReception // Tracking number if (! empty($object->tracking_number)) { - $object->GetUrlTrackingStatus($object->tracking_number); + $object->getUrlTrackingStatus($object->tracking_number); if (! empty($object->tracking_url)) { if ($object->reception_method_id > 0) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index bfc356d945b..48e84cf1cc4 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -604,7 +604,7 @@ class Expedition extends CommonObject if ($this->statut == 0) $this->brouillon = 1; // Tracking url - $this->GetUrlTrackingStatus($obj->tracking_number); + $this->getUrlTrackingStatus($obj->tracking_number); /* * Thirparty @@ -1937,16 +1937,14 @@ class Expedition extends CommonObject } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps /** * Forge an set tracking url * * @param string $value Value * @return void */ - function GetUrlTrackingStatus($value='') + function getUrlTrackingStatus($value='') { - // phpcs:enable if (! empty($this->shipping_method_id)) { $sql = "SELECT em.code, em.tracking"; diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 3f49be10660..2f5f3a41a7e 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -1150,7 +1150,7 @@ if ($action == 'create') if ($line->fk_product > 0) { print ''; - print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0 , 0, $line->fk_product, '', 1); + print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1); } } else @@ -1890,9 +1890,9 @@ else if ($id || $ref) { print '
'; print $langs->trans('EatByDate').' : '; - print $form->select_date($lines[$i]->eatby,'dlc' .$line_id , '', '', 1, ""). '
'; + print $form->select_date($lines[$i]->eatby,'dlc' .$line_id, '', '', 1, ""). '
'; print $langs->trans('SellByDate').' : '; - print $form->select_date($lines[$i]->sellby,'dluo' .$line_id , '', '', 1, ""); + print $form->select_date($lines[$i]->sellby,'dluo' .$line_id, '', '', 1, ""); print ''; } print ''; diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php index 513911e0104..c6fd04ee247 100644 --- a/htdocs/reception/class/reception.class.php +++ b/htdocs/reception/class/reception.class.php @@ -440,7 +440,7 @@ class Reception extends CommonObject $this->pdf_filename = $file; // Tracking url - $this->GetUrlTrackingStatus($obj->tracking_number); + $this->getUrlTrackingStatus($obj->tracking_number); /* * Thirparty @@ -1423,7 +1423,7 @@ class Reception extends CommonObject * @param string $value Value * @return void */ - function GetUrlTrackingStatus($value='') + function getUrlTrackingStatus($value='') { if (! empty($this->shipping_method_id)) {