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

Fix responsive

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-22 13:27:17 +01:00
parent 66819a34fa
commit 433ad9d59d
3 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
htdocs/compta/paiement/avalider.php
View File

@ -38,22 +38,29 @@ if ($user->societe_id > 0)
} }
/* $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
* Affichage $sortfield = GETPOST('sortfield','alpha');
*/ $sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
llxHeader();
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
if ($page == -1) { $page = 0; } if ($page == -1) { $page = 0; }
$offset = $conf->liste_limit * $page; $offset = $limit * $page;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
if (! $sortorder) $sortorder="DESC"; if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="p.rowid"; 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 = "SELECT p.rowid, p.datep as dp, p.amount, p.statut";
$sql.=", c.libelle as paiement_type, p.num_paiement"; $sql.=", c.libelle as paiement_type, p.num_paiement";
@ -70,10 +77,20 @@ if ($socid)
$sql.= " AND f.fk_soc = ".$socid; $sql.= " AND f.fk_soc = ".$socid;
} }
$sql.= " AND p.statut = 0"; $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) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);

17
htdocs/compta/paiement/card.php
View File

@ -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>'; $linkback = '<a href="' . DOL_URL_ROOT . '/compta/paiement/list.php">' . $langs->trans("BackToList") . '</a>';
print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
// Ref // Ref
print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td><td colspan="3">'; print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td><td colspan="3">';
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', ''); print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
@ -280,6 +281,8 @@ if (! empty($conf->banque->enabled))
print '</table>'; print '</table>';
dol_fiche_end();
/* /*
* List of invoices * List of invoices
@ -298,7 +301,14 @@ if ($resql)
$i = 0; $i = 0;
$total = 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 '<tr class="liste_titre">';
print '<td>'.$langs->trans('Bill').'</td>'; print '<td>'.$langs->trans('Bill').'</td>';
print '<td>'.$langs->trans('Company').'</td>'; print '<td>'.$langs->trans('Company').'</td>';
@ -363,6 +373,8 @@ if ($resql)
$var=!$var; $var=!$var;
print "</table>\n"; print "</table>\n";
print '</div>';
$db->free($resql); $db->free($resql);
} }
else else
@ -370,7 +382,6 @@ else
dol_print_error($db); dol_print_error($db);
} }
print '</div>';
/* /*

8
htdocs/compta/paiement/cheque/card.php
View File

@ -471,7 +471,10 @@ if ($action == 'new')
print '<input type="hidden" name="action" value="create">'; print '<input type="hidden" name="action" value="create">';
print '<input type="hidden" name="accountid" value="'.$bid.'">'; 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 '<tr class="liste_titre">';
print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived").' '; print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived").' ';
print "</td>\n"; print "</td>\n";
@ -539,7 +542,8 @@ if ($action == 'new')
$i++; $i++;
} }
print "</table>"; print "</table>";
print '</div>';
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($user->rights->banque->cheque) if ($user->rights->banque->cheque)
{ {