diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index e5e42042015..36910458aa3 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -375,12 +375,6 @@ if ($object->id > 0) if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { $langs->load("products"); - print ''; - print ''; - print ''; - //Query from product/liste.php $sql = 'SELECT p.rowid, p.ref, p.label, p.fk_product_type, p.entity,'; $sql.= ' pfp.tms, pfp.ref_fourn as supplier_ref, pfp.price, pfp.quantity, pfp.unitprice'; @@ -394,16 +388,21 @@ if ($object->id > 0) $query = $db->query($sql); if (! $query) dol_print_error($db); + $num = $db->num_rows($query); + + print '
'.$langs->trans("ProductsAndServices").''; - print ''.$langs->trans("AllProductServicePrices").' '.$object->nbOfProductRefs().''; - print '
'; + print ''; + print ''; + $return = array(); - - if ($db->num_rows($query)) { - + if ($num > 0) + { $productstatic = new Product($db); - while ($objp = $db->fetch_object($query)) { - - - + while ($objp = $db->fetch_object($query)) + { $productstatic->id = $objp->rowid; $productstatic->ref = $objp->ref; $productstatic->label = $objp->label; @@ -467,7 +466,7 @@ if ($object->id > 0) print ''; print '
'.$langs->trans("ProductsAndServices").''; + print ''.$langs->trans("AllProductServicePrices").' '.$object->nbOfProductRefs().''; + print '
'; - print ''; + print '
'.$langs->trans("LastSupplierProposals",($num<$MAXLIST?"":$MAXLIST)).'
'; print ''; print ''; print '
'.$langs->trans("LastSupplierProposals",($num<$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllPriceRequests").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 1136e1c1fc4..b82fd096cfe 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2607,7 +2607,7 @@ form.tagtr:last-of-type div.tagtd, tr.pair:last-of-type td, tr.impair:last-of-ty tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td { border-bottom: 0px !important; } -td.nobottom, td.nobottom { +tr.nobottom td, tr.nobottom , td.nobottom { border-bottom: 0px !important; } div.liste_titre .tagtd { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 978b093fc9d..fb774e8793b 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2684,7 +2684,7 @@ tr.pair:last-of-type td, tr.impair:last-of-type td { tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td { border-bottom: 0px !important; } -td.nobottom, td.nobottom { +tr.nobottom td, tr.nobottom , td.nobottom { border-bottom: 0px !important; } div.liste_titre .tagtd {