Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX scrutinizer feedback

Browse Source
This commit is contained in:
ATM John BOTELLA
2019-05-18 15:53:07 +02:00
parent 26d4875f8f
commit f714b45efb
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@@ -8017,6 +8017,8 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
{ {
global $conf; global $conf;
$return = '';
// image's filename are still in French // image's filename are still in French
$statusImg=array( $statusImg=array(
'status0' => 'statut0' 'status0' => 'statut0'

1
htdocs/core/lib/pdf.lib.php
View File

@@ -1374,6 +1374,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
if (! empty($object->lines[$i]->date_start) || ! empty($object->lines[$i]->date_end)) if (! empty($object->lines[$i]->date_start) || ! empty($object->lines[$i]->date_end))
{ {
$format='day'; $format='day';
$period = '';
// Show duration if exists // Show duration if exists
if ($object->lines[$i]->date_start && $object->lines[$i]->date_end) if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)
{ {

1
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
View File

@@ -1810,7 +1810,6 @@ class pdf_cornas extends ModelePDFSuppliersOrders
global $hookmanager; global $hookmanager;
$parameters=array( $parameters=array(
'object' => $object,
'curY' =>& $curY, 'curY' =>& $curY,
'columnText' => $columnText, 'columnText' => $columnText,
'colKey' => $colKey 'colKey' => $colKey

4
htdocs/main.inc.php
View File

@@ -1740,8 +1740,8 @@ function top_menu_user(User $user, Translate $langs)
} }
else{ else{
$nophoto='/public/theme/common/user_anonymous.png'; $nophoto='/public/theme/common/user_anonymous.png';
if ($object->gender == 'man') $nophoto='/public/theme/common/user_man.png'; if ($user->gender == 'man') $nophoto='/public/theme/common/user_man.png';
if ($object->gender == 'woman') $nophoto='/public/theme/common/user_woman.png'; if ($user->gender == 'woman') $nophoto='/public/theme/common/user_woman.png';
$userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">'; $userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
$userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">'; $userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';

2
htdocs/product/class/product.class.php
View File

@@ -4155,6 +4155,8 @@ class Product extends CommonObject
// phpcs:enable // phpcs:enable
global $conf, $langs; global $conf, $langs;
$labelstatut = $labelstatutShort = '';
$langs->load('products'); $langs->load('products');
if (! empty($conf->productbatch->enabled)) { $langs->load("productbatch"); if (! empty($conf->productbatch->enabled)) { $langs->load("productbatch");
} }