From 8ebc157316a8e93781bf2aefa4fcef0c5ac4eddf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 24 Feb 2020 06:55:08 +0100 Subject: [PATCH] Test color magenta for titles --- htdocs/core/boxes/box_boms.php | 6 +++++- htdocs/core/boxes/box_services_contracts.php | 5 ++++- htdocs/theme/eldy/global.inc.php | 2 +- htdocs/theme/eldy/theme_vars.inc.php | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php index 8f27ff739e0..44102f0aab1 100644 --- a/htdocs/core/boxes/box_boms.php +++ b/htdocs/core/boxes/box_boms.php @@ -86,7 +86,7 @@ class box_boms extends ModeleBoxes if ($user->rights->bom->read) { - $sql = "SELECT p.ref as product_ref"; + $sql = "SELECT p.ref as product_ref, p.tobuy, p.tosell"; $sql.= ", c.rowid"; $sql.= ", c.date_creation"; $sql.= ", c.tms"; @@ -109,11 +109,15 @@ class box_boms extends ModeleBoxes while ($line < $num) { $objp = $this->db->fetch_object($result); $datem=$this->db->jdate($objp->tms); + $bomstatic->id = $objp->rowid; $bomstatic->ref = $objp->ref; $bomstatic->id = $objp->socid; $bomstatic->status = $objp->status; + $productstatic->ref = $objp->product_ref; + $productstatic->status = $objp->tobuy; + $productstatic->status_buy = $objp->tosell; $this->info_box_contents[$line][] = array( 'td' => 'class="nowraponall"', diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php index dbb26408b6f..5b40fc61436 100644 --- a/htdocs/core/boxes/box_services_contracts.php +++ b/htdocs/core/boxes/box_services_contracts.php @@ -91,7 +91,7 @@ class box_services_contracts extends ModeleBoxes $sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,"; $sql.= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,"; $sql.= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut, cd.product_type as type,"; - $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity"; + $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity, p.tobuy, p.tosell"; $sql.= " FROM (".MAIN_DB_PREFIX."societe as s"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat"; @@ -165,6 +165,9 @@ class box_services_contracts extends ModeleBoxes $productstatic->ref=$objp->product_ref; $productstatic->entity=$objp->pentity; $productstatic->label=$objp->plabel; + $productstatic->status = $objp->tosell; + $productstatic->status_buy = $objp->tobuy; + $text = $productstatic->getNomUrl(1, '', 20); if ($objp->plabel) { diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index c05078e2aa1..324f3ccb8bb 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1520,7 +1520,7 @@ div.nopadding { td.nobordernopadding.widthpictotitle.opacityhigh.valignmiddle.col-picto { color: var(--colortexttitlenotab); - opacity: 0.5; + opacity: 0.75; } .pictotitle { margin-: 8px; diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php index f4e207143be..b5f8d110125 100644 --- a/htdocs/theme/eldy/theme_vars.inc.php +++ b/htdocs/theme/eldy/theme_vars.inc.php @@ -67,7 +67,7 @@ $colorbacklinepairhover = '230,237,244'; // line hover $colorbacklinepairchecked = '230,237,244'; // line checked $colorbacklinebreak = '233,228,230'; // line break $colorbackbody = '255,255,255'; -$colortexttitlenotab = '0,113,121'; // 140,80,10 or 10,140,80 +$colortexttitlenotab = '90,50,120'; // 150,90,121 140,80,10 or 10,140,80 #875a7b $colortexttitle = '0,0,0'; $colortext = '0,0,0'; $colortextlink = '10, 20, 100';