Commit Graph

62077 Commits

Author SHA1 Message Date
Neil Orley
a3096b4e9d NEW Generates the document before downloading using REST API
Generates the document before downloading using REST API
2017-10-04 15:59:54 +02:00
Laurent Destailleur
a74d6074a3 FIX Generation of invoice from bulk action "Bill Orders" 2017-10-04 14:27:10 +02:00
Laurent Destailleur
8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
Laurent Destailleur
10142522e0 Fix typo 2017-10-04 13:30:43 +02:00
Laurent Destailleur
9b3826a54c Invert left and right (my own comment on left) 2017-10-04 13:17:16 +02:00
Laurent Destailleur
85606126a9 Standardize code for events 2017-10-04 12:58:13 +02:00
Laurent Destailleur
2dee81125a Hide comment feature for the moment 2017-10-04 11:18:31 +02:00
Laurent Destailleur
75a7e086b3 Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element
New comment generic element
2017-10-04 11:13:39 +02:00
Laurent Destailleur
e7ac828cc7 Merge pull request #7551 from hregis/develop_bug_restapi
Fix: refactorization of "getListForItem" function
2017-10-04 10:59:55 +02:00
Laurent Destailleur
7f11138f19 Merge pull request #7555 from frederic34/patch-1
can't clean search_type in holiday list
2017-10-04 10:57:27 +02:00
Frédéric FRANCE
69314e08ac can't clean search_type in holiday list 2017-10-04 10:12:51 +02:00
Laurent Destailleur
436ec93084 FIX is_erasable report bad value when thirdparty was not loaded 2017-10-04 03:22:41 +02:00
Laurent Destailleur
7cf4ec772a Restore original travis setup 2017-10-04 02:56:45 +02:00
Laurent Destailleur
a6cf934973 Add log 2017-10-04 02:46:01 +02:00
Laurent Destailleur
bd3a76ee84 Debug travis 2017-10-04 02:00:38 +02:00
Laurent Destailleur
5b8e9f7269 Debug travis 2017-10-04 01:53:55 +02:00
Laurent Destailleur
3a41f2bddb Fix test when numbering ref is only numeric char. 2017-10-04 01:27:19 +02:00
Laurent Destailleur
f380747e20 More accurate error code 2017-10-04 01:11:19 +02:00
Laurent Destailleur
c08f33507f More accurate error code 2017-10-04 00:51:25 +02:00
Laurent Destailleur
8794e54eba Try to fix phpunit 2017-10-03 22:52:57 +02:00
Laurent Destailleur
4c90e1c10d Add link to modules Ids 2017-10-03 21:13:28 +02: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
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