Fix warnings
This commit is contained in:
parent
0f763d2606
commit
cbda0e6197
@ -1353,7 +1353,7 @@ if ($action == 'create') {
|
|||||||
if (empty($donotclearsession)) {
|
if (empty($donotclearsession)) {
|
||||||
$assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
|
$assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
|
||||||
if ($assignedtouser) {
|
if ($assignedtouser) {
|
||||||
$listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first
|
$listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0); // Owner first
|
||||||
}
|
}
|
||||||
//$listofuserid[$user->id] = array('id'=>$user->id, 'mandatory'=>0, 'transparency'=>(GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1)); // 1 by default at first init
|
//$listofuserid[$user->id] = array('id'=>$user->id, 'mandatory'=>0, 'transparency'=>(GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1)); // 1 by default at first init
|
||||||
$listofuserid[$assignedtouser]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1); // 1 by default at first init
|
$listofuserid[$assignedtouser]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1); // 1 by default at first init
|
||||||
|
|||||||
@ -155,7 +155,7 @@ class box_activity extends ModeleBoxes
|
|||||||
while ($j < count($data)) {
|
while ($j < count($data)) {
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'class="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&search_status=".$data[$j]->fk_statut,
|
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&search_status=".((int) $data[$j]->fk_statut),
|
||||||
'tooltip' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
|
'tooltip' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
|
||||||
'logo' => 'object_propal'
|
'logo' => 'object_propal'
|
||||||
);
|
);
|
||||||
@ -169,7 +169,7 @@ class box_activity extends ModeleBoxes
|
|||||||
'td' => 'class="right"',
|
'td' => 'class="right"',
|
||||||
'text' => $data[$j]->nb,
|
'text' => $data[$j]->nb,
|
||||||
'tooltip' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
|
'tooltip' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
|
||||||
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&search_status=".$data[$j]->fk_statut,
|
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&search_status=".((int) $data[$j]->fk_statut),
|
||||||
);
|
);
|
||||||
$totalnb += $data[$j]->nb;
|
$totalnb += $data[$j]->nb;
|
||||||
|
|
||||||
@ -185,6 +185,13 @@ class box_activity extends ModeleBoxes
|
|||||||
$line++;
|
$line++;
|
||||||
$j++;
|
$j++;
|
||||||
}
|
}
|
||||||
|
if (count($data) == 0) {
|
||||||
|
$this->info_box_contents[$line][0] = array(
|
||||||
|
'td' => 'class="center"',
|
||||||
|
'text'=>$langs->trans("NoRecordedProposals"),
|
||||||
|
);
|
||||||
|
$line++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -273,6 +280,13 @@ class box_activity extends ModeleBoxes
|
|||||||
$line++;
|
$line++;
|
||||||
$j++;
|
$j++;
|
||||||
}
|
}
|
||||||
|
if (count($data) == 0) {
|
||||||
|
$this->info_box_contents[$line][0] = array(
|
||||||
|
'td' => 'class="center"',
|
||||||
|
'text'=>$langs->trans("NoRecordedOrders"),
|
||||||
|
);
|
||||||
|
$line++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -329,11 +343,11 @@ class box_activity extends ModeleBoxes
|
|||||||
if (!empty($data)) {
|
if (!empty($data)) {
|
||||||
$j = 0;
|
$j = 0;
|
||||||
while ($j < count($data)) {
|
while ($j < count($data)) {
|
||||||
$billurl = "search_status=2&paye=1";
|
$billurl = "search_status=2&paye=1";
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'class="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
|
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
|
||||||
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
|
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
|
||||||
'logo' => 'bill',
|
'logo' => 'bill',
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -346,7 +360,7 @@ class box_activity extends ModeleBoxes
|
|||||||
'td' => 'class="right"',
|
'td' => 'class="right"',
|
||||||
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
|
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
|
||||||
'text' => $data[$j]->nb,
|
'text' => $data[$j]->nb,
|
||||||
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
|
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][3] = array(
|
$this->info_box_contents[$line][3] = array(
|
||||||
@ -369,6 +383,7 @@ class box_activity extends ModeleBoxes
|
|||||||
'td' => 'class="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedInvoices"),
|
'text'=>$langs->trans("NoRecordedInvoices"),
|
||||||
);
|
);
|
||||||
|
$line++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -412,11 +427,11 @@ class box_activity extends ModeleBoxes
|
|||||||
|
|
||||||
$j = 0;
|
$j = 0;
|
||||||
while ($j < count($data)) {
|
while ($j < count($data)) {
|
||||||
$billurl = "search_status=".$data[$j]->fk_statut."&paye=0";
|
$billurl = "search_status=".$data[$j]->fk_statut."&paye=0";
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'class="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
|
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
|
||||||
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
|
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
|
||||||
'logo' => 'bill',
|
'logo' => 'bill',
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -446,8 +461,9 @@ class box_activity extends ModeleBoxes
|
|||||||
if (count($data) == 0) {
|
if (count($data) == 0) {
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'class="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedInvoices"),
|
'text'=>$langs->trans("NoRecordedUnpaidInvoices"),
|
||||||
);
|
);
|
||||||
|
$line++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6457,9 +6457,9 @@ abstract class CommonObject
|
|||||||
return -1;
|
return -1;
|
||||||
} elseif ($value == '') {
|
} elseif ($value == '') {
|
||||||
$new_array_languages[$key] = null;
|
$new_array_languages[$key] = null;
|
||||||
}
|
} else {
|
||||||
//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
|
|
||||||
$new_array_languages[$key] = $value;
|
$new_array_languages[$key] = $value;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
/*case 'select': // Not required, we chosed value='0' for undefined values
|
/*case 'select': // Not required, we chosed value='0' for undefined values
|
||||||
if ($value=='-1')
|
if ($value=='-1')
|
||||||
|
|||||||
@ -1405,14 +1405,13 @@ class pdf_vinci extends ModelePDFMo
|
|||||||
$rank = 0;
|
$rank = 0;
|
||||||
$this->cols['code'] = array(
|
$this->cols['code'] = array(
|
||||||
'rank' => $rank,
|
'rank' => $rank,
|
||||||
'status' => false,
|
'status' => true,
|
||||||
'width' => 35, // in mm
|
'width' => 35, // in mm
|
||||||
'title' => array(
|
'title' => array(
|
||||||
'textkey' => 'Ref'
|
'textkey' => 'Ref'
|
||||||
),
|
),
|
||||||
'border-left' => true, // add left line separator
|
'border-left' => true, // add left line separator
|
||||||
);
|
);
|
||||||
$this->cols['code']['status'] = true;
|
|
||||||
|
|
||||||
$rank = 1; // do not use negative rank
|
$rank = 1; // do not use negative rank
|
||||||
$this->cols['desc'] = array(
|
$this->cols['desc'] = array(
|
||||||
@ -1455,14 +1454,13 @@ class pdf_vinci extends ModelePDFMo
|
|||||||
$rank = $rank + 10;
|
$rank = $rank + 10;
|
||||||
$this->cols['dim'] = array(
|
$this->cols['dim'] = array(
|
||||||
'rank' => $rank,
|
'rank' => $rank,
|
||||||
'status' => false,
|
'status' => true,
|
||||||
'width' => 25, // in mm
|
'width' => 25, // in mm
|
||||||
'title' => array(
|
'title' => array(
|
||||||
'textkey' => 'Size'
|
'textkey' => 'Size'
|
||||||
),
|
),
|
||||||
'border-left' => true, // add left line separator
|
'border-left' => true, // add left line separator
|
||||||
);
|
);
|
||||||
$this->cols['dim']['status'] = true;
|
|
||||||
|
|
||||||
$rank = $rank + 10;
|
$rank = $rank + 10;
|
||||||
$this->cols['qty'] = array(
|
$this->cols['qty'] = array(
|
||||||
@ -1474,7 +1472,6 @@ class pdf_vinci extends ModelePDFMo
|
|||||||
),
|
),
|
||||||
'border-left' => true, // add left line separator
|
'border-left' => true, // add left line separator
|
||||||
);
|
);
|
||||||
$this->cols['qty']['status'] = true;
|
|
||||||
|
|
||||||
$rank = $rank + 10;
|
$rank = $rank + 10;
|
||||||
$this->cols['qtytot'] = array(
|
$this->cols['qtytot'] = array(
|
||||||
@ -1486,7 +1483,6 @@ class pdf_vinci extends ModelePDFMo
|
|||||||
),
|
),
|
||||||
'border-left' => true, // add left line separator
|
'border-left' => true, // add left line separator
|
||||||
);
|
);
|
||||||
$this->cols['qtytot']['status'] = true;
|
|
||||||
|
|
||||||
// Add extrafields cols
|
// Add extrafields cols
|
||||||
if (!empty($object->lines)) {
|
if (!empty($object->lines)) {
|
||||||
|
|||||||
@ -853,7 +853,7 @@ class Evaluation extends CommonObject
|
|||||||
$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
|
$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
|
||||||
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
|
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
|
||||||
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
|
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
|
||||||
$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
|
$this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
|
||||||
}
|
}
|
||||||
|
|
||||||
$statusType = 'status'.$status;
|
$statusType = 'status'.$status;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user