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
9a056ab4
Commit
9a056ab4
authored
10 years ago
by
Philippe Grand
Browse files
Options
Downloads
Patches
Plain Diff
anglicizing
parent
9dd499b1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/product/index.php
+7
-7
7 additions, 7 deletions
htdocs/product/index.php
with
7 additions
and
7 deletions
htdocs/product/index.php
+
7
−
7
View file @
9a056ab4
...
...
@@ -20,7 +20,7 @@
/**
* \file htdocs/product/index.php
* \ingroup product
* \brief
Page accueil des
produ
i
ts
et
services
* \brief
Homepage
produ
c
ts
and
services
*/
require
'../main.inc.php'
;
...
...
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$type
=
isset
(
$_GET
[
"type"
])
?
$_GET
[
"type"
]
:
(
isset
(
$_POST
[
"type"
])
?
$_POST
[
"type"
]
:
''
);
if
(
$type
==
''
&&
!
$user
->
rights
->
produit
->
lire
)
$type
=
'1'
;
// Force global page on service page only
if
(
$type
==
''
&&
!
$user
->
rights
->
service
->
lire
)
$type
=
'0'
;
// Force global page on pr
p
duct page only
if
(
$type
==
''
&&
!
$user
->
rights
->
service
->
lire
)
$type
=
'0'
;
// Force global page on pr
o
duct page only
// Security check
if
(
$type
==
'0'
)
$result
=
restrictedArea
(
$user
,
'produit'
);
...
...
@@ -74,7 +74,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
/*
*
Zone recherche
produ
i
t/service
*
Search Area of
produ
c
t/service
*/
$rowspan
=
2
;
if
(
!
empty
(
$conf
->
barcode
->
enabled
))
$rowspan
++
;
...
...
@@ -101,7 +101,7 @@ print "</table></form><br>";
/*
* N
o
mb
re de
produ
i
ts
et
/o
u
services
* N
u
mb
er of
produ
c
ts
and
/o
r
services
*/
$prodser
=
array
();
$prodser
[
0
][
0
]
=
$prodser
[
0
][
1
]
=
$prodser
[
1
][
0
]
=
$prodser
[
1
][
1
]
=
0
;
...
...
@@ -284,10 +284,10 @@ function activitytrim($product_type)
{
global
$conf
,
$langs
,
$db
;
//
on affiche les 3 dernières année
s
//
We display the last 3 year
s
$yearofbegindate
=
date
(
'Y'
,
dol_time_plus_duree
(
time
(),
-
3
,
"y"
));
//
ventilation par trimestre
//
breakdown by quarter
$sql
=
"SELECT DATE_FORMAT(p.datep,'%Y') as annee, DATE_FORMAT(p.datep,'%m') as mois, SUM(fd.total_ht) as Mnttot"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"societe as s,"
.
MAIN_DB_PREFIX
.
"facture as f, "
.
MAIN_DB_PREFIX
.
"facturedet as fd"
;
$sql
.
=
" , "
.
MAIN_DB_PREFIX
.
"paiement as p,"
.
MAIN_DB_PREFIX
.
"paiement_facture as pf"
;
...
...
@@ -346,7 +346,7 @@ function activitytrim($product_type)
print
'</tr>'
;
$lgn
++
;
}
//
on passe à l'année suivante
//
We go to the following year
$tmpyear
=
$objp
->
annee
;
$trim1
=
0
;
$trim2
=
0
;
...
...
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