Laurent Destailleur
14fb01da11
Merge pull request #6250 from gnovaro/patch-6
...
Bug: Fix missing ,
2017-01-12 10:06:01 +01:00
Laurent Destailleur
5c233a41b3
NEW Add hook "formatNotificationMessage"
2017-01-09 23:55:53 +01:00
Laurent Destailleur
93ab224614
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-09 23:33:36 +01:00
Laurent Destailleur
c4ff1f983c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-09 23:32:36 +01:00
Laurent Destailleur
decbda3e23
Fix inversion application name - company name
2017-01-09 23:26:31 +01:00
Laurent Destailleur
a9354e5f27
Fix generic text must be set before specific for notification
2017-01-09 21:07:54 +01:00
Laurent Destailleur
8ab0ad3b72
Fix css
2017-01-09 10:36:24 +01:00
Laurent Destailleur
c9cce66d98
Merge remote-tracking branch 'origin/5.0' into develop
2017-01-09 10:25:05 +01:00
Laurent Destailleur
52666ea971
Merge remote-tracking branch 'origin/5.0' into develop
2017-01-09 10:22:20 +01:00
Laurent Destailleur
fd008f88b1
Add github tools
2017-01-09 10:21:59 +01:00
Laurent Destailleur
03aa8343fd
Fix css
2017-01-09 10:21:35 +01:00
Laurent Destailleur
62a668d899
Fix https link
2017-01-09 10:02:17 +01:00
Laurent Destailleur
dba777c57b
Fix missing field alias
2017-01-08 12:10:07 +01:00
Laurent Destailleur
1856b5cfb8
Fix filter on status for third parties
2017-01-08 11:50:43 +01:00
Laurent Destailleur
913df73ed9
Fix css
2017-01-08 11:31:39 +01:00
Laurent Destailleur
41832a0c26
Fix neutral color on login (no theme yet selected)
2017-01-08 11:20:29 +01:00
Gustavo Novaro
3e77fed815
Fix missing ,
2017-01-08 01:59:04 -03:00
Laurent Destailleur
8e615a83e5
Better tooltip
2017-01-08 01:07:28 +01:00
Laurent Destailleur
76a53dfb7d
FIX Accept spaces around the | criteria
2017-01-08 01:01:34 +01:00
Laurent Destailleur
785b2d46b3
FIX Accept spaces around the | criteria
2017-01-08 01:00:47 +01:00
Laurent Destailleur
2c1477ecea
Revert "FIX Accept spaces around the | criteria"
...
This reverts commit 37d158f159
2017-01-07 21:50:14 +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
37d158f159
FIX Accept spaces around the | criteria
2017-01-07 21:34:12 +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
6585431849
Fix css
2017-01-07 17:32:45 +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
