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
4e2c321e
Commit
4e2c321e
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Conflicts: ChangeLog
parents
83e34a1c
f31bf5d8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/margin/agentMargins.php
+2
-2
2 additions, 2 deletions
htdocs/margin/agentMargins.php
with
3 additions
and
2 deletions
ChangeLog
+
1
−
0
View file @
4e2c321e
...
...
@@ -5,6 +5,7 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.5.7 compared to 3.5.6 *****
Fix: Paypal link were broken dur to SSL v3 closed.
Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973
...
...
This diff is collapsed.
Click to expand it.
htdocs/margin/agentMargins.php
+
2
−
2
View file @
4e2c321e
...
...
@@ -57,9 +57,9 @@ $pagenext = $page + 1;
$startdate
=
$enddate
=
''
;
if
(
!
empty
(
$_POST
[
'startdatemonth'
]))
$startdate
=
dol_mktime
(
12
,
0
,
0
,
$_POST
[
'startdatemonth'
],
$_POST
[
'startdateday'
],
$_POST
[
'startdateyear'
]);
$startdate
=
dol_mktime
(
0
,
0
,
0
,
$_POST
[
'startdatemonth'
],
$_POST
[
'startdateday'
],
$_POST
[
'startdateyear'
]);
if
(
!
empty
(
$_POST
[
'enddatemonth'
]))
$enddate
=
dol_mktime
(
12
,
0
,
0
,
$_POST
[
'enddatemonth'
],
$_POST
[
'enddateday'
],
$_POST
[
'enddateyear'
]);
$enddate
=
dol_mktime
(
23
,
59
,
59
,
$_POST
[
'enddatemonth'
],
$_POST
[
'enddateday'
],
$_POST
[
'enddateyear'
]);
/*
* View
...
...
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