From 561cbbe958e5b41e2eaa869ba2cbed1f9c85aba6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2026 17:56:40 +0100 Subject: [PATCH] Look and feel v24 - Open margin en account summary of thirdparty in popup --- .../adherents/class/adherent_type.class.php | 55 +++++++- htdocs/adherents/type.php | 12 +- htdocs/comm/card.php | 96 +++++++++---- htdocs/compta/recap-compta.php | 28 ++-- htdocs/core/lib/functions.lib.php | 4 +- htdocs/core/modules/modMargin.class.php | 1 - htdocs/margin/tabs/thirdpartyMargins.php | 130 ++++++++++-------- htdocs/theme/eldy/global.inc.php | 13 +- htdocs/theme/eldy/info-box.inc.php | 9 +- htdocs/theme/md/info-box.inc.php | 29 ++-- htdocs/theme/md/style.css.php | 5 +- 11 files changed, 254 insertions(+), 128 deletions(-) diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index b3ef9064e6b..758b5ec8917 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -933,23 +933,68 @@ class AdherentType extends CommonObject * Return translated label by the nature of a adherent (physical or moral) * * @param string $morphy Nature of the adherent (physical or moral) + * @param int<0,2> $addbadge Add badge (1=Full label, 2=First letters only) * @return string Label */ - public function getmorphylib($morphy = '') + public function getmorphylib($morphy = '', $addbadge = 0) { global $langs; + + $s = ''; + if ($morphy == 'phy') { - return $langs->trans("Physical"); + $s = $langs->trans("Physical"); } elseif ($morphy == 'mor') { - return $langs->trans("Moral"); + $s = $langs->trans("Moral"); } else { - return $langs->trans("MorAndPhy"); + $s = $langs->trans("MorAndPhy"); } - //return $morphy; + + if ($addbadge) { + $labeltoshowm = $langs->trans("Moral"); + $labeltoshowp = $langs->trans("Physical"); + + $labeltoshow = $s; + if ($morphy === 'phy') { + if ($addbadge == 2) { + $labeltoshow = dol_strtoupper(dolGetFirstLetters($labeltoshowp)); + if ($labeltoshow == dol_strtoupper(dolGetFirstLetters($labeltoshow))) { + $labeltoshow = dol_strtoupper(dolGetFirstLetters($labeltoshow, 2)); + } + } + $s = ''.$labeltoshow.''; + } + if ($morphy === 'mor') { + if ($addbadge == 2) { + $labeltoshow = dol_strtoupper(dolGetFirstLetters($labeltoshowm)); + if ($labeltoshow == dol_strtoupper(dolGetFirstLetters($labeltoshow))) { + $labeltoshow = dol_strtoupper(dolGetFirstLetters($labeltoshow, 2)); + } + } + $s = ''.$labeltoshow.''; + } + if ($morphy === '') { + if ($addbadge == 2) { + $labeltoshow1 = dol_strtoupper(dolGetFirstLetters($labeltoshowp)); + if ($labeltoshow1 == dol_strtoupper(dolGetFirstLetters($labeltoshow1))) { + $labeltoshow1 = dol_strtoupper(dolGetFirstLetters($labeltoshow1, 2)); + } + $labeltoshow2 = dol_strtoupper(dolGetFirstLetters($labeltoshowm)); + if ($labeltoshow2 == dol_strtoupper(dolGetFirstLetters($labeltoshow2))) { + $labeltoshow2 = dol_strtoupper(dolGetFirstLetters($labeltoshow2, 2)); + } + $labeltoshow = $labeltoshow1.' '.$langs->trans("or").' '.$labeltoshow2; + } + $s = ''.$labeltoshow.''; + } + } + + return $s; } /** * getTooltipContentArray + * * @param array $params params to construct tooltip data * @since v18 * @return array{picto?:string,ref?:string,refsupplier?:string,label?:string,date?:string,date_echeance?:string,amountht?:string,total_ht?:string,totaltva?:string,amountlt1?:string,amountlt2?:string,amountrevenustamp?:string,totalttc?:string}|array{optimize:string} diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 2720cd5538f..2f99d243742 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -473,13 +473,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') { } if (!empty($arrayfields['t.morphy']['checked'])) { print ''; - if ($objp->morphy == 'phy') { - print $langs->trans("Physical"); - } elseif ($objp->morphy == 'mor') { - print $langs->trans("Moral"); - } else { - print $langs->trans("MorAndPhy"); - } + print $membertype->getmorphylib($objp->morphy, 1); print ''; } if (!empty($arrayfields['t.duration']['checked'])) { @@ -680,7 +674,9 @@ if ($rowid > 0) { print ''; // Morphy - print ''; + print ''; print ''; print ''; - - // Margin Rate - if (getDolGlobalString('DISPLAY_MARGIN_RATES')) { - print ''; - } - - // Mark Rate - if (getDolGlobalString('DISPLAY_MARK_RATES')) { - print ''; - } - - print "
'.$langs->trans("MembersNature").''.$object->getmorphylib($object->morphy).'
'.$langs->trans("MembersNature").''; + print $object->getmorphylib($object->morphy, 1); + print '
'.$form->textwithpicto($langs->trans("SubscriptionRequired"), $langs->trans("SubscriptionRequiredDesc")).''; diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 1aafddfc693..a839f0573ab 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -35,6 +35,14 @@ // Load Dolibarr environment require '../main.inc.php'; +/** + * @var Conf $conf + * @var DoliDB $db + * @var HookManager $hookmanager + * @var Societe $mysoc + * @var Translate $langs + * @var User $user + */ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -71,15 +79,6 @@ if (isModEnabled('accounting')) { require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php'; } -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Societe $mysoc - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array('companies', 'banks', 'commercial')); @@ -831,17 +830,17 @@ if ($object->id > 0) { $warn = ' '.img_warning($langs->trans("OutstandingBillReached")); } $text = $langs->trans("CurrentOutstandingBill"); + $link = DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id; $icon = 'bill'; + $boxstattmp = '
'; + $boxstattmp .= ''.img_object("", $icon).' '.$text.'
'; + $boxstattmp .= ''.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).''; + $boxstattmp .= '
'; if ($link) { - $boxstat .= ''; - } - $boxstat .= '
'; - $boxstat .= ''.img_object("", $icon).' '.$text.'
'; - $boxstat .= ''.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.''; - $boxstat .= '
'; - if ($link) { - $boxstat .= '
'; + $boxstat .= dolButtonToOpenUrlInDialogPopup('popupoutstanding', $text, $boxstattmp, '/compta/recap-compta.php?socid='.$object->id, '', ''); + } else { + $boxstat .= $boxstattmp; } $tmp = $object->getOutstandingBills('customer', 1); @@ -852,21 +851,67 @@ if ($object->id > 0) { $warn = ' '.img_warning($langs->trans("OutstandingBillReached")); } $text = $langs->trans("CurrentOutstandingBillLate"); + $link = DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id; $icon = 'bill'; + $boxstattmp = '
'; + $boxstattmp .= ''.img_object("", $icon).' '.$text.'
'; + $boxstattmp .= ''.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency).''; + $boxstattmp .= '
'; if ($link) { - $boxstat .= ''; - } - $boxstat .= '
'; - $boxstat .= ''.img_object("", $icon).' '.$text.'
'; - $boxstat .= ''.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency).$warn.''; - $boxstat .= '
'; - if ($link) { - $boxstat .= '
'; + $boxstat .= dolButtonToOpenUrlInDialogPopup('popupoutstanding', $text, $boxstattmp, '/compta/recap-compta.php?socid='.$object->id, '', ''); + } else { + $boxstat .= $boxstattmp; } } } + // Margins + if (isModEnabled('margin') && $user->hasRight('margin', 'liretous')) { + // Box margin + $sql = "SELECT "; + $sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive + $sql .= " sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // always positive + $sql .= " sum(d.total_ht - (".$db->ifsql('f.type = '.Facture::TYPE_CREDIT_NOTE, '-1', '1')." * (d.buy_price_ht * d.qty * (d.situation_percent / 100)))) as marge"; + $sql .= " FROM ".MAIN_DB_PREFIX."facture as f,"; + $sql .= " ".MAIN_DB_PREFIX."facturedet as d"; + $sql .= " WHERE f.fk_soc = ".((int) $id); + $sql .= " AND f.fk_statut > 0"; + $sql .= " AND f.entity IN (".getEntity('invoice').")"; + $sql .= " AND d.fk_facture = f.rowid"; + $sql .= " AND d.buy_price_ht IS NOT NULL"; + // We should not use this here. Option ForceBuyingPriceIfNull should have effect only when inserting data. Once data is recorded, it must be used as it is for report. + // We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredictable. + if (getDolGlobalInt('ForceBuyingPriceIfNull') == 2) { + $sql .= " AND d.buy_price_ht <> 0"; + } + + $marginTotal = 0; + + $resql = $db->query($sql); + if ($resql) { + $obj = $db->fetch_object($resql); + if ($obj) { + $marginTotal = $obj->marge; + } + } + + $text = $langs->transnoentitiesnoconv("Margins"); + + $link = DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$object->id; + $icon = 'margin'; + $boxstattmp = '
'; + $boxstattmp .= ''.img_object("", $icon).' '.$text.'
'; + $boxstattmp .= ''.price($marginTotal, 1, $langs, 1, -1, -1, $conf->currency).''; + $boxstattmp .= '
'; + if ($link) { + $boxstat .= dolButtonToOpenUrlInDialogPopup('popupmargin', $text, $boxstattmp, '/margin/tabs/thirdpartyMargins.php?socid='.$object->id, '', ''); + } else { + $boxstat .= $boxstattmp; + } + } + + $parameters = array(); $reshook = $hookmanager->executeHooks('addMoreBoxStatsCustomer', $parameters, $object, $action); if (empty($reshook)) { @@ -880,6 +925,7 @@ if ($object->id > 0) { print $boxstat; + /* * Latest proposals */ diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index d379313ef11..f688fe68817 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -27,10 +27,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -38,12 +34,15 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; // Load translation files required by the page -$langs->load("companies"); -if (isModEnabled('invoice')) { - $langs->load("bills"); -} +$langs->loadLangs(array("companies", "bills")); + +$action = GETPOST('action'); +$dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); $id = GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('socid'); @@ -124,12 +123,17 @@ if ($id > 0) { if ($id > 0) { $param .= '&socid='.$id; } + if ($dol_openinpopup) { + $param .= '&dol_openinpopup='.urlencode($dol_openinpopup); + } - $head = societe_prepare_head($object); + if (empty($dol_openinpopup)) { + $head = societe_prepare_head($object); - print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company'); - dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 1); - print dol_get_fiche_end(); + print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company'); + dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 1); + print dol_get_fiche_end(); + } if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) { // Invoice list diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 896b4a70f45..1c16ec8f89a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -7823,10 +7823,12 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $ $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur); } } - $output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' ' : '') . $cursymbolafter; if ($form) { $output = preg_replace('/\s/', ' ', $output); + $output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' '.$cursymbolafter.'' : ''); $output = preg_replace('/\'/', ''', $output); + } else { + $output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' '.$cursymbolafter : ''); } return $output; diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php index 7bde887ad78..119c2cdab99 100644 --- a/htdocs/core/modules/modMargin.class.php +++ b/htdocs/core/modules/modMargin.class.php @@ -88,7 +88,6 @@ class modMargin extends DolibarrModules // New pages on tabs $this->tabs = array( 'product:+margin:Margins:margins:$user->hasRight("margins","liretous"):/margin/tabs/productMargins.php?id=__ID__', - 'thirdparty:+margin:Margins:margins:empty($user->socid) && $user->hasRight("margins","liretous") && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__' ); diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index 15b010ddc9a..c4826b2a6c8 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -38,6 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->loadLangs(array("companies", "bills", "products", "margins")); $action = GETPOST('action'); +$dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); // Security check $socid = GETPOSTINT('socid'); @@ -131,6 +132,7 @@ if (empty($search_invoice_date_start) && empty($search_invoice_date_end) && !GET } } + /* * View */ @@ -149,6 +151,9 @@ $param = "&socid=".$socid; if ($limit > 0 && $limit != $conf->liste_limit) { $param .= '&limit='.((int) $limit); } +if ($dol_openinpopup) { + $param .= '&dol_openinpopup='.urlencode($dol_openinpopup); +} if ($search_invoice_date_start) { $param .= '&search_invoice_date_start_day='.dol_print_date($search_invoice_date_start, '%d').'&search_invoice_date_start_month='.dol_print_date($search_invoice_date_start, '%m').'&search_invoice_date_start_year='.dol_print_date($search_invoice_date_start, '%Y'); } @@ -164,78 +169,79 @@ if ($socid > 0) { $object = new Societe($db); $object->fetch($socid); - // Show tabs + if (empty($dol_openinpopup)) { + // Show tabs - $head = societe_prepare_head($object); + $head = societe_prepare_head($object); - print dol_get_fiche_head($head, 'margin', $langs->trans("ThirdParty"), -1, 'company'); + print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), -1, 'company'); - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; - dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom'); + dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom'); - print '
'; + print '
'; - print '
'; - print ''; + print '
'; + print '
'; - // Type Prospect/Customer/Supplier - print ''; + // Type Prospect/Customer/Supplier + print ''; - if ($object->client) { - print ''; } - print ''; - } - if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) && $object->fournisseur) { - print ''; } + + // Total Margin + print ''; + + // Margin Rate + if (getDolGlobalString('DISPLAY_MARGIN_RATES')) { + print ''; + } + + // Mark Rate + if (getDolGlobalString('DISPLAY_MARK_RATES')) { + print ''; + } + + print "
'.$langs->trans('NatureOfThirdParty').''; - print $object->getTypeUrl(1); - print '
'.$langs->trans('NatureOfThirdParty').''; + print $object->getTypeUrl(1); + print '
'; - print $langs->trans('CustomerCode').''; - print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client)); - $tmpcheck = $object->check_codeclient(); - if ($tmpcheck != 0 && $tmpcheck != -5) { - print ' ('.$langs->trans("WrongCustomerCode").')'; + if ($object->client) { + print '
'; + print $langs->trans('CustomerCode').''; + print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client)); + $tmpcheck = $object->check_codeclient(); + if ($tmpcheck != 0 && $tmpcheck != -5) { + print ' ('.$langs->trans("WrongCustomerCode").')'; + } + print '
'; - print $langs->trans('SupplierCode').''; - print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur)); - $tmpcheck = $object->check_codefournisseur(); - if ($tmpcheck != 0 && $tmpcheck != -5) { - print ' ('.$langs->trans("WrongSupplierCode").')'; + if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) && $object->fournisseur) { + print '
'; + print $langs->trans('SupplierCode').''; + print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur)); + $tmpcheck = $object->check_codefournisseur(); + if ($tmpcheck != 0 && $tmpcheck != -5) { + print ' ('.$langs->trans("WrongSupplierCode").')'; + } + print '
'.$langs->trans("TotalMargin").''; + print ''; // set by jquery (see below) print '
'.$langs->trans("MarginRate").''; + print ''; // set by jquery (see below) + print '
'.$langs->trans("MarkRate").''; + print ''; // set by jquery (see below) + print '
"; + + print '
'; + print '
'; + + print dol_get_fiche_end(); + + print '
'; } - // Total Margin - print '
'.$langs->trans("TotalMargin").''; - print ''; // set by jquery (see below) - print '
'.$langs->trans("MarginRate").''; - print ''; // set by jquery (see below) - print '
'.$langs->trans("MarkRate").''; - print ''; // set by jquery (see below) - print '
"; - - print ''; - print '
'; - - print dol_get_fiche_end(); - - print '
'; - - // TODO Remove the DISTINCT - $sql = "SELECT DISTINCT s.nom, s.rowid as socid, s.code_client,"; + $sql = "SELECT s.nom, s.rowid as socid, s.code_client,"; $sql .= " f.rowid as facid, f.ref, f.total_ht,"; $sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,"; $sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive @@ -263,6 +269,7 @@ if ($socid > 0) { } $sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total_ht, f.datef, f.paye, f.fk_statut, f.type"; + // TODO: calculate total to display then restore pagination $sql .= $db->order($sortfield, $sortorder); @@ -277,6 +284,7 @@ if ($socid > 0) { print '
'."\n"; print ''; + print ''; if (!empty($sortfield)) { print ''; } @@ -421,6 +429,7 @@ if ($socid > 0) { print ''; $invoicestatic->id = $objp->facid; $invoicestatic->ref = $objp->ref; + $invoicestatic->type = $objp->type; print $invoicestatic->getNomUrl(1); print "\n"; print ""; @@ -463,7 +472,7 @@ if ($socid > 0) { print ''; $colspan = 2; if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { - $colspan++; // add action column + print ''; } print ''.$langs->trans('TotalMargin').""; print "".price(price2num($cumul_vente, 'MT'))."\n"; @@ -478,8 +487,7 @@ if ($socid > 0) { print ' '; if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { // add action column - print ''; - print ''; + print ''; } print "\n"; } else { diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 6c20ec3e6dc..afb5b19d8f5 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1124,6 +1124,9 @@ textarea.centpercent { .centerimp { text-align: center !important; } +.centeronsmartphone { + text-align: center; +} .centergrid { display: grid; text-align: center; @@ -5347,13 +5350,14 @@ ul.noborder li:nth-child(even):not(.liste_titre) { padding-bottom: 2px; } .boxstats, .boxstatsempty { - padding-left: 6px; - padding-right: 6px; + padding-left: 5px; + padding-right: 3px; width: 118px; } .boxtable:not(.widgetstats) td.tdboxstats .boxstats { box-shadow: 1px 1px 8px var(--colorboxstatsborder); + border-radius: 6px; } .tabBar .fichehalfright .boxstats { @@ -5454,8 +5458,11 @@ ul.noborder li:nth-child(even):not(.liste_titre) { /*span.boxstatstext span:not(.fas) { opacity: 0.5; }*/ +span.boxstatstext span.fas { + filter: grayscale(100%); +} span.boxstatstext { - opacity: 0.5; /* a bug if browser make z-index was discovered when opacity is set, if still present, we must disable it */ + opacity: 0.9; /* a bug if browser make z-index was discovered when opacity is set, if still present, we must disable it */ line-height: 18px; color: var(--colortext); font-size: 0.8em; diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php index 2105321f59d..09e10d16f97 100644 --- a/htdocs/theme/eldy/info-box.inc.php +++ b/htdocs/theme/eldy/info-box.inc.php @@ -395,11 +395,13 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) { } .spannature { +/* padding-top: 6px !important; padding-bottom: 6px !important; vertical-align: middle; white-space: nowrap; display: inline-block; +*/ } .nonature-back { @@ -431,7 +433,12 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) { color: #fff; white-space: nowrap; } -.nonature-back, .prospect-back, .customer-back, .vendor-back, .user-back, .member-company-back, .member-individual-back { +.member-individual-company-back { + background-color: #40859d; + color: #fff; + white-space: nowrap; +} +.nonature-back, .prospect-back, .customer-back, .vendor-back, .user-back, .member-company-back, .member-individual-company-back, .member-individual-back { padding: 2px; margin: 2px; border-radius: 5px; diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php index 60bd610ceb8..22e897dae79 100644 --- a/htdocs/theme/md/info-box.inc.php +++ b/htdocs/theme/md/info-box.inc.php @@ -93,22 +93,31 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) { margin: 2px; border-radius: 3px; } -.member-company-back { - padding: 2px; - margin: 2px; - background-color: #e4e4e4; - color: #666; - border-radius: 3px; - white-space: nowrap; -} .member-individual-back { padding: 2px; margin: 2px; - background-color: #e4e4e4; - color: #666; + background-color: #258fa5; + color: #fff; border-radius: 3px; white-space: nowrap; } +.member-company-back { + padding: 2px; + margin: 2px; + background-color: #557b95; + color: #fff; + border-radius: 3px; + white-space: nowrap; +} +.member-individual-company-back { + padding: 2px; + margin: 2px; + background-color: #40859d; + color: #fff; + border-radius: 3px; + white-space: nowrap; +} + .bg-infobox-project{ color: #6c6aa8 !important; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 0c2272a8193..e1b041758f7 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1277,6 +1277,9 @@ textarea.centpercent { .centerimp { text-align: center !important; } +.centeronsmartphone { + text-align: center; +} .centergrid { display: grid; text-align: center; @@ -5428,7 +5431,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) { box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20); } span.boxstatstext { - opacity: 0.5; /* a bug if browser make z-index was discovered when opacity is set, if still present, we must disable it */ + opacity: 0.9; /* a bug if browser make z-index was discovered when opacity is set, if still present, we must disable it */ line-height: 18px; color: #000; font-size: 0.8em;