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

64295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fmarcet
72108c3a4e Fix: #7358 User can't create holiday requests with 'Create/modify your leave requests' rights 2017-09-21 15:59:50 +02:00
fappels
02f6bc7b4f Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-09-21 14:43:10 +02:00
Laurent Destailleur
a3347e83b3 Better error message 2017-09-21 14:04:25 +02:00
Laurent Destailleur
57358f0ce5 NEW Provide a way to download a file from a public URL for files in ECM 2017-09-21 14:02:42 +02:00
Laurent Destailleur
96efe43e3c NEW Provide a way to download a file from a public URL. 2017-09-21 12:48:07 +02:00
florian HENRY
8f19ffd097 Fix contract class for date 2017-09-21 12:22:10 +02:00
Regis Houssin
71fc5a99d6 Fix: list already load in trigger 2017-09-21 12:19:14 +02:00
Regis Houssin
01f9d59e75 Fix: use another method 2017-09-21 12:16:01 +02:00
Ferran Marcet
76c3fe1260 Fix: Stripe not working on live mode 2017-09-21 12:06:43 +02:00
Laurent Destailleur
296e678c1b Solve url too long with paybox 2017-09-21 12:02:46 +02:00
florian HENRY
cafcbe03e1 agin fix list ressource 2017-09-21 12:02:45 +02:00
Laurent Destailleur
cb90ab124b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-21 11:54:49 +02:00
Laurent Destailleur
23604a2b54 NEW Add hidden option PROJECT_DISABLE_UNLINK_FROM_OVERVIEW 2017-09-21 11:54:37 +02:00
Laurent Destailleur
8a06a1f433 Code comment 2017-09-21 11:50:36 +02:00
Laurent Destailleur
dafeb4c651 Merge pull request #6806 from mikee2/develop 
New fields in Segment.php
 2017-09-21 11:42:31 +02:00
Laurent Destailleur
5980651103 Merge branch 'develop' into develop 2017-09-21 11:41:30 +02:00
florian HENRY
5240217144 fix again resource list 2017-09-21 11:36:50 +02:00
Laurent Destailleur
d68abf8237 Merge pull request #7453 from atm-florian/6.0 
fix ressource list
 2017-09-21 11:36:26 +02:00
Laurent Destailleur
e56840b9ec Clean deprecated code 2017-09-21 11:35:18 +02:00
florian HENRY
03ffbe55ce fix ressource list 2017-09-21 11:34:19 +02:00
Laurent Destailleur
d71916af7b Merge pull request #7437 from tysauron/patch-12 
Rename "->fk_action"   in  "->type_id"
 2017-09-21 11:26:38 +02:00
Laurent Destailleur
a918fd1cf2 Merge pull request #7370 from Oeris/6.0-api 
NEW Implementation of a Luracast recommandation for the REST api server
 2017-09-21 11:20:23 +02:00
Laurent Destailleur
ee01ebba0f Merge pull request #7441 from tysauron/patch-13 
For use ajax select company
 2017-09-21 11:19:39 +02:00
Laurent Destailleur
beac7a7439 Work on direct download links 2017-09-20 21:29:27 +02:00
Laurent Destailleur
0eb416d4af Fix removal of a file 2017-09-20 20:41:40 +02:00
Laurent Destailleur
2831f90b42 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-20 19:36:33 +02:00
Laurent Destailleur
2f317c5834 Debug online payment using unique form 2017-09-20 19:34:14 +02:00
Laurent Destailleur
21959aec8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-20 17:42:09 +02:00
Laurent Destailleur
81596b503c Merge pull request #7445 from hregis/develop_trad 
Fix: check if array and check empty value if required
 2017-09-20 17:38:00 +02:00
Laurent Destailleur
68c9d08909 Merge pull request #7438 from fappels/6.0_fix_extrafields_copy 
FIX extrafields copy situation invoice, shipment and receipt
 2017-09-20 17:36:48 +02:00
tysauron
e61032a313 Bug get socid with old object sosciete 2017-09-20 17:35:11 +02:00
Laurent Destailleur
1cedd63c4e Merge pull request #7440 from tysauron/patch-14 
Bug get socid with old object sosciete
 2017-09-20 17:34:25 +02:00
Laurent Destailleur
fc5c9ad2f2 Merge pull request #7436 from fappels/6.0_Fix_expedition_error_handling 
Fix batch required for lot product error message.
 2017-09-20 17:33:05 +02:00
Laurent Destailleur
1daa0204aa Merge pull request #7434 from atm-quentin/6.0 
# Fix #for free line select unit was wrong
 2017-09-20 17:32:08 +02:00
Laurent Destailleur
7706020805 Merge pull request #7446 from hregis/6.0_bug3 
Fix: wrong supplier product price id
 2017-09-20 17:31:10 +02:00
Laurent Destailleur
577c64cc37 WIP work on param download on payment page 2017-09-20 17:23:36 +02:00
Regis Houssin
77fea1983c Fix: wrong supplier product price id 2017-09-20 16:57:38 +02:00
Neil Orley
b62e08efc3 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api 2017-09-20 15:40:38 +02:00
Laurent Destailleur
1d6213ea7d Add picto for cheque payment 2017-09-20 15:29:47 +02:00
Regis Houssin
1314e00bc6 Fix: check if array and check empty value if required 2017-09-20 14:46:51 +02:00
Regis Houssin
1f59e4f7e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-20 12:47:35 +02:00
Laurent Destailleur
5e2cc05047 Prepare 6.0.1 2017-09-20 11:12:47 +02:00
Laurent Destailleur
052e025537 Better detection of log to include merge labels 2017-09-20 11:08:42 +02:00
Pilon David
78b45bd972 Update interface_20_modWorkflow_WorkflowManager.class.php 2017-09-20 09:41:32 +02:00
tysauron
3220225af3 Bug get socid with old object sosciete 2017-09-20 00:53:48 +02:00
tysauron
8bb3130aab For use ajax select company 2017-09-20 00:35:52 +02:00
Laurent Destailleur
cfd29841e1 NEW Option STOCK_SUPPORTS_SERVICES become visible. 2017-09-19 23:42:20 +02:00
Laurent Destailleur
04e1458a3f Fix clean parameters 2017-09-19 22:03:44 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
6a0ef4b561 Fix info ot total in direct debit page 2017-09-19 19:29:00 +02:00