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
f9442c10
Commit
f9442c10
authored
7 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix box activity
parent
60493d0a
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/core/boxes/box_activity.php
+6
-4
6 additions, 4 deletions
htdocs/core/boxes/box_activity.php
with
6 additions
and
4 deletions
htdocs/core/boxes/box_activity.php
+
6
−
4
View file @
f9442c10
...
...
@@ -83,17 +83,17 @@ class box_activity extends ModeleBoxes
$cachetime
=
3600
;
$fileid
=
'-e'
.
$conf
->
entity
.
'-u'
.
$user
->
id
.
'-s'
.
$user
->
societe_id
.
'-r'
.
(
$user
->
rights
->
societe
->
client
->
voir
?
'1'
:
'0'
)
.
'.cache'
;
$now
=
dol_now
();
$nbof
years
=
2
;
$nbof
period
=
3
;
if
(
!
empty
(
$conf
->
global
->
MAIN_BOX_ACTIVITY_DURATION
))
$nbof
years
=
$conf
->
global
->
MAIN_BOX_ACTIVITY_DURATION
;
$textHead
=
$langs
->
trans
(
"Activity"
)
.
' - '
.
$langs
->
trans
(
"LastXMonthRolling"
,
$nbof
years
*
12
);
if
(
!
empty
(
$conf
->
global
->
MAIN_BOX_ACTIVITY_DURATION
))
$nbof
period
=
$conf
->
global
->
MAIN_BOX_ACTIVITY_DURATION
;
$textHead
=
$langs
->
trans
(
"Activity"
)
.
' - '
.
$langs
->
trans
(
"LastXMonthRolling"
,
$nbof
period
);
$this
->
info_box_head
=
array
(
'text'
=>
$textHead
,
'limit'
=>
dol_strlen
(
$textHead
),
);
// compute the year limit to show
$tmpdate
=
dol_time_plus_duree
(
dol_now
(),
-
1
*
$nbof
years
,
"
y
"
);
$tmpdate
=
dol_time_plus_duree
(
dol_now
(),
-
1
*
$nbof
period
,
"
m
"
);
$cumuldata
=
array
();
...
...
@@ -103,6 +103,7 @@ class box_activity extends ModeleBoxes
include_once
DOL_DOCUMENT_ROOT
.
'/compta/facture/class/facture.class.php'
;
$facturestatic
=
new
Facture
(
$db
);
// part 1
$cachedir
=
DOL_DATA_ROOT
.
'/facture/temp'
;
$filename
=
'/boxactivity-invoice'
.
$fileid
;
...
...
@@ -189,6 +190,7 @@ class box_activity extends ModeleBoxes
);
}
// part 2
$cachedir
=
DOL_DATA_ROOT
.
'/facture/temp'
;
$filename
=
'/boxactivity-invoice2'
.
$fileid
;
...
...
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