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
d0cc56d6
Commit
d0cc56d6
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Showing price without tax also.
parent
74dafbe0
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/fourn/commande/list.php
+20
-11
20 additions, 11 deletions
htdocs/fourn/commande/list.php
with
20 additions
and
11 deletions
htdocs/fourn/commande/list.php
+
20
−
11
View file @
d0cc56d6
...
...
@@ -42,6 +42,7 @@ $search_ref=GETPOST('search_ref');
$search_refsupp
=
GETPOST
(
'search_refsupp'
);
$search_company
=
GETPOST
(
'search_company'
);
$search_user
=
GETPOST
(
'search_user'
);
$search_ht
=
GETPOST
(
'search_ht'
);
$search_ttc
=
GETPOST
(
'search_ttc'
);
$sall
=
GETPOST
(
'search_all'
);
$search_status
=
GETPOST
(
'search_status'
,
'int'
);
...
...
@@ -65,12 +66,14 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
$search_refsupp
=
''
;
$search_company
=
''
;
$search_user
=
''
;
$search_ht
=
''
;
$search_ttc
=
''
;
$search_status
=
''
;
}
if
(
$search_status
==
''
)
$search_status
=-
1
;
/*
* View
*/
...
...
@@ -90,17 +93,14 @@ if ($socid > 0)
llxHeader
(
''
,
$title
);
if
(
$sortorder
==
""
)
$sortorder
=
"DESC"
;
if
(
$sortfield
==
""
)
$sortfield
=
"cf.date_creation"
;
$offset
=
$conf
->
liste_limit
*
$page
;
/*
* Mode Liste
*/
$sql
=
"SELECT s.rowid as socid, s.nom as name, cf.date_commande as dc,"
;
$sql
.
=
" cf.rowid,cf.ref, cf.ref_supplier, cf.fk_statut, cf.total_ttc, cf.fk_user_author,cf.date_livraison,"
;
$sql
.
=
" cf.rowid,cf.ref, cf.ref_supplier, cf.fk_statut, cf.total_ttc,
cf.total_ht,
cf.fk_user_author,cf.date_livraison,"
;
$sql
.
=
" p.rowid as project_id, p.ref as project_ref,"
;
$sql
.
=
" u.login"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"societe as s,"
;
...
...
@@ -123,6 +123,10 @@ if ($search_user)
{
$sql
.
=
" AND u.login LIKE '%"
.
$db
->
escape
(
$search_user
)
.
"%'"
;
}
if
(
$search_ht
)
{
$sql
.
=
" AND cf.total_ht = '"
.
$db
->
escape
(
price2num
(
$search_ht
))
.
"'"
;
}
if
(
$search_ttc
)
{
$sql
.
=
" AND cf.total_ttc = '"
.
$db
->
escape
(
price2num
(
$search_ttc
))
.
"'"
;
...
...
@@ -184,7 +188,8 @@ if ($resql)
print_liste_field_titre
(
$langs
->
trans
(
"Thirdparty"
),
$_SERVER
[
"PHP_SELF"
],
"s.nom"
,
""
,
$param
,
''
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$conf
->
global
->
PROJECT_SHOW_REF_INTO_LISTS
))
print_liste_field_titre
(
$langs
->
trans
(
"Project"
),
$_SERVER
[
"PHP_SELF"
],
"p.ref"
,
""
,
$param
,
''
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
"Author"
),
$_SERVER
[
"PHP_SELF"
],
"u.login"
,
""
,
$param
,
''
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
"AmountTTC"
),
$_SERVER
[
"PHP_SELF"
],
"total_ttc"
,
""
,
$param
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
"AmountHT"
),
$_SERVER
[
"PHP_SELF"
],
"cf.total_ht"
,
""
,
$param
,
'align="right"'
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
"AmountTTC"
),
$_SERVER
[
"PHP_SELF"
],
"cf.total_ttc"
,
""
,
$param
,
'align="right"'
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
"OrderDate"
),
$_SERVER
[
"PHP_SELF"
],
"dc"
,
""
,
$param
,
'align="center"'
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
'DateDeliveryPlanned'
),
$_SERVER
[
"PHP_SELF"
],
'cf.date_livraison'
,
''
,
$param
,
'align="right"'
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
"Status"
),
$_SERVER
[
"PHP_SELF"
],
"cf.fk_statut"
,
""
,
$param
,
'align="right"'
,
$sortfield
,
$sortorder
);
...
...
@@ -194,15 +199,16 @@ if ($resql)
print
'<tr class="liste_titre">'
;
print
'<td class="liste_titre"><input type="text" class="flat" name="search_ref" value="'
.
$search_ref
.
'"></td>'
;
if
(
empty
(
$conf
->
global
->
SUPPLIER_ORDER_HIDE_REF_SUPPLIER
))
print
'<td class="liste_titre"><input type="text" class="flat" name="search_refsupp" value="'
.
$search_refsupp
.
'"></td>'
;
if
(
empty
(
$conf
->
global
->
SUPPLIER_ORDER_HIDE_REF_SUPPLIER
))
print
'<td class="liste_titre"><input type="text" class="flat"
size="8"
name="search_refsupp" value="'
.
$search_refsupp
.
'"></td>'
;
print
'<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'
.
$search_company
.
'"></td>'
;
if
(
!
empty
(
$conf
->
global
->
PROJECT_SHOW_REF_INTO_LISTS
))
{
print
'<td class="liste_titre">'
;
print
'</td>'
;
}
print
'<td class="liste_titre"><input type="text" class="flat" name="search_user" value="'
.
$search_user
.
'"></td>'
;
print
'<td class="liste_titre"><input type="text" class="flat" name="search_ttc" value="'
.
$search_ttc
.
'"></td>'
;
print
'<td class="liste_titre"><input type="text" size="6" class="flat" name="search_user" value="'
.
$search_user
.
'"></td>'
;
print
'<td class="liste_titre" align="right"><input type="text" size="4" class="flat" name="search_ht" value="'
.
$search_ht
.
'"></td>'
;
print
'<td class="liste_titre" align="right"><input type="text" size="4" class="flat" name="search_ttc" value="'
.
$search_ttc
.
'"></td>'
;
print
'<td class="liste_titre"> </td>'
;
print
'<td class="liste_titre"> </td>'
;
print
'<td class="liste_titre" align="right">'
;
...
...
@@ -260,7 +266,10 @@ if ($resql)
else
print
" "
;
print
"</td>"
;
// Amount
// Amount net
print
'<td align="right" width="100">'
.
price
(
$obj
->
total_ht
)
.
"</td>"
;
// Amount with tax
print
'<td align="right" width="100">'
.
price
(
$obj
->
total_ttc
)
.
"</td>"
;
// Date
...
...
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