lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,762 Commits 43 Branches 150 Tags 886 MiB
8214e7bb42
Commit Graph

64762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4c90e1c10d Add link to modules Ids 2017-10-03 21:13:28 +02:00
Rui Strecht
be5481f51a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-10-03 18:44:43 +01:00
Regis Houssin
45de1ca21e Fix: check security 2017-10-03 19:09:46 +02:00
Regis Houssin
4537e5472b Fix: refactorization of "getListForItem" function 2017-10-03 19:01:54 +02:00
Laurent Destailleur
5ddd77c950 Fix We must use dol_escape_htmltag for input field not dol_htmlentities 2017-10-03 18:35:35 +02:00
Maxime Kohlhaas
37b1b161f9 Merge branch '5.0' of github.com:atm-maxime/dolibarr into fix_member_search_pgsql 2017-10-03 18:15:01 +02:00
Maxime Kohlhaas
123c9d2315 Better fix only if bdd is pgsql 2017-10-03 18:12:17 +02:00
Laurent Destailleur
eeb36464b7 Merge pull request #7524 from hregis/develop_mc 
Fix: command not found with escapeshellarg !
 2017-10-03 18:06:49 +02:00
Laurent Destailleur
386c8215ee Update security_file.php 2017-10-03 18:06:32 +02:00
Laurent Destailleur
2f02015c30 Update security_file.php 2017-10-03 17:58:50 +02:00
Laurent Destailleur
c22cd1cfe9 Fix test on entity must always be done using the "IN" instead of "=" 2017-10-03 17:41:22 +02:00
Regis Houssin
ed5dca652d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi 2017-10-03 17:32:40 +02:00
Laurent Destailleur
d0ce98cbea Merge branch 'hregis-develop_dict' into develop 2017-10-03 17:25:32 +02:00
Laurent Destailleur
f2e0ff0d30 Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict 2017-10-03 17:25:01 +02:00
Laurent Destailleur
1f11dcb4bd Fix no loose of configuration of action auto after upgrade Close #7527 2017-10-03 17:21:18 +02:00
Regis Houssin
a88938ace4 Fix: use GETPOST 2017-10-03 17:11:42 +02:00
Regis Houssin
9c2d053f74 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-10-03 17:01:39 +02:00
Laurent Destailleur
b40012d08f Merge pull request #7535 from Oeris/develop-api 
NEW Set invoices as draft using the REST API
 2017-10-03 16:46:12 +02:00
Laurent Destailleur
a76f99921b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-03 16:39:57 +02:00
Laurent Destailleur
2b2832da22 Add option FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES - Close #7548 2017-10-03 16:38:22 +02:00
Laurent Destailleur
df0f39f973 Merge pull request #7547 from atm-maxime/fix_import_updatekeys 
Fix : GETPOST for update keys in import module
 2017-10-03 16:26:21 +02:00
Laurent Destailleur
927445ac47 Merge pull request #7544 from hregis/develop_bug 
Fix: travis error
 2017-10-03 16:25:06 +02:00
Laurent Destailleur
12ec00428f Merge branch 'develop' into develop_bug 2017-10-03 16:24:44 +02:00
Laurent Destailleur
fef6440ff2 FIX #7541 2017-10-03 16:23:30 +02:00
Laurent Destailleur
adc77be6d4 Merge pull request #7541 from frederic34/patch-1 
ref can be null
 2017-10-03 16:22:39 +02:00
Laurent Destailleur
e43ac0c6c5 Update define_holiday.php 2017-10-03 16:22:25 +02:00
Laurent Destailleur
0f194d6715 Update llx_holiday.sql 2017-10-03 16:21:44 +02:00
Laurent Destailleur
cb4a52a8cd Merge branch 'develop' into patch-1 2017-10-03 16:21:13 +02:00
Laurent Destailleur
422a3425a8 Merge pull request #7539 from defrance/patch-28 
unable to delete salaries
 2017-10-03 16:16:49 +02:00
Laurent Destailleur
64fcbfffb1 Fix PHPCS 2017-10-03 16:05:15 +02:00
Laurent Destailleur
d2c4da5156 Update doc 2017-10-03 16:03:26 +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
Laurent Destailleur
99acd1b974 Fix cancel button on create 2017-10-03 14:58:53 +02:00
Laurent Destailleur
2f20de2457 Fix cancel button on create 2017-10-03 14:57:38 +02:00
Laurent Destailleur
9d6498f2a4 NEW Search filters in lists are restored when using "back to list" 2017-10-03 14:50:52 +02:00
Maxime Kohlhaas
a88bcb5299 Add detailed menus in HRM module 2017-10-03 13:49:30 +02:00
Regis Houssin
f8f4ff6d21 Fix: missing include api_categories class 2017-10-03 13:07:07 +02:00
Regis Houssin
db8d27f0fe Fix: wrong type value 2017-10-03 12:08:25 +02:00
Maxime Kohlhaas
e0e7e60048 Fix : GETPOST for update keys in import module 2017-10-03 11:28:13 +02:00
Laurent Destailleur
0b808fa2aa FIX Bad preview on scroping when special file names 2017-10-03 10:55:45 +02:00
Laurent Destailleur
c4b3dc40c3 Allow : into file names 2017-10-03 10:54:51 +02:00
Laurent Destailleur
888e5ed2c5 Fix sanitize uploaded filename 2017-10-03 10:54:09 +02:00
Rui Strecht
8b4b270720 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-10-03 09:32:22 +01:00
Laurent Destailleur
1fc292fa56 FIX Bad preview on scroping when special file names 2017-10-03 10:11:03 +02:00
Regis Houssin
32e3845667 Fix: travis error 2017-10-03 10:08:25 +02:00
Laurent Destailleur
793f1318de Fix sanitize uploaded filename 2017-10-03 09:35:45 +02:00
Frédéric FRANCE
1d2f7dec50 Update define_holiday.php 2017-10-03 08:02:47 +02:00
Alexandre SPANGARO
0acb391b36 Fix : label_operation on general ledger 2017-10-03 05:27:08 +02:00
Frédéric FRANCE
dd76672c27 ref can be null 2017-10-03 00:30:42 +02:00
Maxime Kohlhaas
29a6c7e6ba Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-10-02 21:32:29 +02:00