Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
6110cccf63
4 changed files with 11 additions and 2 deletions
|
|
@ -2409,6 +2409,8 @@ ResetSms
|
|||
ResourceNotAssignedToTheTask
|
||||
ResourcePageIndex
|
||||
ResourceTypeCode
|
||||
ResourceTypeID
|
||||
ResourceTypeLabel
|
||||
ResponsibleOfRecruitement
|
||||
Rest
|
||||
RestOfEurope
|
||||
|
|
@ -3172,6 +3174,7 @@ descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE
|
|||
descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE
|
||||
descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE
|
||||
descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE
|
||||
descWORKFLOW_SUM_INVOICES_AMOUNT_CLASSIFY_BILLED_ORDER
|
||||
descWORKFLOW_TICKET_CLOSE_INTERVENTION
|
||||
descWORKFLOW_TICKET_CREATE_INTERVENTION
|
||||
descWORKFLOW_TICKET_LINK_CONTRACT
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ InstallChoiceRecommanded
|
|||
IsInPackage
|
||||
MailNoChangePossible
|
||||
MailSentBy
|
||||
MaxNbOfLinesForBoxes
|
||||
ModuleBuilderDesc2
|
||||
ModulesMarketPlaceDesc
|
||||
MoveField
|
||||
|
|
@ -68,7 +69,9 @@ ThirdPartyCustomersWithIdProf12
|
|||
TicketPublicInfoCreateTicket
|
||||
TitreRequestCP
|
||||
UseAsciiDocFormat
|
||||
UsePassword
|
||||
ViewPageInNewTab
|
||||
WEBSITE_PAGE_EXAMPLE
|
||||
YourTicketSuccessfullySaved
|
||||
#
|
||||
# ██████╗ █████╗ ██████╗ ████████╗██████╗
|
||||
|
|
|
|||
|
|
@ -2565,7 +2565,7 @@ class ExtraFields
|
|||
}
|
||||
|
||||
/**
|
||||
* Return array with all possible types and label of extrafields
|
||||
* Return array with all possible types and labels of extrafields
|
||||
*
|
||||
* @return string[]
|
||||
*/
|
||||
|
|
@ -2579,6 +2579,9 @@ class ExtraFields
|
|||
$type2label[$key] = $langs->transnoentitiesnoconv($val);
|
||||
}
|
||||
|
||||
if (!getDolGlobalString('MAIN_USE_EXTRAFIELDS_ICON')) {
|
||||
unset($type2label['icon']);
|
||||
}
|
||||
if (!getDolGlobalString('MAIN_USE_GEOPHP')) {
|
||||
unset($type2label['point']);
|
||||
unset($type2label['multipts']);
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
|
|||
}
|
||||
$value = $datenotinstring;
|
||||
} else {
|
||||
$value = (!empty($obj->$tmpkey) ? $obj->$tmpkey : '');
|
||||
$value = (isset($obj->$tmpkey) ? $obj->$tmpkey : '');
|
||||
}
|
||||
// If field is a computed field, we make computation to get value
|
||||
if ($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue