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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
6499c4ff
Commit
6499c4ff
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge pull request #1750 from nicoplh/patch-1
Update impayees.php
parents
a74b65df
2cfc5f10
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/compta/facture/impayees.php
+14
-2
14 additions, 2 deletions
htdocs/compta/facture/impayees.php
with
14 additions
and
2 deletions
htdocs/compta/facture/impayees.php
+
14
−
2
View file @
6499c4ff
...
...
@@ -174,6 +174,7 @@ $(document).ready(function() {
$now
=
dol_now
();
$search_ref
=
GETPOST
(
"search_ref"
);
$search_refcustomer
=
GETPOST
(
'search_refcustomer'
);
$search_societe
=
GETPOST
(
"search_societe"
);
$search_montant_ht
=
GETPOST
(
"search_montant_ht"
);
$search_montant_ttc
=
GETPOST
(
"search_montant_ttc"
);
...
...
@@ -192,7 +193,7 @@ if (! $sortorder) $sortorder="ASC";
$limit
=
$conf
->
liste_limit
;
$sql
=
"SELECT s.nom, s.rowid as socid"
;
$sql
.
=
", f.rowid as facid, f.facnumber, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp"
;
$sql
.
=
", f.rowid as facid, f.facnumber,
f.ref_client,
f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp"
;
$sql
.
=
", f.datef as df, f.date_lim_reglement as datelimite"
;
$sql
.
=
", f.paye as paye, f.fk_statut, f.type"
;
$sql
.
=
", sum(pf.amount) as am"
;
...
...
@@ -218,6 +219,7 @@ if (GETPOST('filtre'))
}
}
if
(
$search_ref
)
$sql
.
=
" AND f.facnumber LIKE '%"
.
$db
->
escape
(
$search_ref
)
.
"%'"
;
if
(
$search_refcustomer
)
$sql
.
=
" AND f.ref_client LIKE '%"
.
$db
->
escape
(
$search_refcustomer
)
.
"%'"
;
if
(
$search_societe
)
$sql
.
=
" AND s.nom LIKE '%"
.
$db
->
escape
(
$search_societe
)
.
"%'"
;
if
(
$search_montant_ht
)
$sql
.
=
" AND f.total = '"
.
$db
->
escape
(
$search_montant_ht
)
.
"'"
;
if
(
$search_montant_ttc
)
$sql
.
=
" AND f.total_ttc = '"
.
$db
->
escape
(
$search_montant_ttc
)
.
"'"
;
...
...
@@ -246,6 +248,7 @@ if ($resql)
$param
.
=
(
!
empty
(
$socid
)
?
"&socid="
.
$socid
:
""
);
$param
.
=
(
!
empty
(
$option
)
?
"&option="
.
$option
:
""
);
if
(
$search_ref
)
$param
.
=
'&search_ref='
.
urlencode
(
$search_ref
);
if
(
$search_refcustomer
)
$param
.
=
'&search_ref='
.
urlencode
(
$search_refcustomer
);
if
(
$search_societe
)
$param
.
=
'&search_societe='
.
urlencode
(
$search_societe
);
if
(
$search_montant_ht
)
$param
.
=
'&search_montant_ht='
.
urlencode
(
$search_montant_ht
);
if
(
$search_montant_ttc
)
$param
.
=
'&search_montant_ttc='
.
urlencode
(
$search_montant_ttc
);
...
...
@@ -274,6 +277,7 @@ if ($resql)
print
'<table class="liste" width="100%">'
;
print
'<tr class="liste_titre">'
;
print_liste_field_titre
(
$langs
->
trans
(
"Ref"
),
$_SERVER
[
"PHP_SELF"
],
"f.facnumber"
,
""
,
$param
,
""
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
'RefCustomer'
),
$_SERVER
[
"PHP_SELF"
],
'f.ref_client'
,
''
,
$param
,
''
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
"Date"
),
$_SERVER
[
"PHP_SELF"
],
"f.datef"
,
""
,
$param
,
'align="center"'
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
"DateDue"
),
$_SERVER
[
"PHP_SELF"
],
"f.date_lim_reglement"
,
""
,
$param
,
'align="center"'
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
"Company"
),
$_SERVER
[
"PHP_SELF"
],
"s.nom"
,
""
,
$param
,
""
,
$sortfield
,
$sortorder
);
...
...
@@ -291,6 +295,9 @@ if ($resql)
// Ref
print
'<td class="liste_titre">'
;
print
'<input class="flat" size="10" type="text" name="search_ref" value="'
.
$search_ref
.
'"></td>'
;
print
'<td class="liste_titre">'
;
print
'<input class="flat" size="6" type="text" name="search_refcustomer" value="'
.
$search_refcustomer
.
'">'
;
print
'</td>'
;
print
'<td class="liste_titre"> </td>'
;
print
'<td class="liste_titre"> </td>'
;
print
'<td class="liste_titre" align="left"><input class="flat" type="text" size="10" name="search_societe" value="'
.
dol_escape_htmltag
(
$search_societe
)
.
'"></td>'
;
...
...
@@ -356,6 +363,11 @@ if ($resql)
print
"</td>
\n
"
;
// Customer ref
print
'<td class="nowrap">'
;
print
$objp
->
ref_client
;
print
'</td>'
;
print
'<td class="nowrap" align="center">'
.
dol_print_date
(
$db
->
jdate
(
$objp
->
df
),
'day'
)
.
'</td>'
.
"
\n
"
;
print
'<td class="nowrap" align="center">'
.
dol_print_date
(
$db
->
jdate
(
$objp
->
datelimite
),
'day'
)
.
'</td>'
.
"
\n
"
;
...
...
@@ -402,7 +414,7 @@ if ($resql)
}
print
'<tr class="liste_total">'
;
print
'<td colspan="
4
" align="left">'
.
$langs
->
trans
(
"Total"
)
.
'</td>'
;
print
'<td colspan="
5
" align="left">'
.
$langs
->
trans
(
"Total"
)
.
'</td>'
;
print
'<td align="right"><b>'
.
price
(
$total_ht
)
.
'</b></td>'
;
print
'<td align="right"><b>'
.
price
(
$total_tva
)
.
'</b></td>'
;
print
'<td align="right"><b>'
.
price
(
$total_ttc
)
.
'</b></td>'
;
...
...
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