Look and feel v24 - Open margin en account summary of thirdparty in

popup
This commit is contained in:
Laurent Destailleur 2026-03-14 17:56:40 +01:00
parent 54c5141d16
commit 561cbbe958
11 changed files with 254 additions and 128 deletions

View file

@ -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 = '<span class="member-individual-back paddingleftimp paddingrightimp" title="'.$langs->trans("Physical").'">'.$labeltoshow.'</span>';
}
if ($morphy === 'mor') {
if ($addbadge == 2) {
$labeltoshow = dol_strtoupper(dolGetFirstLetters($labeltoshowm));
if ($labeltoshow == dol_strtoupper(dolGetFirstLetters($labeltoshow))) {
$labeltoshow = dol_strtoupper(dolGetFirstLetters($labeltoshow, 2));
}
}
$s = '<span class="member-company-back paddingleftimp paddingrightimp" title="'.$langs->trans("Moral").'">'.$labeltoshow.'</span>';
}
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 = '<span class="member-individual-company-back paddingleftimp paddingrightimp" title="'.$langs->trans("MorAndPhy").'">'.$labeltoshow.'</span>';
}
}
return $s;
}
/**
* getTooltipContentArray
*
* @param array<string,mixed> $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}

View file

@ -473,13 +473,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
}
if (!empty($arrayfields['t.morphy']['checked'])) {
print '<td class="center">';
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 '</td>';
}
if (!empty($arrayfields['t.duration']['checked'])) {
@ -680,7 +674,9 @@ if ($rowid > 0) {
print '<table class="tableforfield border centpercent">';
// Morphy
print '<tr><td>'.$langs->trans("MembersNature").'</td><td class="valeur" >'.$object->getmorphylib($object->morphy).'</td>';
print '<tr><td>'.$langs->trans("MembersNature").'</td><td class="valeur" >';
print $object->getmorphylib($object->morphy, 1);
print '</td>';
print '</tr>';
print '<tr><td>'.$form->textwithpicto($langs->trans("SubscriptionRequired"), $langs->trans("SubscriptionRequiredDesc")).'</td><td>';

View file

@ -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 = '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
$boxstattmp .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
$boxstattmp .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
$boxstattmp .= '</div>';
if ($link) {
$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
}
$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
$boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
$boxstat .= '</div>';
if ($link) {
$boxstat .= '</a>';
$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 = '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
$boxstattmp .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
$boxstattmp .= '<span class="boxstatsindicator'.($outstandingOpenedLate > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
$boxstattmp .= '</div>';
if ($link) {
$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
}
$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
$boxstat .= '<span class="boxstatsindicator'.($outstandingOpenedLate > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
$boxstat .= '</div>';
if ($link) {
$boxstat .= '</a>';
$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 = '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
$boxstattmp .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
$boxstattmp .= '<span class="boxstatsindicator">'.price($marginTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
$boxstattmp .= '</div>';
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
*/

View file

@ -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

View file

@ -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/', '&nbsp;', $output);
$output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' <span class="small">'.$cursymbolafter.'</span>' : '');
$output = preg_replace('/\'/', '&#039;', $output);
} else {
$output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' '.$cursymbolafter : '');
}
return $output;

View file

@ -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__'
);

View file

@ -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 = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
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 '<div class="fichecenter">';
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border tableforfield centpercent">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border tableforfield centpercent">';
// Type Prospect/Customer/Supplier
print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
print $object->getTypeUrl(1);
print '</td></tr>';
// Type Prospect/Customer/Supplier
print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
print $object->getTypeUrl(1);
print '</td></tr>';
if ($object->client) {
print '<tr><td class="titlefield">';
print $langs->trans('CustomerCode').'</td><td colspan="3">';
print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
$tmpcheck = $object->check_codeclient();
if ($tmpcheck != 0 && $tmpcheck != -5) {
print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
if ($object->client) {
print '<tr><td class="titlefield">';
print $langs->trans('CustomerCode').'</td><td colspan="3">';
print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
$tmpcheck = $object->check_codeclient();
if ($tmpcheck != 0 && $tmpcheck != -5) {
print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
}
print '</td></tr>';
}
print '</td></tr>';
}
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 '<tr><td class="titlefield">';
print $langs->trans('SupplierCode').'</td><td colspan="3">';
print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
$tmpcheck = $object->check_codefournisseur();
if ($tmpcheck != 0 && $tmpcheck != -5) {
print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
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 '<tr><td class="titlefield">';
print $langs->trans('SupplierCode').'</td><td colspan="3">';
print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
$tmpcheck = $object->check_codefournisseur();
if ($tmpcheck != 0 && $tmpcheck != -5) {
print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
}
print '</td></tr>';
}
// Total Margin
print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
print '<span id="totalMargin" class="amount"></span>'; // set by jquery (see below)
print '</td></tr>';
// Margin Rate
if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
print '<span id="marginRate"></span>'; // set by jquery (see below)
print '</td></tr>';
}
// Mark Rate
if (getDolGlobalString('DISPLAY_MARK_RATES')) {
print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
print '<span id="markRate"></span>'; // set by jquery (see below)
print '</td></tr>';
}
print "</table>";
print '</div>';
print '<div class="clearboth"></div>';
print dol_get_fiche_end();
print '<br>';
}
// Total Margin
print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
print '<span id="totalMargin" class="amount"></span>'; // set by jquery (see below)
print '</td></tr>';
// Margin Rate
if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
print '<span id="marginRate"></span>'; // set by jquery (see below)
print '</td></tr>';
}
// Mark Rate
if (getDolGlobalString('DISPLAY_MARK_RATES')) {
print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
print '<span id="markRate"></span>'; // set by jquery (see below)
print '</td></tr>';
}
print "</table>";
print '</div>';
print '<div class="clearboth"></div>';
print dol_get_fiche_end();
print '<br>';
// 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 '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?socid='.$socid.'" name="search_form">'."\n";
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="dol_openinpopup" value="'.$dol_openinpopup.'">';
if (!empty($sortfield)) {
print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
}
@ -421,6 +429,7 @@ if ($socid > 0) {
print '<td>';
$invoicestatic->id = $objp->facid;
$invoicestatic->ref = $objp->ref;
$invoicestatic->type = $objp->type;
print $invoicestatic->getNomUrl(1);
print "</td>\n";
print "<td class=\"center\">";
@ -463,7 +472,7 @@ if ($socid > 0) {
print '<tr class="liste_total">';
$colspan = 2;
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
$colspan++; // add action column
print '<td></td>';
}
print '<td colspan="'.$colspan.'">'.$langs->trans('TotalMargin')."</td>";
print "<td class=\"right\">".price(price2num($cumul_vente, 'MT'))."</td>\n";
@ -478,8 +487,7 @@ if ($socid > 0) {
print '<td class="right">&nbsp;</td>';
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
// add action column
print '<td class="center">';
print '</td>';
print '<td></td>';
}
print "</tr>\n";
} else {

View file

@ -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;

View file

@ -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;

View file

@ -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{
<?php echo $prefix; ?>color: #6c6aa8 !important;

View file

@ -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;