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

Fix warning

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-24 02:59:00 +01:00
parent 3586da75a2
commit 6c2a17b29a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/contrat/list.php
View File

@ -614,14 +614,14 @@ while ($i < min($num, $limit))
$socstatic->logo = $obj->logo; $socstatic->logo = $obj->logo;
$socstatic->country_id = $obj->country_id; $socstatic->country_id = $obj->country_id;
$socstatic->country_code = ''; $socstatic->country_code = '';
$socstatic->country_label = '';*/ $socstatic->country = '';*/
if ($obj->country_id > 0) { if ($obj->country_id > 0) {
if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) { if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
$tmparray = getCountry($obj->country_id, 'all'); $tmparray = getCountry($obj->country_id, 'all');
$cacheCountryIDCode[$obj->country_id] = array('code'=> empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']); $cacheCountryIDCode[$obj->country_id] = array('code'=> empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
} }
$socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code']; $socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code'];
$socstatic->country_label = $cacheCountryIDCode[$obj->country_id]['label']; $socstatic->country = $cacheCountryIDCode[$obj->country_id]['label'];
} }
@ -695,7 +695,7 @@ while ($i < min($num, $limit))
if (!empty($arrayfields['country.code_iso']['checked'])) if (!empty($arrayfields['country.code_iso']['checked']))
{ {
print '<td class="center">'; print '<td class="center">';
print $socstatic->country_label; print $socstatic->country;
print '</td>'; print '</td>';
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
} }

3
htdocs/core/class/notify.class.php
View File

@ -112,6 +112,7 @@ class Notify
$listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0); $listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0);
$texte = '';
$nb = -1; $nb = -1;
if (is_array($listofnotiftodo)) { if (is_array($listofnotiftodo)) {
$nb = count($listofnotiftodo); $nb = count($listofnotiftodo);
@ -170,6 +171,8 @@ class Notify
if (is_object($object)) { if (is_object($object)) {
$valueforthreshold = $object->total_ht; $valueforthreshold = $object->total_ht;
} }
$sqlnotifcode = '';
if ($notifcode) { if ($notifcode) {
if (is_numeric($notifcode)) { if (is_numeric($notifcode)) {
$sqlnotifcode = " AND n.fk_action = ".$notifcode; // Old usage $sqlnotifcode = " AND n.fk_action = ".$notifcode; // Old usage