Laurent Destailleur
785b2d46b3
FIX Accept spaces around the | criteria
2017-01-08 01:00:47 +01:00
Laurent Destailleur
163ee094ec
Revert "FIX Accept spaces around the | criteria"
...
This reverts commit df9121d6fa
2017-01-07 21:46:26 +01:00
Laurent Destailleur
5446ff667a
Fix translation
2017-01-07 21:33:23 +01:00
Laurent Destailleur
df9121d6fa
FIX Accept spaces around the | criteria
2017-01-07 21:33:13 +01:00
Laurent Destailleur
1b3af1df07
More space between text
2017-01-07 21:03:45 +01:00
Laurent Destailleur
f00f3101d9
Merge pull request #6013 from aljawaid/develop
...
NEW: Make Top Menu Entries Independent Translation Strings
2017-01-07 20:45:44 +01:00
Laurent Destailleur
51b9802de4
NEW Hook to allow inserting custom product head #6001
2017-01-07 20:42:35 +01:00
Laurent Destailleur
4c4aeba855
Fix project on loans
2017-01-07 17:54:47 +01:00
Laurent Destailleur
d23aa8ef3c
git push origin developMerge branch 'Franck-MOREAU-develop' into develop
2017-01-07 17:45:50 +01:00
Laurent Destailleur
e9853f3cd7
Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into
...
Franck-MOREAU-develop
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
htdocs/projet/element.php
2017-01-07 17:45:05 +01:00
Laurent Destailleur
1d291ee0e8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-07 17:07:29 +01:00
Laurent Destailleur
fba7d73052
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-07 17:06:16 +01:00
Laurent Destailleur
71d8a81751
Fix color green is reserved to say ok not for neutral messages.
2017-01-07 17:05:55 +01:00
Laurent Destailleur
7f8d4deb59
Merge pull request #6239 from tarrsalah/5.0
...
Fix undefined method getProjectsAuthorizedForUser.
2017-01-07 16:48:48 +01:00
Laurent Destailleur
e6cdcfca00
Close #6240
2017-01-07 16:47:11 +01:00
Laurent Destailleur
8ee838c9c4
Minor fixes in accounting module.
2017-01-07 16:17:15 +01:00
Laurent Destailleur
b21998d506
Fix global checksum not visible on old versions. Link with checksum file
...
to check was hardcoded.
2017-01-07 15:56:04 +01:00
Laurent Destailleur
358616cda2
Fix link should be https
2017-01-07 15:18:57 +01:00
Laurent Destailleur
680c48d90a
Fix error on expired tokens
2017-01-07 14:48:05 +01:00
Laurent Destailleur
005a40c105
Fix css on login page. Pb with autocomplete-autofill.
2017-01-07 14:17:35 +01:00
Laurent Destailleur
9cfc8d4095
Fix several problems into OAuth2 module.
2017-01-06 19:58:46 +01:00
Laurent Destailleur
4002ec9fd5
Fix css install and login
2017-01-06 15:51:08 +01:00
Laurent Destailleur
206335bc56
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-04 18:14:19 +01:00
Laurent Destailleur
983efdd6ee
FIX repair tool was ko to restore extrafields with type select.
2017-01-04 18:13:36 +01:00
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
