From d78f3923eebac4850f890182194a9e36b8d03fee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 12 Apr 2017 12:13:38 +0200 Subject: [PATCH] Support of preview for pdf with several pages --- htdocs/compta/facture/card.php | 12 +++++------- htdocs/core/lib/functions.lib.php | 11 ++++------- htdocs/core/tpl/objectline_create.tpl.php | 4 ++-- htdocs/theme/eldy/style.css.php | 6 ++++++ 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 905bd8caf31..6e8c3b6d895 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3692,8 +3692,6 @@ else if ($id > 0 || ! empty($ref)) print ' '; print ''; - $var = true; - // Payments already done (from payment on this invoice) $sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,'; $sql .= ' c.code as payment_code, c.libelle as payment_label,'; @@ -3715,8 +3713,7 @@ else if ($id > 0 || ! empty($ref)) if ($num > 0) { while ($i < $num) { $objp = $db->fetch_object($result); - $var = ! $var; - print ''; + print ''; $paymentstatic->id = $objp->rowid; $paymentstatic->datepaye = $db->jdate($objp->dp); $paymentstatic->ref = $objp->ref; @@ -3741,9 +3738,10 @@ else if ($id > 0 || ! empty($ref)) print ''; $i ++; } - } else { - print '' . $langs->trans("None") . ''; - } + } + /*else { + print '' . $langs->trans("None") . ''; + }*/ // } $db->free($result); } else { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index bb27acd936b..4cec1ce7de2 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1090,13 +1090,10 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r // Si fichier png PDF de plus d'1 page trouve elseif (file_exists($fileimagebis)) { - $preview = preg_replace('/\.png/','',$relativepath) . "-0.png"; - if (file_exists($dir_output.$preview)) - { - $phototoshow = '
'; - $phototoshow.= '

'; - $phototoshow.= '

'; - } + $preview = preg_replace('/\.png/','',$relativepathimage) . "-0.png"; + $phototoshow = '
'; + $phototoshow.= '

'; + $phototoshow.= '

'; } } } diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 178a3629d23..d02f820d0d5 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -56,7 +56,7 @@ if (in_array($object->element,array('propal', 'supplier_proposal','facture','fac $nolinesbefore=(count($this->lines) == 0 || $forcetoshowtitlelines); if ($nolinesbefore) { ?> - + global->MAIN_VIEW_LINE_NUMBER)) { ?> @@ -114,7 +114,7 @@ if ($nolinesbefore) { - + global->MAIN_VIEW_LINE_NUMBER)) { $coldisplay=2; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b50e193547b..0bbfdd82514 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2281,6 +2281,12 @@ table.paddingtopbottomonly tr td { tr.liste_titre_filter td.liste_titre { border-bottom: 1px solid #ddd; } +.liste_titre_create td, .liste_titre_create th, .liste_titre_create .tagtd +{ + /*border-top-width: 1px; + border-top-color: rgb(); + border-top-style: solid;*/ +} .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd { border-top-width: 2px;