From 44b5b4fde951b7475c6552c23a43daf6d86d293d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 27 Apr 2023 12:53:50 +0200 Subject: [PATCH] Fix look and feel v17 --- htdocs/compta/paiement/cheque/index.php | 6 ++++++ htdocs/compta/paymentbybanktransfer/index.php | 2 +- htdocs/compta/prelevement/create.php | 20 +++++-------------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 394de095104..33c4d37c45d 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -127,6 +127,8 @@ if ($resql) { print ''.$langs->trans("Status").''; print "\n"; + $num = $db->num_rows($resql); + while ($objp = $db->fetch_object($resql)) { $checkdepositstatic->id = $objp->rowid; $checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid); @@ -152,6 +154,10 @@ if ($resql) { print ''; } + if (empty($num)) { + print ''.$langs->trans("None").''; + } + print ""; print ''; diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php index adab830546a..ab26fe4c498 100644 --- a/htdocs/compta/paymentbybanktransfer/index.php +++ b/htdocs/compta/paymentbybanktransfer/index.php @@ -134,7 +134,7 @@ if ($resql) { print '
'; print ''; print ''; - print ''; + print ''; if ($num) { while ($i < $num && $i < 20) { $obj = $db->fetch_object($resql); diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 7c91bfcca8e..deb48fd98e9 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -183,8 +183,6 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr } $massactionbutton = $form->selectMassAction('', $arrayofmassactions); -llxHeader('', $langs->trans("NewStandingOrder")); - if (prelevement_check_config($type) < 0) { $langs->load("errors"); $modulenametoshow = "Withdraw"; @@ -195,21 +193,13 @@ if (prelevement_check_config($type) < 0) { } -/*$h=0; -$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/create.php'; -$head[$h][1] = $langs->trans("NewStandingOrder"); -$head[$h][2] = 'payment'; -$hselected = 'payment'; -$h++; - -print dol_get_fiche_head($head, $hselected, $langs->trans("StandingOrders"), 0, 'payment'); -*/ - $title = $langs->trans("NewStandingOrder"); if ($type == 'bank-transfer') { $title = $langs->trans("NewPaymentByBankTransfer"); } +llxHeader('', $title); + print load_fiche_titre($title); print dol_get_fiche_head(); @@ -221,12 +211,12 @@ if ($nb < 0) { } print '
'.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.')
'.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.')
'; -$title = $langs->trans("NbOfInvoiceToWithdraw"); +$labeltoshow = $langs->trans("NbOfInvoiceToWithdraw"); if ($type == 'bank-transfer') { - $title = $langs->trans("NbOfInvoiceToPayByBankTransfer"); + $labeltoshow = $langs->trans("NbOfInvoiceToPayByBankTransfer"); } -print ''; +print ''; print '';
'.$title.'
'.$labeltoshow.''; print $nb; print '