vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix warnings

Browse source
This commit is contained in:
Laurent Destailleur 2024-04-27 04:18:49 +02:00
parent 8db9b30fbb
commit 0312aaef90
4 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dev/translation/dynamic_translation_keys.lst
View file

@ -1498,8 +1498,14 @@ LineDescription
LineDiscount
LineID
LineLabel
LineLT1Rate
LineLT1Type
LineLT2Rate
LineLT2Type
LineQty
LineTotalHT
LineTotalLT1
LineTotalLT2
LineTotalTTC
LineTotalVAT
LineUnitPrice
@ -2251,6 +2257,7 @@ PriceQtyMinHTCurrency
PriceU
PrintGCPDesc
PrintIPPDesc
PRINTIPP_SSL
PrintMethod
PrintTestDescprintgcp
PrintTestDescprintipp
@ -2598,6 +2605,9 @@ StateId
StateOrigin
StatusAtInstall
StatusDebitCredit
StatusMotif0
StatusMotif1
StatusMotif2
StatusOrderApproved
StatusOrderApprovedShort
StatusOrderOnProcessShort

2
htdocs/langs/en_US/errors.lang
View file

@ -380,7 +380,7 @@ WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s
WarningCorrectedInvoiceNotFound=Corrected invoice not found
WarningCommentNotFound=Warning: Can't find the start and/or end comments for the section <b>%s</b> into the file <b>%s</b>
WarningAlreadyReverse=Stock movement already reversed
WarningParentIDDoesNotExistAnymore=Parent this parent ID does not exists anymore
SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)
SwissQrCreditorInformationInvalid = Creditor information is invalid for IBAN (%s): %s

1
htdocs/langs/en_US/ticket.lang
View file

@ -74,7 +74,6 @@ SolvedClosed=Solved
Deleted=Deleted
# Dict
TicketType=Type
Severity=Severity
TicketGroupIsPublic=Group is public
TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface

21
htdocs/user/hierarchy.php
View file

@ -114,7 +114,7 @@ if (($search_employee != '' && $search_employee >= 0)) {
}
$sqlfilter= '';
if (!empty($filters)) {
$sqlfilter = join(' AND ', $filters);
$sqlfilter = implode(' AND ', $filters);
}
// Load hierarchy of users
$user_arbo_all = $userstatic->get_full_tree(0, '');
@ -196,11 +196,11 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
if (!empty($user_arbo_all[$idparent])) {
$val = $user_arbo_all[$idparent];
$userstatic->id = $val['id'];
$userstatic->ref = $val['id'];
$userstatic->ref = (string) $val['id'];
$userstatic->login = $val['login'];
$userstatic->firstname = $val['firstname'];
$userstatic->lastname = $val['lastname'];
$userstatic->statut = $val['statut'];
$userstatic->status = $val['statut'];
$userstatic->email = $val['email'];
$userstatic->gender = $val['gender'];
$userstatic->socid = $val['fk_soc'];
@ -208,6 +208,19 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
$userstatic->entity = $val['entity'];
$userstatic->photo = $val['photo'];
$entity = $val['entity'];
$entitystring = '';
// TODO Set of entitystring should be done with a hook
if (isModEnabled('multicompany') && is_object($mc)) {
if (empty($entity)) {
$entitystring = $langs->trans("AllEntities");
} else {
$mc->getInfo($entity);
$entitystring = $mc->label;
}
}
$li = '<span class="opacitymedium">';
$li .= $userstatic->getNomUrl(-1, '', 0, 1);
if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) {
@ -238,7 +251,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
// We should not be here. If a record has a parent id, parent id should be into $user_arbo_all
$data[$key]['fk_menu'] = -2;
if (empty($data[-2])) {
$li = '<span class="opacitymedium">'.$langs->trans("ParentIDDoesNotExistAnymore").'</span>';
$li = '<span class="opacitymedium">'.$langs->trans("WarningParentIDDoesNotExistAnymore").'</span>';
$entry = '<table class="nobordernopadding centpercent"><tr class="trtree"><td class="usertddisabled">'.$li.'</td><td align="right" class="usertddisabled"></td></tr></table>';
$data[-2] = array(
'rowid'=>'-2',