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
bf7a6380
Commit
bf7a6380
authored
8 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix sort on wrong field
parent
ec5bd2a8
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
htdocs/core/boxes/box_contracts.php
+5
-3
5 additions, 3 deletions
htdocs/core/boxes/box_contracts.php
htdocs/langs/en_US/boxes.lang
+1
-1
1 addition, 1 deletion
htdocs/langs/en_US/boxes.lang
with
6 additions
and
4 deletions
htdocs/core/boxes/box_contracts.php
+
5
−
3
View file @
bf7a6380
<?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
...
...
@@ -71,7 +72,8 @@ class box_contracts extends ModeleBoxes
$sql
.
=
" AND c.entity = "
.
$conf
->
entity
;
if
(
!
$user
->
rights
->
societe
->
client
->
voir
&&
!
$user
->
societe_id
)
$sql
.
=
" AND s.rowid = sc.fk_soc AND sc.fk_user = "
.
$user
->
id
;
if
(
$user
->
societe_id
)
$sql
.
=
" AND s.rowid = "
.
$user
->
societe_id
;
$sql
.
=
" ORDER BY c.date_contrat DESC, c.ref DESC "
;
if
(
$conf
->
global
->
MAIN_LASTBOX_ON_OBJECT_DATE
)
$sql
.
=
" ORDER BY c.date_contrat DESC, c.ref DESC "
;
else
$sql
.
=
" ORDER BY c.tms DESC, c.ref DESC "
;
$sql
.
=
$db
->
plimit
(
$max
,
0
);
$resql
=
$db
->
query
(
$sql
);
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/en_US/boxes.lang
+
1
−
1
View file @
bf7a6380
...
...
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
BoxOldestExpiredServices=Oldest active expired services
BoxLastExpiredServices=Latest %s oldest contacts with active expired services
BoxTitleLastActionsToDo=Latest %s actions to do
BoxTitleLastContracts=Latest %s contracts
BoxTitleLastContracts=Latest %s
modified
contracts
BoxTitleLastModifiedDonations=Latest %s modified donations
BoxTitleLastModifiedExpenses=Latest %s modified expense reports
BoxGlobalActivity=Global activity (invoices, proposals, orders)
...
...
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