Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
433ad9d5
Commit
433ad9d5
authored
8 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix responsive
parent
66819a34
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/compta/paiement/avalider.php
+31
-14
31 additions, 14 deletions
htdocs/compta/paiement/avalider.php
htdocs/compta/paiement/card.php
+14
-3
14 additions, 3 deletions
htdocs/compta/paiement/card.php
htdocs/compta/paiement/cheque/card.php
+6
-2
6 additions, 2 deletions
htdocs/compta/paiement/cheque/card.php
with
51 additions
and
19 deletions
htdocs/compta/paiement/avalider.php
+
31
−
14
View file @
433ad9d5
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/paiement/card.php
+
14
−
3
View file @
433ad9d5
...
...
@@ -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>'
;
/*
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/paiement/cheque/card.php
+
6
−
2
View file @
433ad9d5
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment