From 433ad9d59d56a1bd9ca9b8232910b98f38c76c5b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 22 Jan 2017 13:27:17 +0100
Subject: [PATCH] Fix responsive
---
htdocs/compta/paiement/avalider.php | 45 ++++++++++++++++++--------
htdocs/compta/paiement/card.php | 17 ++++++++--
htdocs/compta/paiement/cheque/card.php | 8 +++--
3 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php
index 02201093830..a244a1feb60 100644
--- a/htdocs/compta/paiement/avalider.php
+++ b/htdocs/compta/paiement/avalider.php
@@ -38,22 +38,29 @@ if ($user->societe_id > 0)
}
-/*
- * Affichage
- */
-
-llxHeader();
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="p.rowid";
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+
+
+/*
+ * Actions
+ */
+
+
+
+/*
+ * View
+ */
+
+llxHeader();
$sql = "SELECT p.rowid, p.datep as dp, p.amount, p.statut";
$sql.=", c.libelle as paiement_type, p.num_paiement";
@@ -70,10 +77,20 @@ if ($socid)
$sql.= " AND f.fk_soc = ".$socid;
}
$sql.= " AND p.statut = 0";
-$sql.= " ORDER BY $sortfield $sortorder";
-$sql.= $db->plimit($limit+1, $offset);
-$resql = $db->query($sql);
+$sql.= $db->order($sortfield,$sortorder);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+ $result = $db->query($sql);
+ $nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->plimit($limit + 1,$offset);
+
+$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 07b8d95ddbc..7de97eba2e0 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -199,11 +199,12 @@ if ($action == 'valide')
}
-print '<table class="border" width="100%">';
$linkback = '<a href="' . DOL_URL_ROOT . '/compta/paiement/list.php">' . $langs->trans("BackToList") . '</a>';
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
// Ref
print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td><td colspan="3">';
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
@@ -280,6 +281,8 @@ if (! empty($conf->banque->enabled))
print '</table>';
+dol_fiche_end();
+
/*
* List of invoices
@@ -298,7 +301,14 @@ if ($resql)
$i = 0;
$total = 0;
- print '<br><table class="noborder" width="100%">';
+
+ $moreforfilter='';
+
+ print '<br>';
+
+ print '<div class="div-table-responsive">';
+ print '<table class="noborder" width="100%">';
+
print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Bill').'</td>';
print '<td>'.$langs->trans('Company').'</td>';
@@ -363,6 +373,8 @@ if ($resql)
$var=!$var;
print "</table>\n";
+ print '</div>';
+
$db->free($resql);
}
else
@@ -370,7 +382,6 @@ else
dol_print_error($db);
}
-print '</div>';
/*
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 94686162687..5b42fdb6825 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -471,7 +471,10 @@ if ($action == 'new')
print '<input type="hidden" name="action" value="create">';
print '<input type="hidden" name="accountid" value="'.$bid.'">';
- print '<table class="noborder" width="100%">';
+ $moreforfilter='';
+ print '<div class="div-table-responsive-no-min">';
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
print '<tr class="liste_titre">';
print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived").' ';
print "</td>\n";
@@ -539,7 +542,8 @@ if ($action == 'new')
$i++;
}
print "</table>";
-
+ print '</div>';
+
print '<div class="tabsAction">';
if ($user->rights->banque->cheque)
{
--
GitLab