From 065ef0b2af9450bc7b1668fd15d35eef6ff4d654 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 30 Aug 2024 16:32:16 +0200 Subject: [PATCH] Fix shadow must be same for all buttons. if we chang for common we must change for fordbidden, grayed and others. --- htdocs/product/stock/class/mouvementstock.class.php | 5 +++-- htdocs/theme/eldy/btn.inc.php | 4 ++-- htdocs/theme/eldy/info-box.inc.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 9bc68532a3c..e60e79a192a 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -408,7 +408,7 @@ class MouvementStock extends CommonObject } } else { // If not found, we add record $productlot = new Productlot($this->db); - $productlot->origin = !empty($this->origin_type) ? $this->origin_type : ''; + $productlot->origin_type = !empty($this->origin_type) ? $this->origin_type : ''; $productlot->origin_id = !empty($this->origin_id) ? $this->origin_id : 0; $productlot->entity = $conf->entity; $productlot->fk_product = $fk_product; @@ -431,7 +431,8 @@ class MouvementStock extends CommonObject } } - // Check if stock is enough when qty is < 0 + // Check if stock is enough when qty is < 0. + // THIS MUST BE DONE AT END OF MOVEMENTS // Note that qty should be > 0 with type 0 or 3, < 0 with type 1 or 2. if ($movestock && $qty < 0 && !getDolGlobalInt('STOCK_ALLOW_NEGATIVE_TRANSFER')) { if (isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) { diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php index 6f412d7159c..7b41cfa6b2c 100644 --- a/htdocs/theme/eldy/btn.inc.php +++ b/htdocs/theme/eldy/btn.inc.php @@ -145,8 +145,8 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover .butAction:hover, .dropdown-holder.open > .butAction { /** TODO use css var with hsl from --colortextlink to allow create darken or lighten color */ - -webkit-box-shadow: 5px 5px 0px rgba(0,0,0,0.1), inset 0px 0px 200px rgba(0,0,0,0.3); /* fix hover feedback : use "inset" background to easily darken background */ - box-shadow: 5px 5px 0px rgba(0,0,0,0.1), inset 0px 0px 200px rgba(0,0,0,0.3); /* fix hover feedback : use "inset" background to easily darken background */ + -webkit-box-shadow: 0px 0px 6px rgba(50,50,50,0.4), inset 0px 0px 200px rgba(0,0,0,0.3); /* fix hover feedback : use "inset" background to easily darken background */ + box-shadow: 0px 0px 6px rgba(50,50,50,0.4), inset 0px 0px 200px rgba(0,0,0,0.3); /* fix hover feedback : use "inset" background to easily darken background */ } .butActionNew:hover { text-decoration: underline; diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php index 4258e889289..033b84099a7 100644 --- a/htdocs/theme/eldy/info-box.inc.php +++ b/htdocs/theme/eldy/info-box.inc.php @@ -23,7 +23,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) { min-height: 94px; /* must be same height than info-box-icon */ background: var(--colorbacklineimpair2); width: 100%; - box-shadow: 1px 1px 15px rgba(192, 192, 192, 0.2); + box-shadow: 1px 1px 12px rgba(192, 192, 192, 0.2); border-radius: 2px; border: 1px solid #e9e9e9; margin-bottom: 15px;