lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-04-13 10:01:45 +02:00
commit 768b9d3d1e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/boxes/box_supplier_orders.php
View File

@ -1,5 +1,4 @@
<?php
/* Copyright (C) 2004-2006 Destailleur Laurent <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
@ -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;

4
htdocs/theme/eldy/style.css.php
View File

@ -4502,6 +4502,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
{