Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
65,163 Commits 36 Branches 189 Tags
40d04482b030e4b697e23fcb51e37b00f7b2d47b
Commit Graph

518 Commits

Author SHA1 Message Date
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
Laurent Destailleur
ee1a2c49fd Merge pull request #8287 from hregis/7.0_bug3 
Fix: problem to see users with transverse mode
 2018-03-07 12:38:00 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
Laurent Destailleur
a0a9e12178 Fix css 2018-03-07 11:29:50 +01:00
Regis Houssin
bf4402eb89 Fix: missing superadmin 2018-03-06 19:22:59 +01:00
Regis Houssin
175971bfc1 Fix: syntax error 2018-03-06 19:12:18 +01:00
Regis Houssin
d406b28911 Fix: problem to see users with transverse mode 2018-03-06 19:08:39 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Regis Houssin
70a65b89eb Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug 2018-02-08 08:52:45 +01:00
Laurent Destailleur
413331c7dd Fix travis 2018-02-07 15:54:58 +01:00
Regis Houssin
8b7f40e15b Fix: wrong id name 2018-02-06 19:29:16 +01:00
Laurent Destailleur
5e7d172a58 Fix look and feel v7 on ref popup 2018-02-06 19:16:15 +01:00
Laurent Destailleur
d796f403a9 Fix sender email when sending a password remind 2018-01-24 15:43:55 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Laurent Destailleur
f504716501 Fix sync contact - external user 2017-12-19 16:16:31 +01:00
Laurent Destailleur
8e12551f17 Fix not employee must not appear on page to create salaries 2017-12-18 11:55:34 +01:00
Laurent Destailleur
9cdf322bfb Fix scrutinizer bugs 2017-12-15 22:14:28 +01:00
Laurent Destailleur
5af153550d Debug blockedlog: 
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
 2017-12-15 16:56:08 +01:00
Laurent Destailleur
f22e7ee24a Fixes 2017-12-09 17:29:19 +01:00
Laurent Destailleur
df5768c176 Fix missing translation 2017-12-08 12:38:22 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
Laurent Destailleur
7d3325c087 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/user/class/api_users.class.php
 2017-11-25 13:17:38 +01:00
Laurent Destailleur
77509ee37a Removed deprecated apis 2017-11-25 13:14:28 +01:00
Laurent Destailleur
4cbcf5189a FIX #7806 2017-11-25 01:24:24 +01:00
Laurent Destailleur
38c770ffb3 FIX #7806 2017-11-25 01:16:12 +01:00
Laurent Destailleur
cb03b2f307 NEW Can sort joined files on thirdparty and user card. 2017-11-10 18:14:29 +01:00
Laurent Destailleur
1b28c45e2c PERF Links in getNomUrl use only one tag a instead of 2. 2017-11-02 15:19:14 +01:00
Laurent Destailleur
00db7e16ec Clean code 2017-10-28 16:00:07 +02:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
Laurent Destailleur
f4f47c6732 NEW Remove tooltip tipTip library replaced with standatd jquery tooltip 2017-10-22 21:15:08 +02:00
Laurent Destailleur
c6e5115d34 Set default limit to 100 on all rest api that list 2017-10-22 15:42:19 +02:00
Laurent Destailleur
4247038d01 Add phpunit test 2017-10-22 13:06:27 +02:00
Laurent Destailleur
5c189449e1 Move default value for user expense report on tab expense report 2017-10-20 17:02:26 +02:00
Maxime Kohlhaas
9875d1b7cc Missing comments 2017-10-17 19:46:06 +02:00
Maxime Kohlhaas
f7cadfbed1 Fix function declaration 2017-10-16 21:42:24 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
4bc7eb0ec1 Merge pull request #7520 from hregis/develop_ldap 
Fix: Set LDAP password when LDAP key changed
 2017-10-06 13:09:28 +02:00
Laurent Destailleur
06b18a740e NEW Add date of birth on user card. 
NEW Show expected worked hours on the timesheet form.
 2017-10-06 12:08:01 +02:00
Laurent Destailleur
801a5180d6 Fix scrutinizer bug reports 2017-10-06 01:16:19 +02:00
Regis Houssin
723bc4d436 NEW add ldap_rename for avoid password if ldap key changed 2017-10-04 11:22:41 +02:00
Regis Houssin
8d3ad9ddc8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-10-04 08:43:07 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
gauthier
8f969d61e2 FIX : invalid foreach protection 2017-10-02 09:23:04 +02:00
Regis Houssin
475c881e67 Fix: add missing ldap fields 2017-10-02 09:00:07 +02:00
Regis Houssin
c1b6f59c1b Fix: restore possible ldap keys 2017-10-02 08:43:53 +02:00
Laurent Destailleur
88554a74a9 Merge pull request #7532 from AXeL-dev/develop 
Fix: payment form & user first/last name position
 2017-10-02 00:37:35 +02:00
AXeL-dev
f7dcf1ca45 FIX: wrong user first name/last name position in user tooltip 2017-10-01 18:35:06 +01:00
Laurent Destailleur
3ddd5d3d3a The default value feature is sensitive to url parameters. 2017-10-01 14:54:17 +02:00
Regis Houssin
cb9d627f02 Fix: Set LDAP password when LDAP key changed 2017-09-30 11:51:22 +02:00
Regis Houssin
46cc23c568 Fix: $this->pass is empty if DATABASE_PWD_ENCRYPTED is used 2017-09-30 10:41:35 +02:00