lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2018-12-15 18:30:35 +01:00
parent 54ffba793f
commit 85cd23caaf
7 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -2,6 +2,17 @@
English Dolibarr ChangeLog 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 ***** ***** ChangeLog for 9.0.0 compared to 8.0.0 *****
For Users: For Users:

2
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View File

@ -644,7 +644,7 @@ class pdf_merou extends ModelePdfExpedition
if (! empty($object->tracking_number)) if (! empty($object->tracking_number))
{ {
$object->GetUrlTrackingStatus($object->tracking_number); $object->getUrlTrackingStatus($object->tracking_number);
if (! empty($object->tracking_url)) if (! empty($object->tracking_url))
{ {
if ($object->shipping_method_id > 0) if ($object->shipping_method_id > 0)

2
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -372,7 +372,7 @@ class pdf_rouget extends ModelePdfExpedition
// Tracking number // Tracking number
if (! empty($object->tracking_number)) if (! empty($object->tracking_number))
{ {
$object->GetUrlTrackingStatus($object->tracking_number); $object->getUrlTrackingStatus($object->tracking_number);
if (! empty($object->tracking_url)) if (! empty($object->tracking_url))
{ {
if ($object->shipping_method_id > 0) if ($object->shipping_method_id > 0)

2
htdocs/core/modules/reception/doc/pdf_squille.modules.php
View File

@ -305,7 +305,7 @@ class pdf_squille extends ModelePdfReception
// Tracking number // Tracking number
if (! empty($object->tracking_number)) if (! empty($object->tracking_number))
{ {
$object->GetUrlTrackingStatus($object->tracking_number); $object->getUrlTrackingStatus($object->tracking_number);
if (! empty($object->tracking_url)) if (! empty($object->tracking_url))
{ {
if ($object->reception_method_id > 0) if ($object->reception_method_id > 0)

6
htdocs/expedition/class/expedition.class.php
View File

@ -604,7 +604,7 @@ class Expedition extends CommonObject
if ($this->statut == 0) $this->brouillon = 1; if ($this->statut == 0) $this->brouillon = 1;
// Tracking url // Tracking url
$this->GetUrlTrackingStatus($obj->tracking_number); $this->getUrlTrackingStatus($obj->tracking_number);
/* /*
* Thirparty * Thirparty
@ -1937,16 +1937,14 @@ class Expedition extends CommonObject
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/** /**
* Forge an set tracking url * Forge an set tracking url
* *
* @param string $value Value * @param string $value Value
* @return void * @return void
*/ */
function GetUrlTrackingStatus($value='') function getUrlTrackingStatus($value='')
{ {
// phpcs:enable
if (! empty($this->shipping_method_id)) if (! empty($this->shipping_method_id))
{ {
$sql = "SELECT em.code, em.tracking"; $sql = "SELECT em.code, em.tracking";

6
htdocs/reception/card.php
View File

@ -1150,7 +1150,7 @@ if ($action == 'create')
if ($line->fk_product > 0) if ($line->fk_product > 0)
{ {
print '<!-- Show warehouse selection -->'; print '<!-- Show warehouse selection -->';
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 else
@ -1890,9 +1890,9 @@ else if ($id || $ref)
{ {
print '<td> <input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"> </br>'; print '<td> <input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"> </br>';
print $langs->trans('EatByDate').' : '; print $langs->trans('EatByDate').' : ';
print $form->select_date($lines[$i]->eatby,'dlc' .$line_id , '', '', 1, ""). '</br>'; print $form->select_date($lines[$i]->eatby,'dlc' .$line_id, '', '', 1, ""). '</br>';
print $langs->trans('SellByDate').' : '; 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 '</td>'; print '</td>';
} }
print '</tr>'; print '</tr>';

4
htdocs/reception/class/reception.class.php
View File

@ -440,7 +440,7 @@ class Reception extends CommonObject
$this->pdf_filename = $file; $this->pdf_filename = $file;
// Tracking url // Tracking url
$this->GetUrlTrackingStatus($obj->tracking_number); $this->getUrlTrackingStatus($obj->tracking_number);
/* /*
* Thirparty * Thirparty
@ -1423,7 +1423,7 @@ class Reception extends CommonObject
* @param string $value Value * @param string $value Value
* @return void * @return void
*/ */
function GetUrlTrackingStatus($value='') function getUrlTrackingStatus($value='')
{ {
if (! empty($this->shipping_method_id)) if (! empty($this->shipping_method_id))
{ {