From 891925874fb90aee3709e191e905fd6c6d7dbe29 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Apr 2018 00:54:08 +0200 Subject: [PATCH 1/2] FIX #8574 --- htdocs/core/boxes/box_supplier_orders.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php index dc20e9b9665..895f411e3d6 100644 --- a/htdocs/core/boxes/box_supplier_orders.php +++ b/htdocs/core/boxes/box_supplier_orders.php @@ -1,5 +1,4 @@ * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2012 Raphaël Doursenaud @@ -83,7 +82,7 @@ class box_supplier_orders extends ModeleBoxes $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " s.code_client, s.code_fournisseur,"; $sql.= " s.logo,"; - $sql.= " c.ref, c.tms, c.rowid, c.date_commande,"; + $sql.= " c.rowid, c.ref, c.tms, c.date_commande,"; $sql.= " c.total_ht,"; $sql.= " c.tva as total_tva,"; $sql.= " c.total_ttc,"; @@ -110,7 +109,7 @@ class box_supplier_orders extends ModeleBoxes $date=$db->jdate($objp->date_commande); $datem=$db->jdate($objp->tms); - $supplierorderstatic->id = $objp->id; + $supplierorderstatic->id = $objp->rowid; $supplierorderstatic->ref = $objp->ref; $thirdpartytmp->id = $objp->socid; From 04aafbc493e1cdc9c6ee31a475e2ee2f2ca3e6e1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Apr 2018 10:01:07 +0200 Subject: [PATCH 2/2] Fix css to restore focus undertext on select2 combo lists --- htdocs/theme/eldy/style.css.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index e7a9250c6cf..9df170b3124 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -4314,6 +4314,10 @@ div.dataTables_length select { /* Select2 */ /* ============================================================================== */ +.select2-container--focus span.select2-selection.select2-selection--single { + border-bottom: 1px solid #666 !important; +} + .blockvmenusearch .select2-container--default .select2-selection--single, .blockvmenubookmarks .select2-container--default .select2-selection--single {