lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
57,504 Commits 43 Branches 150 Tags 886 MiB
2374aa351e
Commit Graph

57504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e57f834434 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-01-04 17:06:02 +01:00
Laurent Destailleur
71e368aa83 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-04 17:04:25 +01:00
tarrsalah
eb62c1eb0d fix undefined method getProjectsAuthorizedForUser. 
When a user don't have the permission
`$user->rights->projet->all->lire`, viewing some tasks related entities
(like `tasks/contact.php?id=1&withproject=1`) cause `Call to undefined
method Task::getProjectsAuthorizedForUser()` fatal error.

The problem is caused by calling getProjectsAuthorizedForUser on $object
insted of $projectstatic.
 2017-01-04 16:35:04 +01:00
Laurent Destailleur
2aae4ea6ea FIX We must not drop column if there is still record on other entities. 2017-01-04 15:05:13 +01:00
Laurent Destailleur
212f200454 Fix phpcs 2017-01-03 11:38:31 +01:00
Laurent Destailleur
4907f9581f Fix warning 2017-01-03 11:35:07 +01:00
Laurent Destailleur
27c056d377 Avoid duplicate function error 2017-01-03 11:30:27 +01:00
Laurent Destailleur
febd23fe41 Clean dead code 2017-01-03 11:22:03 +01:00
Laurent Destailleur
728dd3f7b3 Add field ref into ecm_files table. 2017-01-03 11:06:24 +01:00
Laurent Destailleur
7aad6683fa Add cast to remove scrutinizer warning 2017-01-03 10:50:37 +01:00
Laurent Destailleur
466dfc85a3 Prepare RC1 2017-01-03 10:36:27 +01:00
Laurent Destailleur
53137e53fe Fix prepare RC 2017-01-03 10:33:56 +01:00
Laurent Destailleur
a4edaf4f43 Fix sql to get next ref on expense report 2017-01-03 10:18:47 +01:00
Laurent Destailleur
c27a1c1705 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-03 01:34:46 +01:00
Laurent Destailleur
c635baa848 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:34:15 +01:00
Laurent Destailleur
157b17b6d5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:31:58 +01:00
Laurent Destailleur
ecab8d874b Merge changelog 2017-01-03 01:30:07 +01:00
Laurent Destailleur
598e559563 Fix migration 2017-01-02 19:30:12 +01:00
Laurent Destailleur
afe5c6b296 Fix migration 2017-01-02 18:44:11 +01:00
Laurent Destailleur
c04c62e62c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-02 18:40:51 +01:00
Laurent Destailleur
f023d6485f Prepare 6.0 dev 2017-01-02 18:39:55 +01:00
Laurent Destailleur
67c513a9c1 Prepare 6.0 dev 2017-01-02 18:38:22 +01:00
Laurent Destailleur
7dc55daf38 FIX #6229 2017-01-02 14:37:07 +01:00
Laurent Destailleur
85f9da7718 Fix link 2017-01-02 13:52:32 +01:00
Laurent Destailleur
fd09a3d35e Fix link to notes and download pdf not visible on list of expense report 2017-01-02 13:51:05 +01:00
Laurent Destailleur
e4a5302f51 Fix bad sort order 2017-01-02 12:41:33 +01:00
Laurent Destailleur
9694a00179 Fix sort is lost on agenda/event of projects 2017-01-02 12:39:12 +01:00
Laurent Destailleur
477b9c8338 Fix duplicate view of agenda/events for projects 2017-01-02 12:34:23 +01:00
Laurent Destailleur
40fa816b99 Fix missing total of timespent 2017-01-02 12:27:34 +01:00
Laurent Destailleur
1b352768c2 Fix remove debug info 2017-01-02 12:18:17 +01:00
Laurent Destailleur
064f38b89e Fix condition to show time spent on project overview 2017-01-02 12:17:27 +01:00
Laurent Destailleur
f07c741176 Fix missing error message on invoice creation 2017-01-02 11:31:21 +01:00
Laurent Destailleur
d986247e0f Fix dol_banner 2017-01-01 19:53:05 +01:00
Laurent Destailleur
d3176ec0ed Merge pull request #6223 from gnovaro/patch-5 
var to public
 2016-12-31 17:27:25 +01:00
Laurent Destailleur
1f2f03c287 Merge pull request #6222 from gnovaro/patch-4 
var to public
 2016-12-31 17:27:07 +01:00
Laurent Destailleur
70f70c884c Merge pull request #6221 from gnovaro/patch-3 
Var to public
 2016-12-31 17:26:54 +01:00
Laurent Destailleur
088a948e5a Merge pull request #6220 from gnovaro/patch-2 
Var to public
 2016-12-31 17:26:40 +01:00
Laurent Destailleur
2c4e8926f8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop6 2016-12-31 17:24:14 +01:00
Laurent Destailleur
ec503d08f6 Fix dol_banner usage 2016-12-31 17:01:31 +01:00
Laurent Destailleur
97679a7309 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-31 16:36:10 +01:00
Laurent Destailleur
b642a3a602 Prepare release 5.0 2016-12-31 16:35:56 +01:00
Laurent Destailleur
c953ae2a3d Merge pull request #6228 from marcosgdf/bug-6227 
FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish
 2016-12-31 16:35:00 +01:00
Laurent Destailleur
98f376faa2 Merge pull request #6232 from TiJof/patch-1 
Typo in SQL request
 2016-12-31 16:32:49 +01:00
Laurent Destailleur
3c81346756 Merge pull request #6218 from atm-florian/develop 
fix : avoid bug when batch number is not trimmed
 2016-12-31 16:32:20 +01:00
Laurent Destailleur
31888b0b1d Merge pull request #6215 from aspangaro/5.0-17 
Supplier invoice - Complete dol_banner_tab & presentation
 2016-12-31 16:19:12 +01:00
Laurent Destailleur
f46ce68d08 NEW Can sort thumbs visible on product card 2016-12-31 16:16:20 +01:00
Laurent Destailleur
f1961b0207 Work on sorting/indexing upload files 2016-12-31 03:43:22 +01:00
Rabouin Geoffroy
a277a6f190 Typo in SQL request 2016-12-28 10:26:31 +01:00
aspangaro
5f861c1067 Merge remote-tracking branch 'Upstream/develop' into 5.0-17 2016-12-27 15:07:29 +01:00
aspangaro
4705a87548 Finish work 2016-12-27 14:48:14 +01:00