Commit Graph

81180 Commits

Author SHA1 Message Date
Laurent Destailleur
8b778a8154 More log 2019-10-01 11:05:27 +02:00
gauthier
2167e7ed98 FIX : hidden conf to prevent from changing product_type 2019-10-01 09:12:51 +02:00
John Botella
2edc3ffe4b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark 2019-10-01 08:50:34 +02:00
stickler-ci
5e075d5d30 Fixing style errors. 2019-10-01 06:39:26 +00:00
Frédéric FRANCE
f6f6ed3e0c Merge remote-tracking branch 'upstream/develop' into zapier2 2019-10-01 07:56:45 +02:00
Frédéric FRANCE
6a7170f725 Merge remote-tracking branch 'upstream/develop' into phpcalendar 2019-10-01 07:55:09 +02:00
Frédéric FRANCE
534948d734 Merge remote-tracking branch 'upstream/develop' into patch-12 2019-10-01 07:53:25 +02:00
Frédéric FRANCE
c57c8eee88 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 07:41:10 +02:00
Alexandre SPANGARO
6726a7cbb0 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-10-01 07:07:57 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
41bfc89544 Fix travis for pgsql 2019-10-01 01:42:08 +02:00
Laurent Destailleur
bd76c1da11 Look and feel v10 2019-10-01 01:35:11 +02:00
Frédéric FRANCE
0c9956ab96 work on socpeople list 2019-10-01 00:37:10 +02:00
Frédéric FRANCE
420d972280 work on socpeople list 2019-10-01 00:35:08 +02:00
Frédéric FRANCE
be051e0f9d work on socpeople list 2019-10-01 00:10:33 +02:00
Laurent Destailleur
83ddf5ac8d Disable test of pgsql installation 2019-09-30 22:50:48 +02:00
Frédéric FRANCE
f3f2ab8aad Update box_commandes.php 2019-09-30 22:45:28 +02:00
Frédéric FRANCE
466e48761c Update box_supplier_orders.php 2019-09-30 22:43:13 +02:00
Frédéric FRANCE
d0e9e9568a Update box_prospect.php 2019-09-30 22:40:07 +02:00
Frédéric FRANCE
11c3b6c967 zapier 2019-09-30 22:21:32 +02:00
Laurent Destailleur
ebc79cf5ea Clean travis file 2019-09-30 22:13:21 +02:00
Frédéric FRANCE
b8dea76760 zapier api 2019-09-30 22:09:11 +02:00
Laurent Destailleur
edf1c74519 Add log of errors 2019-09-30 22:04:32 +02:00
Frédéric FRANCE
b74a93e194 zapier trigger 2019-09-30 22:03:42 +02:00
Laurent Destailleur
155ccc95db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 22:00:52 +02:00
Laurent Destailleur
af3bee6fcf Remove warning 2019-09-30 21:59:42 +02:00
Laurent Destailleur
91b7e81085 Fix warnings 2019-09-30 21:51:42 +02:00
Frédéric FRANCE
f2ac207df5 Update api_boms.class.php 2019-09-30 21:51:04 +02:00
Laurent Destailleur
73beec6526 Merge pull request #11994 from atm-john/develop_fix_event_back_url
FIX : Action com redirection
2019-09-30 21:48:07 +02:00
Frédéric FRANCE
3ba48fde93 Update api_invoices.class.php 2019-09-30 21:44:37 +02:00
Frédéric FRANCE
f3a38ef1af Update api_orders.class.php 2019-09-30 21:41:07 +02:00
Alexandre SPANGARO
f91513937a Remove option to hide FAQ 2019-09-30 21:37:20 +02:00
Alexandre SPANGARO
8dea427f58 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-30 21:23:27 +02:00
Frédéric FRANCE
31418c2e42 check php-calendar extension 2019-09-30 21:14:25 +02:00
ATM john
b01bd979b5 Unlock title button feature 2019-09-30 21:10:16 +02:00
Laurent Destailleur
ee2bfb539e Merge pull request #11428 from grandoc/new_branch_29_06_2019
New branch 29 06 2019
2019-09-30 21:07:23 +02:00
Laurent Destailleur
0846a081cb Merge branch 'develop' into new_branch_29_06_2019 2019-09-30 21:06:51 +02:00
ATM john
e08fc2213c FIX : action com redirect 2019-09-30 20:44:56 +02:00
Frédéric FRANCE
ea008aefd7 Update chargesociales.class.php 2019-09-30 20:21:10 +02:00
Frédéric FRANCE
0c908fb4ed Update chargesociales.class.php 2019-09-30 20:13:43 +02:00
Laurent Destailleur
d007e39f47 git push origin developMerge branch 'atm-greg-test_pgsql_installation' into develop 2019-09-30 20:00:28 +02:00
Laurent Destailleur
3ca1a9ba28 Merge branch 'test_pgsql_installation' of https://github.com/atm-greg/dolibarr into atm-greg-test_pgsql_installation 2019-09-30 19:59:52 +02:00
Frédéric FRANCE
f32f528bc2 fix merge 2019-09-30 19:36:57 +02:00
Frédéric FRANCE
b87610adcc Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Laurent Destailleur
33908afb66 Update zapier logo 2019-09-30 19:30:31 +02:00
Laurent Destailleur
7c9aabfd3b Merge pull request #11223 from frederic34/zapier
NEW zapier for dolibarr
2019-09-30 19:20:14 +02:00
Laurent Destailleur
d9e9364ddf Close #11689 Close #11696 2019-09-30 19:00:19 +02:00
Laurent Destailleur
fe735d4e67 Changelog 2019-09-30 18:51:28 +02:00
Laurent Destailleur
14f7e48fe5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 18:50:33 +02:00