';
$return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).' ';
$return .= '
';
- if (property_exists($this, 'societe')) {
- $return .= '
'.$this->societe.' ';
+ if (!empty($arraydata['thirdparty'])) {
+ $tmpthirdparty = $arraydata['thirdparty'];
+ $return .= '
'.$tmpthirdparty->getNomUrl(1).'
';
}
if (property_exists($this, 'date_contrat')) {
$return .= '
'.$langs->trans("DateContract").' : '.dol_print_date($this->date_contrat, 'day').' ';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(7).'
';
}
$return .= '
';
}
// Output Kanban
- $contracttmp->societe = $socstatic->getNomUrl();
+ $arraydata['thirdparty'] = $socstatic;
$contracttmp->date_contrat = $obj->date_contrat;
- print $contracttmp->getKanbanView('');
+ print $contracttmp->getKanbanView('', $arraydata);
if ($i == ($imaxinloop - 1)) {
print '
';
print '';
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index d721ec78873..4424a65eb07 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -1292,4 +1292,22 @@ $(document).ready(function() {
});
+/*
+ * Hacky fix for a bug in select2 with jQuery 3.6.0's new nested-focus "protection"
+ * see: https://github.com/select2/select2/issues/5993
+ * see: https://github.com/jquery/jquery/issues/4382
+ *
+ * TODO: Recheck with the select2 GH issue and remove once this is fixed on their side
+ */
+
+$(document).on('select2:open', (e) => {
+ console.log("Execute the focus (click on combo or use space when on component");
+ const target = $(e.target);
+ if (target && target.length) {
+ const id = target[0].id || target[0].name;
+ document.querySelector(`input[aria-controls*='${id}']`).focus();
+ }
+});
+
+
// End of lib_head.js.php
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2da236006c0..26d9f38fcf6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8040,6 +8040,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
$outputlangs->loadLangs(array('paypal', 'other'));
+
+ $amounttouse = 0;
$typeforonlinepayment = 'free';
if (is_object($object) && $object->element == 'commande') {
$typeforonlinepayment = 'order';
@@ -8049,7 +8051,6 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
}
if (is_object($object) && $object->element == 'member') {
$typeforonlinepayment = 'member';
- $amounttouse = 0;
if (!empty($object->last_subscription_amount)) {
$amounttouse = $object->last_subscription_amount;
}
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index ef89c65bdf1..e9859e79cb6 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -187,12 +187,12 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
/**
* Return string with full online payment Url
*
- * @param string $type Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)
- * @param string $ref Ref of object
- * @param int $amount Amount of money to request for
- * @return string Url string
+ * @param string $type Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)
+ * @param string $ref Ref of object
+ * @param int|float $amount Amount of money to request for
+ * @return string Url string
*/
-function showOnlinePaymentUrl($type, $ref, $amount = '9.99')
+function showOnlinePaymentUrl($type, $ref, $amount = 0)
{
global $langs;
@@ -213,13 +213,13 @@ function showOnlinePaymentUrl($type, $ref, $amount = '9.99')
/**
* Return string with HTML link for online payment
*
- * @param string $type Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)
- * @param string $ref Ref of object
- * @param string $label Text or HTML tag to display, if empty it display the URL
- * @param int $amount Amount of money to request for
- * @return string Url string
+ * @param string $type Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)
+ * @param string $ref Ref of object
+ * @param string $label Text or HTML tag to display, if empty it display the URL
+ * @param int|float $amount Amount of money to request for
+ * @return string Url string
*/
-function getHtmlOnlinePaymentLink($type, $ref, $label = '', $amount = '9.99')
+function getHtmlOnlinePaymentLink($type, $ref, $label = '', $amount = 0)
{
$url = getOnlinePaymentUrl(0, $type, $ref, $amount);
$label = $label ? $label : $url;
@@ -230,15 +230,15 @@ function getHtmlOnlinePaymentLink($type, $ref, $label = '', $amount = '9.99')
/**
* Return string with full Url
*
- * @param int $mode 0=True url, 1=Url formated with colors
- * @param string $type Type of URL ('free', 'order', 'invoice', 'contractline', 'member', 'boothlocation', ...)
- * @param string $ref Ref of object
- * @param int $amount Amount of money to request for
- * @param string $freetag Free tag (required and used for $type='free' only)
- * @param string $localorexternal 0=Url for browser, 1=Url for external access
- * @return string Url string
+ * @param int $mode 0=True url, 1=Url formated with colors
+ * @param string $type Type of URL ('free', 'order', 'invoice', 'contractline', 'member', 'boothlocation', ...)
+ * @param string $ref Ref of object
+ * @param int|float $amount Amount of money to request for
+ * @param string $freetag Free tag (required and used for $type='free' only)
+ * @param string $localorexternal 0=Url for browser, 1=Url for external access
+ * @return string Url string
*/
-function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 1)
+function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'your_tag', $localorexternal = 1)
{
global $conf, $dolibarr_main_url_root;
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 2456c71e985..130ac03c758 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1501,8 +1501,9 @@ class Fichinter extends CommonObject
$return .= '';
$return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).' ';
$return .= '
';
- if (property_exists($this, 'socid')) {
- $return .= '
'.$this->socid.' ';
+ if (!empty($arraydata['thirdparty'])) {
+ $tmpthirdparty = $arraydata['thirdparty'];
+ $return .= '
'.$tmpthirdparty->getNomUrl(1).' ';
}
if (property_exists($this, 'duration')) {
$return .= '
'.$langs->trans("Duration").' : '.convertSecondToTime($this->duration, 'allhourmin').' ';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 86554408a23..e06b138ab76 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -93,7 +93,7 @@ if (!$sortfield) {
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$object = new Fichinter($db);
-$hookmanager->initHooks(array('interventionlist'));
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
$extrafields = new ExtraFields($db);
@@ -148,6 +148,7 @@ if ($user->socid) {
$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
$permissiontoread = $user->rights->ficheinter->lire;
+$permissiontoadd = $user->rights->ficheinter->creer;
$permissiontodelete = $user->rights->ficheinter->supprimer;
@@ -213,8 +214,8 @@ if (isModEnabled('contrat')) {
$now = dol_now();
-$help_url = '';
$title = $langs->trans("Interventions");
+$help_url = '';
$morejs = array();
$morecss = array();
@@ -250,7 +251,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
}
// Add fields from hooks
$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
$sqlfields = $sql; // $sql fields to remove for count total
@@ -271,7 +272,7 @@ if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines)
// Add table from hooks
$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
if (empty($user->rights->societe->client->voir) && empty($socid)) {
@@ -318,7 +319,7 @@ if ($search_all) {
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
// Add where from hooks
$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
// Add GroupBy from hooks
$parameters = array('search_all' => $search_all, 'fieldstosearchall' => $fieldstosearchall);
@@ -339,7 +340,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
dol_print_error($db);
}
- if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller than the paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
@@ -373,7 +374,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
// Output page
// --------------------------------------------------------------------
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
$arrayofselected = is_array($toselect) ? $toselect : array();
@@ -394,7 +395,7 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
}
if ($limit > 0 && $limit != $conf->liste_limit) {
- $param .= '&limit='.urlencode($limit);
+ $param .= '&limit='.((int) $limit);
}
if ($search_all) {
$param .= "&search_all=".urlencode($search_all);
@@ -427,7 +428,7 @@ if ($optioncss != '') {
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
// Add $param from hooks
$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$param .= $hookmanager->resPrint;
// List of mass actions available
@@ -454,7 +455,10 @@ print '
';
print '
';
print '
';
+print '
';
print '
';
+print '
';
+print '
';
$newcardbutton = '';
$url = DOL_URL_ROOT.'/fichinter/card.php?action=create';
@@ -464,6 +468,7 @@ if (!empty($socid)) {
$newcardbutton = '';
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitleSeparator();
$newcardbutton .= dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', $url, '', $user->rights->ficheinter->creer);
print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -475,16 +480,19 @@ $trackid = 'int'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($search_all) {
+ $setupstring = '';
foreach ($fieldstosearchall as $key => $val) {
$fieldstosearchall[$key] = $langs->trans($val);
+ $setupstring .= $key."=".$val.";";
}
- print '
'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'
';
+ print ''."\n";
+ print '
'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'
'."\n";
}
$moreforfilter = '';
$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) {
$moreforfilter .= $hookmanager->resPrint;
} else {
@@ -494,22 +502,25 @@ if (empty($reshook)) {
if (!empty($moreforfilter)) {
print '
';
print $moreforfilter;
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print '
';
}
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '
';
-print '
'."\n";
+print ''."\n";
// Fields title search
// --------------------------------------------------------------------
print '';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
- print '';
+ print ' ';
$searchpicto = $form->showFilterButtons('left');
print $searchpicto;
print ' ';
@@ -549,7 +560,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
// Fields from hook
$parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (!empty($arrayfields['f.datec']['checked'])) {
// Date creation
@@ -598,7 +609,7 @@ if (!empty($arrayfields['fd.duree']['checked'])) {
}
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
- print '';
+ print ' ';
$searchpicto = $form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -614,72 +625,88 @@ print ' ';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.ref']['checked'])) {
print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.ref_client']['checked'])) {
print_liste_field_titre($arrayfields['f.ref_client']['label'], $_SERVER["PHP_SELF"], "f.ref_client", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['s.nom']['checked'])) {
print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['pr.ref']['checked'])) {
print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], "pr.ref", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['c.ref']['checked'])) {
print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.description']['checked'])) {
print_liste_field_titre($arrayfields['f.description']['label'], $_SERVER["PHP_SELF"], "f.description", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (!empty($arrayfields['f.datec']['checked'])) {
print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.tms']['checked'])) {
print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.note_public']['checked'])) {
print_liste_field_titre($arrayfields['f.note_public']['label'], $_SERVER["PHP_SELF"], "f.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.note_private']['checked'])) {
print_liste_field_titre($arrayfields['f.note_private']['label'], $_SERVER["PHP_SELF"], "f.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.fk_statut']['checked'])) {
print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['fd.description']['checked'])) {
print_liste_field_titre($arrayfields['fd.description']['label'], $_SERVER["PHP_SELF"], '');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['fd.date']['checked'])) {
print_liste_field_titre($arrayfields['fd.date']['label'], $_SERVER["PHP_SELF"], "fd.date", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['fd.duree']['checked'])) {
print_liste_field_titre($arrayfields['fd.duree']['label'], $_SERVER["PHP_SELF"], "fd.duree", "", $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+ $totalarray['nbfield']++;
}
print " \n";
// Loop on record
// --------------------------------------------------------------------
-$total = 0;
$i = 0;
$savnbfield = $totalarray['nbfield'];
$totalarray = array();
$totalarray['nbfield'] = 0;
$totalarray['val'] = array();
$totalarray['val']['fd.duree'] = 0;
+$total = 0;
$imaxinloop = ($limit ? min($num, $limit) : $num);
while ($i < $imaxinloop) {
$obj = $db->fetch_object($resql);
@@ -706,21 +733,29 @@ while ($i < $imaxinloop) {
//mode kanban
if ($mode == 'kanban') {
if ($i == 0) {
- print '';
+ print ' ';
print '';
}
// Output Kanban
- $objectstatic->duration = $obj->duree;
- $objectstatic->socid = $companystatic->getNomUrl(1, '', 44);
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($object->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ }
- print $objectstatic->getKanbanView('');
+ $objectstatic->duration = $obj->duree;
+ $arraydata['thirdparty'] = $companystatic;
+ print $objectstatic->getKanbanView('', $arraydata);
if ($i == ($imaxinloop - 1)) {
print '
';
print ' ';
+ // Show here line of result
+ $j = 0;
+ print ' ';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '';
@@ -732,6 +767,9 @@ while ($i < $imaxinloop) {
print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
if (!empty($arrayfields['f.ref']['checked'])) {
print "";
@@ -906,9 +944,9 @@ while ($i < $imaxinloop) {
print ' ';
- }
- if (!$i) {
- $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
print ' '."\n";
@@ -958,8 +996,8 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
$urlsource .= str_replace('&', '&', $param);
$filedir = $diroutputmassaction;
- $genallowed = $user->rights->ficheinter->lire;
- $delallowed = $user->rights->ficheinter->creer;
+ $genallowed = $permissiontoread;
+ $delallowed = $permissiontoadd;
print $formfile->showdocuments('massfilesarea_interventions', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 50508f171df..7083897e25a 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -751,9 +751,9 @@ if ($id > 0 || !empty($ref)) {
// Select warehouse to force it everywhere
if (count($listwarehouses) > 1) {
- print ''.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled, '', 'minwidth100 maxwidth300', 1);
+ print ''.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled, '', 'minwidth100 maxwidth300', 1);
+ print '';
- print $langs->trans("ProductDoesNotUseBatchSerial");
+ print ''.$langs->trans("ProductDoesNotUseBatchSerial").'';
print ' ';
if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
print ''.$langs->trans("OtherBills").' )';
+ $morehtmlref .= ' ';
}
// Project
if (isModEnabled('project')) {
@@ -3023,7 +3023,7 @@ if ($action == 'create') {
if ($permissiontoadd) {
$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
if ($action != 'classify') {
- $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
}
$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
} else {
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 9cbf579c144..1c7cada039f 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -138,7 +138,7 @@ if ($id > 0 || !empty($ref)) {
// Thirdparty
$morehtmlref .= ''.$langs->trans("OtherBills").' )';
+ $morehtmlref .= ' ';
}
// Project
if (isModEnabled('project')) {
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index cff4a30f442..1fad726c8ec 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -114,7 +114,7 @@ if ($object->id > 0) {
// Thirdparty
$morehtmlref .= ''.$langs->trans("OtherBills").' )';
+ $morehtmlref .= ' ';
}
// Project
if (isModEnabled('project')) {
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 9369a290c9c..a37a5b3469f 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -80,7 +80,7 @@ $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_
// Thirdparty
$morehtmlref .= ''.$langs->trans("OtherBills").' )';
+ $morehtmlref .= ' ';
}
// Project
if (isModEnabled('project')) {
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index c8178e39d74..550ffc345e7 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -110,7 +110,7 @@ if ($object->id > 0) {
// Thirdparty
$morehtmlref .= ''.$langs->trans("OtherBills").' )';
+ $morehtmlref .= ' ';
}
// Project
if (isModEnabled('project')) {
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 09627d5a3b0..0e10bb06f2a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -905,8 +905,8 @@ ConfirmMassClone=Bulk clone confirmation
ConfirmMassCloneQuestion=Select project to clone to
ConfirmMassCloneToOneProject=Clone to project %s
RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-ClassifyUnbilled=Classify unbilled
+ClassifyBilled=Classify Billed
+ClassifyUnbilled=Classify Unbilled
Progress=Progress
ProgressShort=Progr.
FrontOffice=Front office
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index d4fb27b508e..bce50fba686 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -54,7 +54,7 @@ Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
Notify_WITHDRAW_CREDIT=Credit withdrawal
Notify_WITHDRAW_EMIT=Perform withdrawal
Notify_COMPANY_CREATE=Third party created
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=Mails sent from the page of third party
Notify_BILL_VALIDATE=Customer invoice validated
Notify_BILL_UNVALIDATE=Customer invoice unvalidated
Notify_BILL_PAYED=Customer invoice paid
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 6a7a0a6fbe1..d2ceab30337 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -202,7 +202,7 @@ InputPerMonth=Input per month
InputDetail=Input detail
TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
ProjectsWithThisUserAsContact=Projects with this user as contact
-ProjectsWithThisContact=Projects with this contact
+ProjectsWithThisContact=Projects with this third-party contact
TasksWithThisUserAsContact=Tasks assigned to this user
ResourceNotAssignedToProject=Not assigned to project
ResourceNotAssignedToTheTask=Not assigned to the task
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 8f10b1e9404..7850d7a3fd6 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -48,7 +48,7 @@ DateDeliveryPlanned=Planned date of delivery
RefDeliveryReceipt=Ref delivery receipt
StatusReceipt=Status delivery receipt
DateReceived=Date delivery received
-ClassifyReception=Classify reception
+ClassifyReception=Classify Received
SendShippingByEMail=Send shipment by email
SendShippingRef=Submission of shipment %s
ActionsOnShipping=Events on shipment
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 7b2cc90f7ac..a827023eb8a 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -83,7 +83,7 @@ BlogPost=Blog post
WebsiteAccount=Website account
WebsiteAccounts=Website accounts
AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
+BackToListForThirdParty=Back to list for the third parties
DisableSiteFirst=Disable website first
MyContainerTitle=My web site title
AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index b21608a55a9..817c7cae698 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2472,8 +2472,14 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
console.log("Click on .butAction.dropdown-toggle");
var parentholder = jQuery(".butAction.dropdown-toggle").closest(".dropdown");
var offset = parentholder.offset();
+ var widthdocument = $(document).width();
var left = offset.left;
- var right = $(document).width() - offset.left - parentholder.width();
+ var right = widthdocument - offset.left - parentholder.width();
+ var widthpopup = parentholder.children(".dropdown-content").width();
+ console.log("left="+left+" right="+right+" width="+widthpopup+" widthdocument="+widthdocument);
+ if (widthpopup + right >= widthdocument) {
+ right = 10;
+ }
parentholder.toggleClass("open");
parentholder.children(".dropdown-content").css({"right": right+"px", "left": "auto"});
});
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 12eb7c573ce..3dc22b5a589 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -149,7 +149,6 @@ if ($object->fk_project > 0) {
}
-
/*
* Actions
*/
@@ -875,9 +874,11 @@ if ($action == 'confirm_generateinter') {
}
}
+
/*
* View
*/
+
$form = new Form($db);
$formother = new FormOther($db);
$formproject = new FormProjets($db);
@@ -1304,7 +1305,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
if ($search_year > 0) {
$param .= '&search_year='.urlencode($search_year);
}
- if ($search_user > 0) {
+ if (!empty($search_user)) { // We keep param if -1 because default value is forced to user id if not set
$param .= '&search_user='.urlencode($search_user);
}
if ($search_task_ref != '') {
@@ -1564,6 +1565,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
$sql = preg_replace('/,\s*$/', '', $sql);
+
+ $sqlfields = $sql; // $sql fields to remove for count total
+
$sql .= " FROM ".MAIN_DB_PREFIX."element_time as t";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facturedet as il ON il.rowid = t.invoice_line_id";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as inv ON inv.rowid = il.fk_facture";
@@ -1657,39 +1661,42 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
- $sql .= $db->order($sortfield, $sortorder);
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
- $resql = $db->query($sql);
-
- if (! $resql) {
+ /* The fast and low memory method to get and count full list converts the sql into a sql count */
+ $sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+ $sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+ $resql = $db->query($sqlforcount);
+ if ($resql) {
+ $objforcount = $db->fetch_object($resql);
+ $nbtotalofrecords = $objforcount->nbtotalofrecords;
+ } else {
dol_print_error($db);
- exit;
}
- $nbtotalofrecords = $db->num_rows($resql);
- if (($page * $limit) > $nbtotalofrecords) { // if total of record found is smaller than page * limit, goto and load page 0
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller than the paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
+ $db->free($resql);
}
- // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
- if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
- $num = $nbtotalofrecords;
- } else {
+
+ // Complete request and execute it with limit
+ $sql .= $db->order($sortfield, $sortorder);
+ if ($limit) {
$sql .= $db->plimit($limit + 1, $offset);
-
- $resql = $db->query($sql);
- if (!$resql) {
- dol_print_error($db);
- exit;
- }
-
- $num = $db->num_rows($resql);
}
+ $resql = $db->query($sql);
+ if (!$resql) {
+ dol_print_error($db);
+ exit;
+ }
+
+ $num = $db->num_rows($resql);
+
if ($num >= 0) {
if (!empty($projectidforalltimes)) {
print ''."\n";
@@ -1870,6 +1877,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
print ''."\n";
// Fields title search
+ // --------------------------------------------------------------------
print '';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -1918,7 +1926,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
}
// Author
if (!empty($arrayfields['author']['checked'])) {
- print ''.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250').' ';
+ print ''.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth150').' ';
}
// Note
if (!empty($arrayfields['t.note']['checked'])) {
@@ -1977,54 +1985,72 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
}
print ' '."\n";
+ $totalarray = array();
+ $totalarray['nbfield'] = 0;
+
+ // Fields title label
+ // --------------------------------------------------------------------
print '';
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'width="80"', $sortfield, $sortorder, 'center maxwidthsearch ');
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['t.element_date']['checked'])) {
print_liste_field_titre($arrayfields['t.element_date']['label'], $_SERVER['PHP_SELF'], 't.element_date,t.element_datehour,t.rowid', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
-
if (!empty($arrayfields['p.fk_soc']['checked'])) {
print_liste_field_titre($arrayfields['p.fk_soc']['label'], $_SERVER['PHP_SELF'], 't.element_date,t.element_datehour,t.rowid', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['s.name_alias']['checked'])) {
print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER['PHP_SELF'], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($allprojectforuser)) {
if (!empty($arrayfields['p.project_ref']['checked'])) {
print_liste_field_titre("Project", $_SERVER['PHP_SELF'], 'p.ref', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['p.project_label']['checked'])) {
print_liste_field_titre("ProjectLabel", $_SERVER['PHP_SELF'], 'p.title', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
}
if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
if (!empty($arrayfields['t.element_ref']['checked'])) {
print_liste_field_titre($arrayfields['t.element_ref']['label'], $_SERVER['PHP_SELF'], 'pt.ref', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['t.element_label']['checked'])) {
print_liste_field_titre($arrayfields['t.element_label']['label'], $_SERVER['PHP_SELF'], 'pt.label', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
}
if (!empty($arrayfields['author']['checked'])) {
print_liste_field_titre($arrayfields['author']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['t.note']['checked'])) {
print_liste_field_titre($arrayfields['t.note']['label'], $_SERVER['PHP_SELF'], 't.note', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['t.element_duration']['checked'])) {
print_liste_field_titre($arrayfields['t.element_duration']['label'], $_SERVER['PHP_SELF'], 't.element_duration', '', $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['t.fk_product']['checked'])) {
print_liste_field_titre($arrayfields['t.fk_product']['label'], $_SERVER['PHP_SELF'], 't.fk_product', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['value']['checked'])) {
print_liste_field_titre($arrayfields['value']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['valuebilled']['checked'])) {
print_liste_field_titre($arrayfields['valuebilled']['label'], $_SERVER['PHP_SELF'], 'il.total_ht', '', $param, '', $sortfield, $sortorder, 'center ', $langs->trans("SelectLinesOfTimeSpentToInvoice"));
+ $totalarray['nbfield']++;
}
/*
// Extra fields
@@ -2036,6 +2062,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
print $hookmanager->resPrint;
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'width="80"', $sortfield, $sortorder, 'center maxwidthsearch ');
+ $totalarray['nbfield']++;
}
print " \n";
@@ -2043,10 +2070,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$tmpinvoice = new Facture($db);
$i = 0;
-
$total = 0;
$totalvalue = 0;
- $totalarray = array('nbfield'=>0);
+
+ $savnbfield = $totalarray['nbfield'];
+ $totalarray = array();
+ $totalarray['nbfield'] = 0;
+ //$imaxinloop = ($limit ? min($num, $limit) : $num);
foreach ($tasks as $task_time) {
if ($i >= $limit) {
break;
@@ -2055,11 +2085,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$date1 = $db->jdate($task_time->element_date);
$date2 = $db->jdate($task_time->element_datehour);
- print '';
+ // Show here line of result
+ $j = 0;
+ print ' ';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
- print '';
+ print ' ';
if (($action == 'editline' || $action == 'splitline') && GETPOST('lineid', 'int') == $task_time->rowid) {
print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Date
if (!empty($arrayfields['t.element_date']['checked'])) {
@@ -2113,7 +2149,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
// Thirdparty
if (!empty($arrayfields['p.fk_soc']['checked'])) {
- print '';
+ print ' ';
if ($task_time->fk_soc > 0) {
if (empty($conf->cache['thridparty'][$task_time->fk_soc])) {
$tmpsociete = new Societe($db);
@@ -2132,7 +2168,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
// Thirdparty alias
if (!empty($arrayfields['s.name_alias']['checked'])) {
- print ' ';
if ($task_time->fk_soc > 0) {
if (empty($conf->cache['thridparty'][$task_time->fk_soc])) {
$tmpsociete = new Societe($db);
@@ -2141,8 +2176,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
} else {
$tmpsociete = $conf->cache['thridparty'][$task_time->fk_soc];
}
- print $tmpsociete->name_alias;
+ $valtoshow = $tmpsociete->name_alias;
}
+ print ' ';
+ print $valtoshow;
print ' ';
if (!$i) {
$totalarray['nbfield']++;
@@ -2309,6 +2346,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
}
}
print '';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Value spent
@@ -2422,10 +2462,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
}
}
}
- }
- print '';
- if (!$i) {
- $totalarray['nbfield']++;
+ print '';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
print " \n";
@@ -2724,7 +2764,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
if ($num < $limit && empty($offset)) {
print ''.$langs->trans("Total").' ';
} else {
- print ''.$langs->trans("Totalforthispage").' ';
+ print ''.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).' ';
}
} elseif ($totalarray['totaldurationfield'] == $i) {
print ''.convertSecondToTime($totalarray['totalduration'], 'allhourmin').' ';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 310d2899a37..6c88f652ea8 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6546,7 +6546,7 @@ span#select2-boxbookmark-container {
font-weight: normal;
}
.select2-container-multi-dolibarr .select2-choices-dolibarr li {
- float: left;
+ float: ;
list-style: none;
}
.select2-container-multi-dolibarr .select2-choices-dolibarr {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 25843c8c407..9a952827ffb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6453,7 +6453,7 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
font-weight: normal;
}
.select2-container-multi-dolibarr .select2-choices-dolibarr li {
- float: left;
+ float: ;
list-style: none;
}
.select2-container-multi-dolibarr .select2-choices-dolibarr {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 124c61dc737..cafb1ae847b 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2378,25 +2378,25 @@ if ($action == 'create' || $action == 'adduserldap') {
}
if ($object->socid > 0 && !($object->contact_id > 0)) { // external user but no link to a contact
- print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', ' ');
+ print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', ' ', 0, 0, null, 0, 'maxwidth300');
print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
if ($object->ldap_sid) {
print ' ('.$langs->trans("DomainUser").')';
}
} elseif ($object->socid > 0 && $object->contact_id > 0) { // external user with a link to a contact
- print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', ' '); // We keep thirdparty empty, contact is already set
+ print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', ' ', 0, 0, null, 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
if ($object->ldap_sid) {
print ' ('.$langs->trans("DomainUser").')';
}
} elseif (!($object->socid > 0) && $object->contact_id > 0) { // internal user with a link to a contact
- print img_picto('', 'company').$form->select_company(0, 'socid', '', ' '); // We keep thirdparty empty, contact is already set
+ print img_picto('', 'company').$form->select_company(0, 'socid', '', ' ', 0, 0, null, 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
if ($object->ldap_sid) {
print ' ('.$langs->trans("DomainUser").')';
}
} else { // $object->socid is not > 0 here
- print img_picto('', 'company').$form->select_company(0, 'socid', '', ' '); // We keep thirdparty empty, contact is already set
+ print img_picto('', 'company').$form->select_company(0, 'socid', '', ' ', 0, 0, null, 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
}
}